1.1 --- a/branchobj.cpp Tue Sep 06 15:04:50 2005 +0000
1.2 +++ b/branchobj.cpp Thu Sep 22 12:56:05 2005 +0000
1.3 @@ -201,19 +201,9 @@
1.4 // ignore mapcenter and mainbranch
1.5 if (lmo->getDepth()<2) off=0;
1.6 if (off==0)
1.7 - {
1.8 link2ParPos=false;
1.9 - // parObj=o;
1.10 - }
1.11 else
1.12 - {
1.13 link2ParPos=true;
1.14 - // if (off>0)
1.15 - // parObj=o->getParObj();
1.16 - // else
1.17 - // parObj=o->getParObj();
1.18 - // parObj=o;
1.19 - }
1.20 parObj=o;
1.21
1.22 depth=parObj->getDepth()+1;
1.23 @@ -400,10 +390,11 @@
1.24 // Overloaded from LinkableMapObj
1.25 // BranchObj can use color of heading
1.26
1.27 - if (mapEditor->getLinkColorHint()==HeadingColor)
1.28 - LinkableMapObj::setLinkColor (heading->getColor() );
1.29 - else
1.30 - LinkableMapObj::setLinkColor ();
1.31 + if (mapEditor)
1.32 + if (mapEditor->getLinkColorHint()==HeadingColor)
1.33 + LinkableMapObj::setLinkColor (heading->getColor() );
1.34 + else
1.35 + LinkableMapObj::setLinkColor ();
1.36 }
1.37
1.38 void BranchObj::setColor (QColor col, bool colorChilds)
1.39 @@ -578,7 +569,7 @@
1.40
1.41 void BranchObj::positionBBox()
1.42 {
1.43 - // FIXME testing (optimization)
1.44 + // TODO testing (optimization)
1.45 /*
1.46 QString h=getHeading();
1.47 if (!h.isEmpty())
1.48 @@ -663,12 +654,6 @@
1.49
1.50 void BranchObj::setHeading(QString s)
1.51 {
1.52 - /*FIXME
1.53 - // Adjusting font size
1.54 - QFont font=heading->getFont();
1.55 - font.setPointSize(getDefHeadingSize() );
1.56 - heading->setFont(font);
1.57 - */
1.58 heading->setText(s); // set new heading
1.59 calcBBoxSize(); // recalculate bbox
1.60 positionBBox(); // rearrange contents
1.61 @@ -1140,7 +1125,7 @@
1.62
1.63 void BranchObj::alignRelativeTo (QPoint ref)
1.64 {
1.65 -/* FIXME testing
1.66 +/* TODO testing
1.67 if (!getHeading().isEmpty())
1.68 cout << "BO::alignRelTo "<<getHeading()<<endl;
1.69 else
1.70 @@ -1210,7 +1195,7 @@
1.71
1.72 void BranchObj::reposition()
1.73 {
1.74 -/* FIXME testing
1.75 +/* TODO testing only
1.76 if (!getHeading().isEmpty())
1.77 cout << "BO::reposition "<<getHeading()<<endl;
1.78 else