1.1 --- a/branchobj.h	Tue Mar 31 15:36:10 2009 +0000
     1.2 +++ b/branchobj.h	Wed Apr 01 15:06:57 2009 +0000
     1.3 @@ -31,22 +31,10 @@
     1.4      virtual void init ();
     1.5      virtual void copy (BranchObj*);
     1.6      void clear();
     1.7 -	virtual int getNum();				// return number of this in parent
     1.8 -	virtual int getNum(BranchObj*);		// return number of this in parent
     1.9 -	virtual int getFloatImageNum(FloatImageObj*);		
    1.10 -	virtual int countBranches();		
    1.11 -	virtual int countFloatImages();		
    1.12 -	virtual int countXLinks();		
    1.13 +
    1.14      virtual void setParObjTmp (LinkableMapObj*,QPointF,int);// Only for moving Obj around
    1.15  	virtual void unsetParObjTmp();			// reuse original ParObj
    1.16  
    1.17 -	virtual void unScroll();				
    1.18 -	virtual void toggleScroll();			// scroll or unscroll
    1.19 -	virtual bool isScrolled();				// returns scroll state
    1.20 -	virtual bool hasScrolledParent(BranchObj*);	// true, if any of the parents is scrolled
    1.21 -	virtual void tmpUnscroll();				// unscroll scrolled parents temporary e.g. during "find" process
    1.22 -	virtual void resetTmpUnscroll();		// scroll all tmp scrolled parents again e.g. when unselecting
    1.23 -
    1.24  	virtual void setVisibility(bool,int);	// set visibility
    1.25      virtual void setVisibility(bool);	    // set vis. for w
    1.26  	virtual void setLinkColor();			// set the color of link
    1.27 @@ -68,18 +56,20 @@
    1.28  	virtual bool hasHiddenExportParent ();
    1.29  
    1.30  	virtual QString saveToDir (const QString&,const QString&, const QPointF&);// Save data recursivly to tempdir
    1.31 +
    1.32  	virtual void addXLink (XLinkObj*);
    1.33  	virtual void removeXLinkRef (XLinkObj*);// Remove ref in list
    1.34  	virtual void deleteXLink (XLinkObj*);	// remove references and delete XLinkObj 
    1.35  	virtual void deleteXLinkAt (int);		// remove references and delete XLinkObj 
    1.36  	virtual XLinkObj* XLinkAt (int);		// return reference of XLinkObj 
    1.37 -	virtual int countXLink ();
    1.38  	virtual BranchObj* XLinkTargetAt (int);
    1.39 +
    1.40  	void setIncludeImagesVer(bool);
    1.41  	bool getIncludeImagesVer();
    1.42  	void setIncludeImagesHor(bool);
    1.43  	bool getIncludeImagesHor();
    1.44  	QString getIncludeImageAttr();
    1.45 +
    1.46  	virtual FloatImageObj* addFloatImage();
    1.47  	virtual FloatImageObj* addFloatImage(FloatImageObj*);
    1.48  	virtual void removeFloatImage(FloatImageObj*);
    1.49 @@ -100,13 +90,16 @@
    1.50      virtual void removeChildren();  
    1.51      virtual void removeBranch(BranchObj*);  
    1.52      virtual void removeBranchPtr (BranchObj*);  
    1.53 +
    1.54      virtual BranchObj* getFirstBranch();
    1.55      virtual BranchObj* getLastBranch();
    1.56  	virtual BranchObj* getBranchNum(int);
    1.57 +
    1.58      virtual bool canMoveBranchUp();
    1.59      virtual BranchObj* moveBranchUp(BranchObj*);
    1.60      virtual bool canMoveBranchDown();
    1.61      virtual BranchObj* moveBranchDown(BranchObj*);
    1.62 +
    1.63      virtual void sortChildren();
    1.64      virtual BranchObj* linkTo (BranchObj*, int);
    1.65      virtual void alignRelativeTo(const QPointF, bool alignSelf=false );
    1.66 @@ -134,11 +127,10 @@
    1.67  public:	
    1.68  	float angle;					// used in mainbranch to reorder mainbranches
    1.69  protected:	
    1.70 -	bool scrolled;					// true if all children are scrolled and thus invisible
    1.71 -	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
    1.72 +//	bool scrolled;					// true if all children are scrolled and thus invisible
    1.73 +//	bool tmpUnscrolled;				// can only be true (temporary) for a scrolled subtree
    1.74  	bool includeImagesVer;			// include floatimages in bbox vertically
    1.75  	bool includeImagesHor;			// include floatimages in bbox horizontally
    1.76 -
    1.77  };
    1.78  
    1.79