[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Ralf Habacker]

SVN commit 1285119 by habacker:

Fixed auto layout label setting when using id::type::... attribute.

 M  +5 -2      layoutgenerator.h  


--- trunk/KDE/kdesdk/umbrello/umbrello/layoutgenerator.h #1285118:1285119
@@ -199,9 +199,12 @@
         foreach(AssociationWidget *assoc, scene->getAssociationList()) {
             AssociationLine *path = assoc->getLinePath();
             QString type = assoc->associationType().toString().toLower();
+            QString key = "type::" + type;
+
             QString id;
-            //uDebug() << "WidgetName" << assoc->widgetForRole(Uml::A)->name() << assoc->widgetForRole(Uml::B)->name();
-            // associations seems to have the parent in the Uml::B role, so use B for the left dot node
+            if (m_edgeParameters.contains("id::" + key) && m_edgeParameters["id::" + key] == "swap")
+                id = fixID(ID2STR(assoc->getWidgetID(Uml::A)) + ID2STR(assoc->getWidgetID(Uml::B)));
+            else
             id = fixID(ID2STR(assoc->getWidgetID(Uml::B)) + ID2STR(assoc->getWidgetID(Uml::A)));
 
             // adjust associations not used in the dot file