# HG changeset patch # User insilmaril # Date 1240912308 0 # Node ID 04039e47ac745ba2954157a7394a1ca81db9b846 # Parent c6908bc17d7810d9a3e578347b5fda57ec6c00b9 colors work again diff -r c6908bc17d78 -r 04039e47ac74 branchitem.cpp --- a/branchitem.cpp Mon Apr 27 12:42:06 2009 +0000 +++ b/branchitem.cpp Tue Apr 28 09:51:48 2009 +0000 @@ -183,6 +183,12 @@ return vymLink; } +void BranchItem::setHeadingColor (QColor color) +{ + TreeItem::setHeadingColor (color); + if (lmo) ((BranchObj*)lmo)->setColor (color); +} + void BranchItem::unScroll() { if (tmpUnscrolled) resetTmpUnscroll(); @@ -266,26 +272,26 @@ } } -TreeItem* BranchItem::findMapItem (QPointF p, TreeItem* excludeLMO) +TreeItem* BranchItem::findMapItem (QPointF p, TreeItem* excludeTI) { // Search branches TreeItem *ti; for (int i=0; ifindMapItem(p, excludeLMO); + ti=getBranchNum(i)->findMapItem(p, excludeTI); if (ti != NULL) return ti; } // Search myself - if (getBranchObj()->isInClickBox (p) && (this != excludeLMO) && getBranchObj()->isVisibleObj() ) + if (getBranchObj()->isInClickBox (p) && (this != excludeTI) && getBranchObj()->isVisibleObj() ) return this; /* FIXME-2 // Search float images for (int i=0; iisInClickBox(p) && - (floatimage.at(i) != excludeLMO) && - floatimage.at(i)->getParObj()!= excludeLMO && + (floatimage.at(i) != excludeTI) && + floatimage.at(i)->getParObj()!= excludeTI && floatimage.at(i)->isVisibleObj() ) return floatimage.at(i)->getTreeItem(); */ @@ -331,6 +337,15 @@ newbo->setParObj(parent()->getLMO() ); newbo->setTreeItem (this); newbo->setDefAttr(BranchObj::NewBranch); + + + if (!getHeading().isEmpty() ) + { + newbo->updateHeading(); + newbo->setColor (headingColor); + } + + //newbo->updateLink(); //FIXME-3 lmo=newbo; diff -r c6908bc17d78 -r 04039e47ac74 branchitem.h --- a/branchitem.h Mon Apr 27 12:42:06 2009 +0000 +++ b/branchitem.h Tue Apr 28 09:51:48 2009 +0000 @@ -28,6 +28,8 @@ virtual void setVymLink (QString); virtual QString getVymLink (); + virtual void setHeadingColor (QColor color); //!Overloaded from TreeItem to update QGraphicsView + protected: bool scrolled; // true if all children are scrolled and thus invisible bool tmpUnscrolled; // can only be true (temporary) for a scrolled subtree @@ -39,7 +41,7 @@ virtual void tmpUnscroll(); // unscroll scrolled parents temporary e.g. during "find" process virtual void resetTmpUnscroll(); // scroll all tmp scrolled parents again e.g. when unselecting - TreeItem* findMapItem (QPointF,TreeItem*); //! search map for branches or images + TreeItem* findMapItem (QPointF p,TreeItem* excludeTI); //! search map for branches or images. Ignore excludeTI, where search is started virtual TreeItem* findID (QString sid); //! search map for object with ID string BranchObj* getBranchObj(); diff -r c6908bc17d78 -r 04039e47ac74 doxygen.config --- a/doxygen.config Mon Apr 27 12:42:06 2009 +0000 +++ b/doxygen.config Tue Apr 28 09:51:48 2009 +0000 @@ -1,4 +1,4 @@ -# Doxyfile 1.5.5 +# Doxyfile 1.5.0 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,18 +14,10 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file -# that follow. The default is UTF-8 which is also the encoding used for all -# text before the first occurrence of this tag. Doxygen uses libiconv (or the -# iconv built into libc) for the transcoding. See -# http://www.gnu.org/software/libiconv for the list of possible encodings. - -DOXYFILE_ENCODING = UTF-8 - # The PROJECT_NAME tag is a single word (or a sequence of words surrounded # by quotes) that should identify the project. -PROJECT_NAME = +PROJECT_NAME = "VYM - View Your Mind" # The PROJECT_NUMBER tag can be used to enter a project or revision number. # This could be handy for archiving the generated documentation or @@ -38,7 +30,7 @@ # If a relative path is entered, it will be relative to the location # where doxygen was started. If left blank the current directory will be used. -OUTPUT_DIRECTORY = +OUTPUT_DIRECTORY = doc # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create # 4096 sub-directories (in 2 levels) under the output directory of each output @@ -54,14 +46,23 @@ # information to generate all constant output in the proper language. # The default language is English, other supported languages are: # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, -# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), -# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, -# Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, -# and Ukrainian. +# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, +# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, +# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, +# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English +# This tag can be used to specify the encoding used in the generated output. +# The encoding is not always determined by the language that is chosen, +# but also whether or not the output is meant for Windows or non-Windows users. +# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES +# forces the Windows encoding (this is the default for the Windows binary), +# whereas setting the tag to NO uses a Unix-style encoding (the default for +# all platforms other than Windows). + +USE_WINDOWS_ENCODING = NO + # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -134,19 +135,11 @@ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen # will interpret the first line (until the first dot) of a JavaDoc-style # comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like regular Qt-style comments -# (thus requiring an explicit @brief command for a brief description.) +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. JAVADOC_AUTOBRIEF = NO -# If the QT_AUTOBRIEF tag is set to YES then Doxygen will -# interpret the first line (until the first dot) of a Qt-style -# comment as the brief description. If set to NO, the comments -# will behave just like regular Qt-style comments (thus requiring -# an explicit \brief command for a brief description.) - -QT_AUTOBRIEF = NO - # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen # treat a multi-line C++ special comment block (i.e. a block of //! or /// # comments) as a brief description. This used to be the default behaviour. @@ -196,26 +189,14 @@ OPTIMIZE_OUTPUT_FOR_C = NO # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for -# Java. For instance, namespaces will be presented as packages, qualified -# scopes will look different, etc. +# sources only. Doxygen will then generate output that is more tailored for Java. +# For instance, namespaces will be presented as packages, qualified scopes +# will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran -# sources only. Doxygen will then generate output that is more tailored for -# Fortran. - -OPTIMIZE_FOR_FORTRAN = NO - -# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL -# sources. Doxygen will then generate output that is tailored for -# VHDL. - -OPTIMIZE_OUTPUT_VHDL = NO - -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want -# to include (a tag file for) the STL sources as input, then you should +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to +# include (a tag file for) the STL sources as input, then you should # set this tag to YES in order to let doxygen match functions declarations and # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. # func(std::string) {}). This also make the inheritance and collaboration @@ -223,17 +204,6 @@ BUILTIN_STL_SUPPORT = NO -# If you use Microsoft's C++/CLI language, you should set this option to YES to -# enable parsing support. - -CPP_CLI_SUPPORT = NO - -# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. -# Doxygen will parse them like normal C++ but will assume all classes use public -# instead of private inheritance when no explicit protection keyword is present. - -SIP_SUPPORT = NO - # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC # tag is set to YES, then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default @@ -249,16 +219,6 @@ SUBGROUPING = YES -# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum -# is documented as struct, union, or enum with the name of the typedef. So -# typedef struct TypeS {} TypeT, will appear in the documentation as a struct -# with name TypeT. When disabled the typedef will appear as a member of a file, -# namespace, or class. And the struct will be named TypeS. This can typically -# be useful for C code in case the coding convention dictates that all compound -# types are typedef'ed and only the typedef is referenced, never the tag name. - -TYPEDEF_HIDES_STRUCT = NO - #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -293,14 +253,6 @@ EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be -# extracted and appear in the documentation as a namespace called -# 'anonymous_namespace{file}', where file will be replaced with the base -# name of the file that contains the anonymous namespace. By default -# anonymous namespace are hidden. - -EXTRACT_ANON_NSPACES = NO - # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all # undocumented members of documented classes, files or namespaces. # If set to NO (the default) these members will be included in the @@ -376,12 +328,6 @@ SORT_BRIEF_DOCS = NO -# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the -# hierarchy of group names into alphabetical order. If set to NO (the default) -# the group names will appear in their defined order. - -SORT_GROUP_NAMES = NO - # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be # sorted by fully-qualified names, including namespaces. If set to # NO (the default), the class list will be sorted only by class name, @@ -444,8 +390,8 @@ SHOW_DIRECTORIES = NO # The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from -# the version control system). Doxygen will invoke the program by executing (via +# doxygen should invoke to get the current version for each file (typically from the +# version control system). Doxygen will invoke the program by executing (via # popen()) the command , where is the value of # the FILE_VERSION_FILTER tag, and is the name of an input file # provided by doxygen. Whatever the program writes to standard output @@ -515,20 +461,12 @@ INPUT = -# This tag can be used to specify the character encoding of the source files -# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -# also the default input encoding. Doxygen uses libiconv (or the iconv built -# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for -# the list of possible encodings. - -INPUT_ENCODING = UTF-8 - # If the value of the INPUT tag contains directories, you can use the # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py FILE_PATTERNS = @@ -556,15 +494,7 @@ # against the file with absolute path, so to exclude all test directories # for example use the pattern */test/* -EXCLUDE_PATTERNS = - -# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the -# output. The symbol name can be a fully qualified name, a word, or if the -# wildcard * is used, a substring. Examples: ANamespace, AClass, -# AClass::ANamespace, ANamespace::*Test - -EXCLUDE_SYMBOLS = +EXCLUDE_PATTERNS = moc_* # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see @@ -643,13 +573,13 @@ # then for each documented function all documented # functions referencing it will be listed. -REFERENCED_BY_RELATION = NO +REFERENCED_BY_RELATION = YES # If the REFERENCES_RELATION tag is set to YES (the default) # then for each documented function all documented entities # called/used by that function will be listed. -REFERENCES_RELATION = NO +REFERENCES_RELATION = YES # If the REFERENCES_LINK_SOURCE tag is set to YES (the default) # and SOURCE_BROWSER tag is set to YES, then the hyperlinks from @@ -745,44 +675,11 @@ # If the GENERATE_HTMLHELP tag is set to YES, additional index files # will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) # of the generated HTML documentation. GENERATE_HTMLHELP = NO -# If the GENERATE_DOCSET tag is set to YES, additional index files -# will be generated that can be used as input for Apple's Xcode 3 -# integrated development environment, introduced with OSX 10.5 (Leopard). -# To create a documentation set, doxygen will generate a Makefile in the -# HTML output directory. Running make will produce the docset in that -# directory and running "make install" will install the docset in -# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find -# it at startup. - -GENERATE_DOCSET = NO - -# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the -# feed. A documentation feed provides an umbrella under which multiple -# documentation sets from a single provider (such as a company or product suite) -# can be grouped. - -DOCSET_FEEDNAME = "Doxygen generated docs" - -# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that -# should uniquely identify the documentation set bundle. This should be a -# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen -# will append .docset to the name. - -DOCSET_BUNDLE_ID = org.doxygen.Project - -# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML -# documentation will contain sections that can be hidden and shown after the -# page has loaded. For this to work a browser that supports -# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox -# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). - -HTML_DYNAMIC_SECTIONS = NO - # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be @@ -847,7 +744,7 @@ # If the GENERATE_LATEX tag is set to YES (the default) Doxygen will # generate Latex output. -GENERATE_LATEX = YES +GENERATE_LATEX = NO # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. # If a relative path is entered the value of OUTPUT_DIRECTORY will be @@ -895,13 +792,13 @@ # contain links (just like the HTML output) instead of page references # This makes the output suitable for online browsing using a pdf viewer. -PDF_HYPERLINKS = YES +PDF_HYPERLINKS = NO # If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of # plain latex in the generated Makefile. Set this option to YES to get a # higher quality PDF documentation. -USE_PDFLATEX = YES +USE_PDFLATEX = NO # If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. # command to the generated LaTeX files. This will instruct LaTeX to keep @@ -1188,15 +1085,6 @@ CLASS_DIAGRAMS = YES -# You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see -# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the -# documentation. The MSCGEN_PATH tag allows you to specify the directory where -# the mscgen tool resides. If left empty the tool is assumed to be found in the -# default search path. - -MSCGEN_PATH = - # If set to YES, the inheritance and collaboration graphs will hide # inheritance and usage relations if the target is undocumented # or is not a class. @@ -1254,19 +1142,19 @@ INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH and HAVE_DOT options are set to YES then -# doxygen will generate a call dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable call graphs -# for selected functions only using the \callgraph command. +# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a call dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then -# doxygen will generate a caller dependency graph for every global function -# or class method. Note that enabling this option will significantly increase -# the time of a run. So in most cases it will be better to enable caller -# graphs for selected functions only using the \callergraph command. +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then doxygen will +# generate a caller dependency graph for every global function or class method. +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. CALLER_GRAPH = NO @@ -1299,33 +1187,41 @@ DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of -# nodes that will be shown in the graph. If the number of nodes in a graph -# becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the -# number of direct children of the root node in a graph is already larger than -# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note -# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. -DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_WIDTH = 1024 + +# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height +# (in pixels) of the graphs generated by dot. If a graph becomes larger than +# this value, doxygen will try to truncate the graph, so that it fits within +# the specified constraint. Beware that most browsers cannot cope with very +# large images. + +MAX_DOT_GRAPH_HEIGHT = 1024 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the # graphs generated by dot. A depth value of 3 means that only nodes reachable # from the root by following a path via at most 3 edges will be shown. Nodes # that lay further from the root node will be omitted. Note that setting this # option to 1 or 2 may greatly reduce the computation time needed for large -# code bases. Also note that the size of a graph can be further restricted by -# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. +# code bases. Also note that a graph may be further truncated if the graph's +# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH +# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), +# the graph is not depth-constrained. MAX_DOT_GRAPH_DEPTH = 0 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is enabled by default, which results in a transparent -# background. Warning: Depending on the platform used, enabling this option -# may lead to badly anti-aliased labels on the edges of a graph (i.e. they -# become hard to read). +# background. This is disabled by default, which results in a white background. +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). -DOT_TRANSPARENT = YES +DOT_TRANSPARENT = NO # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This diff -r c6908bc17d78 -r 04039e47ac74 treeitem.cpp --- a/treeitem.cpp Mon Apr 27 12:42:06 2009 +0000 +++ b/treeitem.cpp Tue Apr 28 09:51:48 2009 +0000 @@ -1,6 +1,4 @@ #include -using namespace std; - #include #include "treeitem.h" @@ -9,6 +7,9 @@ #include "branchitem.h" #include "vymmodel.h" +using namespace std; + + TreeItem::TreeItem(const QList &data, TreeItem *parent) { init(); @@ -237,6 +238,16 @@ return itemData[0].toString().toStdString(); } +void TreeItem::setHeadingColor (QColor color) +{ + headingColor=color; +} + +QColor TreeItem::getHeadingColor () +{ + return headingColor; +} + void TreeItem::setNote(const QString s) { note.setNote(s); diff -r c6908bc17d78 -r 04039e47ac74 treeitem.h --- a/treeitem.h Mon Apr 27 12:42:06 2009 +0000 +++ b/treeitem.h Tue Apr 28 09:51:48 2009 +0000 @@ -1,6 +1,7 @@ #ifndef TREEITEM_H #define TREEITEM_H +#include #include #include @@ -49,21 +50,27 @@ /*! Return number of item in parent by type, e.g. first branch has number 0 */ - int childNum(); //! Return number of item in list of all children - int num(); //! Return number of item by type - int num (TreeItem *item); //! Return number of item by type + virtual int childNum(); //! Return number of item in list of all children + virtual int num(); //! Return number of item by type + virtual int num (TreeItem *item); //! Return number of item by type // Accessing data - QVariant data(int column) const; - void setHeading (const QString s); - QString getHeading() const; - std::string getHeadingStd() const; //! convenience function used for debugging + virtual QVariant data(int column) const; + +protected: + QColor headingColor; +public: + virtual void setHeading (const QString s); + virtual QString getHeading() const; + virtual std::string getHeadingStd() const; //! convenience function used for debugging + virtual void setHeadingColor(QColor color); //! Set color of heading. In BranchItem overloaded to update QGraphicsView + virtual QColor getHeadingColor(); //! Returns color of heading protected: NoteObj note; public: - void setNote(const QString s); - QString getNote(); + virtual void setNote(const QString s); + virtual QString getNote(); virtual void setNoteObj(const NoteObj &, bool updateNoteEditor=true); virtual NoteObj getNoteObj(); virtual QString getNoteASCII(const QString &indent, const int &width); // returns note (ASCII) @@ -74,10 +81,10 @@ protected: Type type; public: - void setType (const Type t); - Type getType (); - bool isBranchLikeType() const; - QString getTypeName (); + virtual void setType (const Type t); + virtual Type getType (); + virtual bool isBranchLikeType() const; + virtual QString getTypeName (); protected: QString objID; //! id set during load/save currently used for xLinks @@ -86,15 +93,15 @@ virtual QString getID (); // Navigation and selection - TreeItem* getChildNum(const int &n); - BranchItem* getFirstBranch(); - BranchItem* getLastBranch(); - BranchItem* getBranchNum(const int &n); - BranchObj* getBranchObjNum(const int &n); - void setLastSelectedBranch(); //! Set myself as last selected in parent - void setLastSelectedBranch(int i); //! Set last selected branch directly - TreeItem* getLastSelectedBranch(); - TreeItem* findBySelectString (const QString &); + virtual TreeItem* getChildNum(const int &n); + virtual BranchItem* getFirstBranch(); + virtual BranchItem* getLastBranch(); + virtual BranchItem* getBranchNum(const int &n); + virtual BranchObj* getBranchObjNum(const int &n); + virtual void setLastSelectedBranch(); //! Set myself as last selected in parent + virtual void setLastSelectedBranch(int i); //! Set last selected branch directly + virtual TreeItem* getLastSelectedBranch(); + virtual TreeItem* findBySelectString (const QString &); virtual void setHideTmp (HideTmpMode); virtual bool hasHiddenExportParent (); @@ -103,9 +110,9 @@ virtual bool isHidden (); - // Relation to map objects in graphicsscene // FIXME-3 should be obsolete - LinkableMapObj* getLMO(); - void setLMO (LinkableMapObj*); + // Relation to map objects in graphicsscene // FIXME-4 should be obsolete + virtual LinkableMapObj* getLMO(); + virtual void setLMO (LinkableMapObj*); protected: VymModel *model; diff -r c6908bc17d78 -r 04039e47ac74 xml-vym.cpp --- a/xml-vym.cpp Mon Apr 27 12:42:06 2009 +0000 +++ b/xml-vym.cpp Tue Apr 28 09:51:48 2009 +0000 @@ -171,7 +171,7 @@ if (!atts.value( "textColor").isEmpty() ) { col.setNamedColor(atts.value("textColor")); - //FIXME-2 lastBranch->setColor(col ); + lastBranchItem->setHeadingColor(col ); } } else if ( eName == "note" && (state == StateMapCenter ||state==StateBranch))