Workcraft

Merge lp:~danilovesky/workcraft/trunk-connection-anchor-movement into lp:workcraft

  1. trunk-connection-anchor-movement
  2. Merge into trunk
Proposed by Danil Sokolov
Status: Merged
Merged at revision: 593
Proposed branch: lp:~danilovesky/workcraft/trunk-connection-anchor-movement
Merge into: lp:workcraft
Diff against target: 50 lines (+9/-7)
2 files modified
DfsPlugin/src/org/workcraft/plugins/dfs/tools/WaggingGenerator.java (+4/-4)
WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java (+5/-3)
To merge this branch: bzr merge lp:~danilovesky/workcraft/trunk-connection-anchor-movement
Reviewer Review Type Date Requested Status
Danil Sokolov Approve
Review via email: mp+251077@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Danil Sokolov (danilovesky) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'DfsPlugin/src/org/workcraft/plugins/dfs/tools/WaggingGenerator.java'
2--- DfsPlugin/src/org/workcraft/plugins/dfs/tools/WaggingGenerator.java 2015-01-20 15:37:33 +0000
3+++ DfsPlugin/src/org/workcraft/plugins/dfs/tools/WaggingGenerator.java 2015-02-26 13:10:08 +0000
4@@ -150,16 +150,16 @@
5 for (VisualComponent cur: waggingData.dataComponents) {
6 for (Node pred: dfs.getPreset(replicaToOriginalMap.get(cur))) {
7 if (selectedComponents.contains(pred)) continue;
8- VisualPushRegister push = createPushRegister(Hierarchy.getNearestContainer(cur, pred),
9- new Point2D.Double(cur.getX()/2 + ((VisualComponent)pred).getX()/2, cur.getY()));
10+ Point2D.Double position = new Point2D.Double(cur.getX()/2 + ((VisualComponent)pred).getX()/2, cur.getY());
11+ VisualPushRegister push = createPushRegister(Hierarchy.getNearestContainer(cur, pred), position);
12 createConnection((VisualComponent)pred, push);
13 createConnection(push, cur);
14 waggingData.pushRegisters.add(push);
15 }
16 for (Node succ: dfs.getPostset(replicaToOriginalMap.get(cur))) {
17 if (selectedComponents.contains(succ)) continue;
18- VisualPopRegister pop = createPopRegister(Hierarchy.getNearestContainer(cur, succ),
19- new Point2D.Double((cur.getX()/2 + ((VisualComponent)succ).getX())/2, cur.getY()));
20+ Point2D.Double position = new Point2D.Double(cur.getX()/2 + ((VisualComponent)succ).getX()/2, cur.getY());
21+ VisualPopRegister pop = createPopRegister(Hierarchy.getNearestContainer(cur, succ), position);
22 createConnection(cur, pop);
23 createConnection(pop, (VisualComponent)succ);
24 waggingData.popRegisters.add(pop);
25
26=== modified file 'WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java'
27--- WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java 2015-02-09 10:46:28 +0000
28+++ WorkcraftCore/src/org/workcraft/dom/visual/connections/VisualConnection.java 2015-02-26 13:10:08 +0000
29@@ -273,17 +273,19 @@
30 }
31
32 @NoAutoSerialisation
33- public void setConnectionType(ConnectionType t) {
34- if (connectionType != t) {
35- this.connectionType = t;
36+ public void setConnectionType(ConnectionType value) {
37+ if (connectionType != value) {
38+ this.connectionType = value;
39 this.observableHierarchyImpl.sendNotification(new NodesDeletingEvent(this, getGraphic()));
40 this.children.remove(getGraphic());
41 this.observableHierarchyImpl.sendNotification(new NodesDeletedEvent(this, getGraphic()));
42
43 if (connectionType == ConnectionType.POLYLINE) {
44 graphic = new Polyline(this);
45+ setScaleMode(ScaleMode.NONE);
46 } else if (connectionType == ConnectionType.BEZIER) {
47 graphic = new Bezier(this);
48+ setScaleMode(ScaleMode.LOCK_RELATIVELY);
49 }
50 graphic.setDefaultControlPoints();
51

Subscribers

People subscribed via source and target branches