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

[Ralf Habacker]

SVN commit 1285095 by habacker:

Applied edge style and placement from export style.

 M  +8 -4      class-horizontal.desktop  
 M  +4 -1      class-vertical.desktop  


--- trunk/KDE/kdesdk/umbrello/umbrello/layouts/class-horizontal.desktop #1285094:1285095
@@ -21,9 +21,11 @@
 
 # for image output
 [X-UMBRELLO-Dot-Edges]
+# for visual representation
 visual::type::anchor=arrowhead=none,style=dashed
 visual::type::aggregation=arrowtail=odiamond,dir=back
-visual::type::composition=arrowtail=diamond,dir=back
+visual::type::composition=arrowhead=diamonds
+visual::type::containment=arrowtail=odottee,dir=back
 visual::type::dependency=arrowtail=vee,style=dashed,dir=back
 visual::type::uniassociation=arrowtail=vee,dir=back
 visual::type::association=arrowhead=none
@@ -32,16 +34,18 @@
 visual::type::default=arrowhead=none
 # for position ranking
 ranking::type::anchor=constraint=false
-ranking::type::aggregation=weight=0.01
+ranking::type::aggregation=weight=0.001
 ranking::type::association=constraint=false
-ranking::type::composition=weight=0.01
-ranking::type::dependency=weight=0.01
+ranking::type::composition=weight=0.001
+ranking::type::containment=weight=0.001
+ranking::type::dependency=weight=0.001
 ranking::type::generalization=weight=1.0
 ranking::type::realisation=weight=0.8
 ranking::type::uniassociation=constraint=false
 ranking::type::default=constraint=false
 # id handling
 id::type::aggregation=swap
+id::type::containment=swap
 
 [X-UMBRELLO-Dot-Attributes]
 graph=splines=polyline,rankdir=LR,outputorder=nodesfirst,ranksep=1.0,nodesep=0.8
--- trunk/KDE/kdesdk/umbrello/umbrello/layouts/class-vertical.desktop #1285094:1285095
@@ -24,7 +24,8 @@
 # for visual representation
 visual::type::anchor=arrowhead=none,style=dashed
 visual::type::aggregation=arrowtail=odiamond,dir=back
-visual::type::composition=arrowtail=diamond,dir=back
+visual::type::composition=arrowhead=diamonds
+visual::type::containment=arrowtail=odottee,dir=back
 visual::type::dependency=arrowtail=vee,style=dashed,dir=back
 visual::type::uniassociation=arrowtail=vee,dir=back
 visual::type::association=arrowhead=none
@@ -36,6 +37,7 @@
 ranking::type::aggregation=weight=0.001
 ranking::type::association=constraint=false
 ranking::type::composition=weight=0.001
+ranking::type::containment=weight=0.001
 ranking::type::dependency=weight=0.001
 ranking::type::generalization=weight=1.0
 ranking::type::realisation=weight=0.8
@@ -43,6 +45,7 @@
 ranking::type::default=constraint=false
 # id handling
 id::type::aggregation=swap
+id::type::containment=swap
 
 [X-UMBRELLO-Dot-Attributes]
 graph=splines=polyline,rankdir=TB,outputorder=nodesfirst,ranksep=0.5,nodesep=0.5