diff -r 7b4e73ac247e -r 1fb50e79661c vymmodel.cpp --- a/vymmodel.cpp Mon Jun 29 10:28:28 2009 +0000 +++ b/vymmodel.cpp Tue Jul 07 09:34:24 2009 +0000 @@ -1623,7 +1623,7 @@ saveState (bi, QString("setFrameType (\"%1\")").arg(s), bi, QString ("setFrameType (\"%1\")").arg(bo->getFrameTypeName()),QString ("set type of frame to %1").arg(s)); reposition(); - bo->updateLink(); + bo->updateLinkGeometry(); } } } @@ -1640,7 +1640,7 @@ bi, QString ("setFrameType (\"%1\")").arg(s),QString ("set type of frame to %1").arg(s)); bo->setFrameType (s); reposition(); - bo->updateLink(); + bo->updateLinkGeometry(); } } } @@ -1688,7 +1688,7 @@ bi, QString ("setFramePadding (\"%1\")").arg(i),QString ("set brush color of frame to %1").arg(i)); bo->setFramePadding (i); reposition(); - bo->updateLink(); + bo->updateLinkGeometry(); } } } @@ -1705,7 +1705,7 @@ bi, QString ("setFrameBorderWidth (\"%1\")").arg(i),QString ("set border width of frame to %1").arg(i)); bo->setFrameBorderWidth (i); reposition(); - bo->updateLink(); + bo->updateLinkGeometry(); } } } @@ -1763,26 +1763,21 @@ void VymModel::setHideLinkUnselected (bool b)//FIXME-2 { -/* - LinkableMapObj *sel=getSelectedLMO(); - if (sel && - (selectionType() == TreeItem::Branch || - selectionType() == TreeItem::MapCenter || - selectionType() == TreeItem::Image )) + TreeItem *ti=getSelectedItem(); + if (ti && (ti->getType()==TreeItem::Image ||ti->isBranchLikeType())) { QString u= b ? "false" : "true"; QString r=!b ? "false" : "true"; saveState( - sel, + ti, QString("setHideLinkUnselected (%1)").arg(u), - sel, + ti, QString("setHideLinkUnselected (%1)").arg(r), - QString("Hide link of %1 if unselected").arg(getObjectName(sel)) + QString("Hide link of %1 if unselected").arg(getObjectName(ti)) ); - sel->setHideLinkUnselected(b); + ((MapItem*)ti)->setHideLinkUnselected(b); } -*/ } void VymModel::setHideExport(bool b) @@ -4283,7 +4278,7 @@ QString("Move %1 to relative position %2").arg(getObjectName(bo)).arg(ps)); ((OrnamentedObj*)bo)->move2RelPos (x,y); reposition(); - bo->updateLink(); + bo->updateLinkGeometry(); emitSelectionChanged(); } } @@ -4953,9 +4948,7 @@ TreeItem *ti = getItem (list.first() ); TreeItem::Type type=ti->getType(); if (type ==TreeItem::Branch || type==TreeItem::MapCenter || type==TreeItem::Image) - { - return ti->getLMO(); - } + return ((MapItem*)ti)->getLMO(); } return NULL; } @@ -4964,7 +4957,7 @@ { TreeItem *ti = getSelectedBranchItem(); if (ti) - return (BranchObj*)(ti->getLMO()); + return (BranchObj*)( ((MapItem*)ti)->getLMO()); else return NULL; }