diff -r 658ad3bc0c8a -r dfbc371b7280 linkablemapobj.cpp --- a/linkablemapobj.cpp Sat Mar 31 09:28:27 2007 +0000 +++ b/linkablemapobj.cpp Sat Mar 31 09:28:27 2007 +0000 @@ -28,8 +28,6 @@ LinkableMapObj::~LinkableMapObj() { delete (bottomline); - delete (selbox); - delete (frame); delLink(); } @@ -81,18 +79,12 @@ bottomline->show(); // Prepare showing the selection of a MapObj - selbox = scene->addRect(QRectF(0,0,0,0), QPen(QColor(255,255,0) ), QColor(255,255,0)); - selbox->setZValue(Z_SELBOX); - selbox->hide(); selected=false; hideLinkUnselected=false; topPad=botPad=leftPad=rightPad=0; - // initialize frame - frame = new FrameObj (scene); - repositionRequest=false; // Rel Positions @@ -347,27 +339,6 @@ return linkcolor; } -FrameType LinkableMapObj::getFrameType() -{ - return frame->getFrameType(); -} - -void LinkableMapObj::setFrameType(const FrameType &t) -{ - frame->setFrameType(t); - calcBBoxSize(); - positionBBox(); - requestReposition(); -} - -void LinkableMapObj::setFrameType(const QString &t) -{ - frame->setFrameType(t); - calcBBoxSize(); - positionBBox(); - requestReposition(); -} - void LinkableMapObj::setVisibility (bool v) { MapObj::setVisibility (v); @@ -465,16 +436,12 @@ // have parents yet... if (style==StyleUndef) return; - if (frame->getFrameType() == NoFrame) - linkpos=LinkBottom; - else - linkpos=LinkMiddle; switch (linkpos) { case LinkMiddle: - bottomlineY=bbox.top()+bbox.height() /2; // draw link to middle (of frame) + bottomlineY=bbox.top() + bbox.height()/2; // draw link to middle (of frame) break; - default : + case LinkBottom: bottomlineY=bbox.bottom()-1; // draw link to bottom of box break; } @@ -687,17 +654,9 @@ } -void LinkableMapObj::setSelBox() -{ - //selbox->prepareGeometryChange(); - selbox->setRect (clickBox); -} - void LinkableMapObj::select() { - setSelBox(); selected=true; - selbox->show(); setVisibility (visible); } @@ -705,7 +664,6 @@ void LinkableMapObj::unselect() { selected=false; - selbox->hide(); // Maybe we have to hide the link: setVisibility (visible); }