Skip to content
Snippets Groups Projects

Develop

Merged Peter Zhai requested to merge develop into develop_peter
2 files
+ 90
7
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 10
4
@@ -182,6 +182,10 @@ var cqhm = cqhm || {};
position: { x: 20, y: 15 },
size: { width: 30, height: 30 }
}),
new cqhm.modelTypes.StatechartEntryPoint2({
source: { x: 75, y: 15 },
target: { x: 75, y: 60 }
}),
new cqhm.modelTypes.State({
position: { x: 10, y: 50 },
size: { width: 80, height: 40 }
@@ -675,7 +679,7 @@ var cqhm = cqhm || {};
}
// Handle connection shapes
} else if (_.contains(["cqhm.Flow", "cqhm.StateTransition", "cqhm.StateTransitionTrue", "cqhm.StateTransitionFalse", "cqhm.CausalConnectionPositive"], type)) {
} else if (_.contains(["cqhm.Flow", "cqhm.StatechartEntryPoint2", "cqhm.StateTransition", "cqhm.StateTransitionTrue", "cqhm.StateTransitionFalse", "cqhm.CausalConnectionPositive"], type)) {
// Find all the changes
var changes = {};
@@ -811,7 +815,7 @@ var cqhm = cqhm || {};
newRtElem.set("size.width", size.width);
newRtElem.set("size.height", size.height);
} else if (_.contains(["cqhm.Flow", "cqhm.StateTransition", "cqhm.StateTransitionTrue", "cqhm.StateTransitionFalse", "cqhm.CausalConnectionPositive"], type)) {
} else if (_.contains(["cqhm.Flow", "cqhm.StateTransition", "cqhm.StatechartEntryPoint2", "cqhm.StateTransitionTrue", "cqhm.StateTransitionFalse", "cqhm.CausalConnectionPositive"], type)) {
var source = jointjsCell.get("source");
newRtElem.set("source.x", source.x);
newRtElem.set("source.y", source.y);
@@ -861,8 +865,8 @@ var cqhm = cqhm || {};
width: realtimeModelObj.get("size.width"),
height: realtimeModelObj.get("size.height")
};
} else if (_.contains(["cqhm.Flow", "cqhm.StateTransition", "cqhm.StateTransitionTrue", "cqhm.StateTransitionFalse", "cqhm.CausalConnectionPositive"], cellType)) {
} else if (_.contains(["cqhm.Flow", "cqhm.StateTransition", "cqhm.StateTransitionTrue", "cqhm.StateTransitionFalse", "cqhm.StatechartEntryPoint2", "cqhm.CausalConnectionPositive"], cellType)) {
params.source = {};
params.target = {};
_.each(["x", "y", "id"], function(paramName) {
@@ -898,6 +902,8 @@ var cqhm = cqhm || {};
newCell = new cqhm.modelTypes.StateTransitionFalse(params);
} else if ("cqhm.StatechartEntryPoint" == cellType) {
newCell = new cqhm.modelTypes.StatechartEntryPoint(params);
} else if ("cqhm.StatechartEntryPoint2" == cellType) {
newCell = new cqhm.modelTypes.StatechartEntryPoint2(params);
} else if ("cqhm.CausalConnectionPositive" == cellType) {
newCell = new cqhm.modelTypes.CausalConnectionPositive(params);
} else if ("cqhm.State" == cellType) {
Loading