1.1 --- a/linkablemapobj.cpp Mon Oct 06 11:10:20 2008 +0000
1.2 +++ b/linkablemapobj.cpp Wed Oct 29 17:42:34 2008 +0000
1.3 @@ -68,6 +68,7 @@
1.4 childPos=QPointF(0,0);
1.5 link2ParPos=false;
1.6 l=NULL;
1.7 + p=NULL;
1.8 orientation=UndefinedOrientation;
1.9 linkwidth=20;
1.10 thickness_start=8;
1.11 @@ -214,9 +215,10 @@
1.12 if (!model)
1.13 {
1.14 qWarning ("LMO::getDefLinkStyle model=NULL");
1.15 - return UndefinedStyle;
1.16 + //return UndefinedStyle;
1.17 }
1.18 Style ls=model->getMapLinkStyle();
1.19 + if (depth==0) return UndefinedStyle;
1.20 switch (ls)
1.21 {
1.22 case Line:
1.23 @@ -245,7 +247,7 @@
1.24
1.25 void LinkableMapObj::setLinkStyle(Style newstyle)
1.26 {
1.27 - //if (newstyle=style) return;
1.28 + //if (newstyle=style) return; FIXME
1.29 delLink();
1.30
1.31 style=newstyle;
1.32 @@ -404,9 +406,11 @@
1.33 segment.at(i)->show();
1.34 break;
1.35 case PolyLine:
1.36 + if (!p) cout << "LMO::setVis p==0 (PolyLine)\n"; //FIXME
1.37 if (p) p->show();
1.38 break;
1.39 case PolyParabel:
1.40 + if (!p) cout << "LMO::setVis p==0 (PolyParabel) "<<((BranchObj*)this)->getHeading().toStdString()<<endl; //FIXME
1.41 if (p) p->show();
1.42 break;
1.43 default: