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

[Ralf Habacker]

SVN commit 1286277 by habacker:

Added id::type::default to dot export and layout generator config,
which is used in case no explicit id::type::... setting is present.

CCBUG: 67059
CCBUG: 295600

 M  +11 -2     dotgenerator.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/dotgenerator.cpp #1286276:1286277
@@ -364,10 +364,19 @@
     foreach(AssociationWidget *assoc, scene->associationList()) {
         QString type = assoc->associationType().toString().toLower();
         QString key = "type::" + type;
-        bool swapId = m_edgeParameters.contains("id::" + key) && m_edgeParameters["id::" + key] == "swap";
+        bool swapId = false;
 
-        QString label = assoc->getName();
+        if (m_edgeParameters.contains("id::" + key))
+            swapId = m_edgeParameters["id::" + key] == "swap";
+        else if (m_edgeParameters.contains("id::type::default"))
+            swapId = m_edgeParameters["id::type::default"] == "swap";
 
+        QString label;
+        if (!useFullNodeLabels())
+            label = assoc->getName() + "\\n" + type;
+        else
+            label = assoc->getName();
+
         QString headLabel = assoc->roleName(swapId ? Uml::B : Uml::A);
         QString tailLabel = assoc->roleName(swapId ? Uml::A : Uml::B);