Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-02-13 08:34:30 -0500
committerCamille Letavernier2015-02-13 08:36:41 -0500
commitc7038fed69070c02940a40c17032a6f903287358 (patch)
tree75d3affef313e6204e5ad7a2c2777dc5b082980c
parent9f2725ef2426ba69dd86758aad852053949b2403 (diff)
downloadorg.eclipse.papyrus-c7038fed69070c02940a40c17032a6f903287358.tar.gz
org.eclipse.papyrus-c7038fed69070c02940a40c17032a6f903287358.tar.xz
org.eclipse.papyrus-c7038fed69070c02940a40c17032a6f903287358.zip
410986: [Diagram Import] Papyrus shall enable to import layout
information of other tools models https://bugs.eclipse.org/bugs/show_bug.cgi?id=410986 - Improve the layout of Activity Diagram Partitions
-rw-r--r--extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto6
1 files changed, 3 insertions, 3 deletions
diff --git a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto
index 0097b57e82d..add6077e187 100644
--- a/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto
+++ b/extraplugins/migration/org.eclipse.papyrus.migration.rsa/transform/RSAActivityDiagram.qvto
@@ -69,11 +69,11 @@ mapping inout Shape::fixMergeDecisionSize() when {
if layout.height = -1 then layout.height := 50 endif;
}
-property partitionX : Integer = 50;
+property partitionX : Integer = 20;
mapping inout Node::fixPartitionsLayout() {
var width: Integer := 200; //Approximation. In RSA, the layout can be computed automatically based on the Partition's Contents. In Papyrus, this must be specified explicitely
- var marginHeight := 30;
+ var marginHeight := 10; //Note: Papyrus currently has an additional margin in the bottom of Activities, which is ~60px. As a result, marginHeight rather corresponds to "marginTop" (Bug 459888)
var bounds : Bounds := self.layoutConstraint.oclAsType(Bounds);
@@ -90,7 +90,7 @@ mapping inout Node::fixPartitionsLayout() {
} else {
previousPartition.map fixPartitionsLayout(); /* Ensure that partition n-1 is already fixed */
var previousBounds := previousPartition.layoutConstraint.oclAsType(Bounds);
- bounds.x := previousBounds.x + previousBounds.width;
+ bounds.x := previousBounds.x + previousBounds.width - 1; //-1 to force Partition border overlap
} endif;
bounds.width := width.max(bounds.width);

Back to the top