-
Notifications
You must be signed in to change notification settings - Fork 0
/
jmt_patch
3246 lines (3118 loc) · 130 KB
/
jmt_patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Index: src/main/java/jmt/gui/common/definitions/CommonModel.java
===================================================================
--- src/main/java/jmt/gui/common/definitions/CommonModel.java (revision 978)
+++ src/main/java/jmt/gui/common/definitions/CommonModel.java (working copy)
@@ -3542,9 +3542,15 @@
/** Reference to owner blocking station or null */
public Object blockingRegion;
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ public boolean pinned;
+
public StationData(String name, String type) {
this.name = name;
this.type = type;
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ // by default this station is free to move when autoarrange/snap to grid is utilized
+ this.pinned = false;
}
}
@@ -4053,6 +4059,32 @@
}
}
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ @Override
+ public boolean isPinned(Object stationKey) {
+ StationData sd;
+ if (stationDataHM.containsKey(stationKey)) {
+ sd = (StationData) stationDataHM.get(stationKey);
+ } else {
+ return false;
+ }
+
+ return sd.pinned;
+ }
+
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ @Override
+ public void setIsPinned(Object stationKey, boolean value) {
+ StationData sd;
+ if (stationDataHM.containsKey(stationKey)) {
+ sd = (StationData) stationDataHM.get(stationKey);
+ } else {
+ return;
+ }
+
+ sd.pinned = value;
+ }
+
/**
* Returns given name if a mode with the same name does not exist or makes it unique
* for a transition
Index: src/main/java/jmt/gui/common/definitions/StationDefinition.java
===================================================================
--- src/main/java/jmt/gui/common/definitions/StationDefinition.java (revision 978)
+++ src/main/java/jmt/gui/common/definitions/StationDefinition.java (working copy)
@@ -637,4 +637,15 @@
*/
public void setFiringOutcome(Object stationKey, int modeIndex, Object stationOutKey, Object classKey, Integer value);
+ /**
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Returns pin status for <code>stationKey</code>
+ */
+ boolean isPinned(Object stationKey);
+
+ /**
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Sets new pin status for <code>stationKey</code>
+ */
+ void setIsPinned(Object statioKey, boolean value);
}
Index: src/main/java/jmt/gui/common/xml/GuiXMLConstants.java
===================================================================
--- src/main/java/jmt/gui/common/xml/GuiXMLConstants.java (revision 978)
+++ src/main/java/jmt/gui/common/xml/GuiXMLConstants.java (working copy)
@@ -41,6 +41,7 @@
public static final String XML_A_POSITION_X = "x";
public static final String XML_A_POSITION_Y = "y";
public static final String XML_A_POSITION_ROTATE = "rotate";
+ public static final String XML_A_PIN = "pin";
public static final String XML_E_PARAMETRIC = "parametric";
public static final String XML_A_PARAMETRIC_CLASSPATH = "classPath";
Index: src/main/java/jmt/gui/common/xml/GuiXMLReader.java
===================================================================
--- src/main/java/jmt/gui/common/xml/GuiXMLReader.java (revision 978)
+++ src/main/java/jmt/gui/common/xml/GuiXMLReader.java (working copy)
@@ -135,6 +135,8 @@
Element station, position;
String name;
double x, y;
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ boolean pinned = false;
boolean rotate = false;
// For each stored Station
for (int i = 0; i < stations.getLength(); i++) {
@@ -146,11 +148,18 @@
if (position.hasAttribute(XML_A_POSITION_ROTATE)) {
rotate = Boolean.TRUE.toString().equalsIgnoreCase(position.getAttribute(XML_A_POSITION_ROTATE));
}
+ /* Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Sets pin status based on XML attribute's value, if not present, by default it is set to false.
+ */
+ if (position.hasAttribute(XML_A_PIN)) {
+ pinned = Boolean.parseBoolean(position.getAttribute(XML_A_PIN));
+ }
if (names.containsKey(name)) {
model.setStationPosition(names.get(name), new JMTPoint(x, y, rotate));
} else {
System.out.println("Error - Found position info for station '" + name + "' which is not present into current model.");
}
+ model.setIsPinned(names.get(name), pinned);
}
}
Index: src/main/java/jmt/gui/common/xml/GuiXMLWriter.java
===================================================================
--- src/main/java/jmt/gui/common/xml/GuiXMLWriter.java (revision 978)
+++ src/main/java/jmt/gui/common/xml/GuiXMLWriter.java (working copy)
@@ -181,6 +181,8 @@
position.setAttribute(XML_A_POSITION_X, String.valueOf(model.getStationPosition(stationKey).getX()));
position.setAttribute(XML_A_POSITION_Y, String.valueOf(model.getStationPosition(stationKey).getY()));
position.setAttribute(XML_A_POSITION_ROTATE, String.valueOf(model.getStationPosition(stationKey).isRotate()));
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ position.setAttribute(XML_A_PIN, String.valueOf(model.isPinned(stations.get(i))));
station.appendChild(position);
guiNode.appendChild(station);
}
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/CellComponent.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/CellComponent.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/CellComponent.java (working copy)
@@ -54,6 +54,12 @@
}
/**
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Returns pin status based on the value stored in the JModelStationDefinition instance attached to this CellComponent.
+ */
+ public boolean isPinned() { return sd.isPinned(key); }
+
+ /**
* Returns key referencing this station
* @return this station's key
*/
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtCell.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtCell.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtCell.java (working copy)
@@ -1,16 +1,16 @@
/**
* Copyright (C) 2016, Laboratorio di Valutazione delle Prestazioni - Politecnico di Milano
-
+ * <p>
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
-
+ * <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
-
+ * <p>
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
@@ -26,8 +26,7 @@
import java.awt.font.FontRenderContext;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
-import java.util.Hashtable;
-import java.util.Map;
+import java.util.*;
import javax.swing.Icon;
import javax.swing.ImageIcon;
@@ -35,251 +34,271 @@
import jmt.gui.common.JMTImageLoader;
+import jmt.gui.common.MergedIcon;
import org.jgraph.JGraph;
-import org.jgraph.graph.DefaultGraphCell;
-import org.jgraph.graph.DefaultPort;
-import org.jgraph.graph.GraphConstants;
-import org.jgraph.graph.Port;
+import org.jgraph.graph.*;
/**
* vertex cell for jmt
*
* @author Federico Granata
- * Date: 11-lug-2003
- * Time: 13.48.34
- *
+ * Date: 11-lug-2003
+ * Time: 13.48.34
* @author Bertoli Marco
*/
public abstract class JmtCell extends DefaultGraphCell {
- private static final long serialVersionUID = 1L;
- private Dimension imageDimension;
- // Used to determine if parent of this cell has changed (to detect enter and exit from
- // blocking regions)
- private TreeNode parentRef;
- /**
- * Different kind of nodes.
- */
- public static final int SOURCE = 0;
- public static final int TERMINAL = 1;
- public static final int DELAY = 2;
- public static final int SERVER = 3;
- public static final int SINK = 4;
- public static final int FORK = 5;
- public static final int JOIN = 6;
- public static final int LDSERVER = 7;
- public static final int CLASSSWITCH = 8;
- public static final int SEMAPHORE = 9;
- public static final int SCALER = 10;
- public static final int PLACE = 11;
- public static final int TRANSITION = 12;
+ private static final long serialVersionUID = 1L;
+ private Dimension imageDimension;
+ // Used to determine if parent of this cell has changed (to detect enter and exit from
+ // blocking regions)
+ private TreeNode parentRef;
- private Port[] ports;
+ /**
+ * Different kind of nodes.
+ */
+ public static final int SOURCE = 0;
+ public static final int TERMINAL = 1;
+ public static final int DELAY = 2;
+ public static final int SERVER = 3;
+ public static final int SINK = 4;
+ public static final int FORK = 5;
+ public static final int JOIN = 6;
+ public static final int LDSERVER = 7;
+ public static final int CLASSSWITCH = 8;
+ public static final int SEMAPHORE = 9;
+ public static final int SCALER = 10;
+ public static final int PLACE = 11;
+ public static final int TRANSITION = 12;
- // Giuseppe De Cicco & Fabio Granara
- public boolean seen = false;
- public int in = 0;
- public int out = 0;
- public boolean okin = false;
- public boolean okout = false;
- public int sons = 1;
- public int type;
- private boolean leftInputCell = true;
+ private Port[] ports;
- /**
- * Tells if this component can be placed on JGraph or has been disabled. This is
- * useful to load old models with disabled components (like terminals)
- */
- public static final boolean canBePlaced = true;
+ // Giuseppe De Cicco & Fabio Granara
+ public boolean seen = false;
+ public int in = 1;
+ public int out = 1;
+ public boolean okin = false;
+ public boolean okout = false;
+ public int sons = 1;
+ public int type;
+ private boolean leftInputCell = true;
- /**
- * Creates a graph cell and initializes it with the specified user object.
- *
- * @param userObject an Object provided by the user that constitutes
- * the cell's data
- *
- * Conti Andrea 01-09-2003
- * Bertoli Marco 04-giu-2005
- */
- public JmtCell(String icon, Object userObject) {
- super(userObject);
- ImageIcon ico = JMTImageLoader.loadImage(icon);
- GraphConstants.setIcon(attributes, ico);
- imageDimension = new Dimension(ico.getIconWidth(), ico.getIconHeight());
- GraphConstants.setSizeable(attributes, false);
- GraphConstants.setSize(attributes, imageDimension);
- }
+ /**
+ * Tells if this component can be placed on JGraph or has been disabled. This is
+ * useful to load old models with disabled components (like terminals)
+ */
+ public static final boolean canBePlaced = true;
- // Giuseppe De Cicco & Fabio Granara
- public void AddIn() {
- in += 1;
- }
+ /**
+ * Creates a graph cell and initializes it with the specified user object.
+ *
+ * @param userObject an Object provided by the user that constitutes
+ * the cell's data
+ * <p>
+ * Conti Andrea 01-09-2003
+ * Bertoli Marco 04-giu-2005
+ */
+ public JmtCell(String icon, Object userObject) {
+ super(userObject);
+ ImageIcon ico = JMTImageLoader.loadImage(icon);
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ // Display a lock if this cell is pinned.
+ if (isPinned()) {
+ ImageIcon lockIcon = JMTImageLoader.loadImage("lock", new Dimension(16, 16));
+ GraphConstants.setIcon(attributes, new MergedIcon(JMTImageLoader.loadImage(icon), lockIcon));
+ } else {
+ GraphConstants.setIcon(attributes, ico);
+ }
+ imageDimension = new Dimension(ico.getIconWidth(), ico.getIconHeight());
+ GraphConstants.setSizeable(attributes, false);
+ GraphConstants.setSize(attributes, imageDimension);
+ }
- // Giuseppe De Cicco & Fabio Granara
- public void SubIn() {
- in -= 1;
- }
+ // Giuseppe De Cicco & Fabio Granara
+ public void AddIn() {
+ in += 1;
+ }
- // Giuseppe De Cicco & Fabio Granara
- public void AddOut() {
- out += 1;
- }
+ // Giuseppe De Cicco & Fabio Granara
+ public void SubIn() {
+ in -= 1;
+ }
- // Giuseppe De Cicco & Fabio Granara
- public void SubOut() {
- out -= 1;
- }
+ // Giuseppe De Cicco & Fabio Granara
+ public void AddOut() {
+ out += 1;
+ }
- /**
- * Returns Cell's real size (this method considers Icon and name size)
- *
- * @param graph <code>JGraph</code> object to retrieve font dimension informations
- * @return cell's real size
- *
- * Bertoli Marco 4-giu-2005
- */
- public Dimension getSize(JGraph graph) {
- Dimension cellDimension = (Dimension) imageDimension.clone();
- // Gets the graph font
- Font font = graph.getFont();
- // Gets the graphical context
- Graphics2D g2D = (Graphics2D) graph.getGraphics();
- // Gets the bounds of the cell name
- FontRenderContext frc = g2D.getFontRenderContext();
- Rectangle r = font.getStringBounds(getUserObject().toString(), frc).getBounds();
- // Sets the cell dimension
- cellDimension.height += r.height + 5;
- cellDimension.width = Math.max(cellDimension.width, r.width + 10);
- return cellDimension;
- }
+ // Giuseppe De Cicco & Fabio Granara
+ public void SubOut() {
+ out -= 1;
+ }
- /**
- * Creates the ports for this vertex
- *
- * @return array of ports
- */
- public abstract Port[] createPorts();
+ public int numInEdges() {
+ return in;
+ }
- /**
- * Sets all the attributes like background colour, dimensions, port number
- * & position
- *
- * @param pt
- * @return created map
- */
- public Hashtable<Object, Map> setAttributes(Point2D pt, JGraph graph) {
- //contains attribute of the cell & ports
- Hashtable<Object, Map> nest = new Hashtable<Object, Map>();
+ public int numOutEdges() {
+ return out;
+ }
- Dimension cellDimension = getSize(graph);
- //contains attrib of cell
- Map attr = getAttributes();
- GraphConstants.setBounds(attr, new Rectangle2D.Double(pt.getX(), pt.getY(), cellDimension.getWidth(), cellDimension.getHeight()));
- GraphConstants.setEditable(attr, false);
- GraphConstants.setBackground(attr, graph.getBackground());
- nest.put(this, attr);
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ public boolean isPinned() {
+ return ((CellComponent) getUserObject()).isPinned();
+ }
- //create ports
- ports = createPorts();
- Icon icon = GraphConstants.getIcon(attr);
- updatePortPositions(nest, icon, cellDimension);
- for (Port port : ports) {
- add((DefaultPort) port);
- }
- return nest;
- }
+ /**
+ * Returns Cell's real size (this method considers Icon and name size)
+ *
+ * @param graph <code>JGraph</code> object to retrieve font dimension informations
+ * @return cell's real size
+ * <p>
+ * Bertoli Marco 4-giu-2005
+ */
+ public Dimension getSize(JGraph graph) {
+ Dimension cellDimension = (Dimension) imageDimension.clone();
+ // Gets the graph font
+ Font font = graph.getFont();
+ // Gets the graphical context
+ Graphics2D g2D = (Graphics2D) graph.getGraphics();
+ // Gets the bounds of the cell name
+ FontRenderContext frc = g2D.getFontRenderContext();
+ Rectangle r = font.getStringBounds(getUserObject().toString(), frc).getBounds();
+ // Sets the cell dimension
+ cellDimension.height += r.height + 5;
+ cellDimension.width = Math.max(cellDimension.width, r.width + 10);
+ return cellDimension;
+ }
- public void updatePortPositions(Map<Object, Map> nest, Icon icon, Dimension cellDimension) {
- for (Port port : ports) {
- Map attr = new Hashtable();
- if (port instanceof InputPort && isLeftInputCell() || port instanceof OutputPort && !isLeftInputCell()) {
- GraphConstants.setOffset(attr, getInPortOffset(icon, cellDimension));
- } else {
- GraphConstants.setOffset(attr, getOutPortoffset(icon, cellDimension));
- }
- nest.put(port, attr);
- }
- }
+ /**
+ * Creates the ports for this vertex
+ *
+ * @return array of ports
+ */
+ public abstract Port[] createPorts();
- protected Point getInPortOffset(Icon icon, Dimension cellDimension) {
- int iconHeight = icon.getIconHeight();
- int iconWidth = icon.getIconWidth();
- int xOff = (cellDimension.width - iconWidth) / 2 * 1000 / cellDimension.width;
- int yOff = iconHeight / 2 * 1000 / cellDimension.height;
- return new Point(xOff, yOff);
- }
+ /**
+ * Sets all the attributes like background colour, dimensions, port number
+ * & position
+ *
+ * @param pt
+ * @return created map
+ */
+ public Hashtable<Object, Map> setAttributes(Point2D pt, JGraph graph) {
+ //contains attribute of the cell & ports
+ Hashtable<Object, Map> nest = new Hashtable<Object, Map>();
- protected Point getOutPortoffset(Icon icon, Dimension cellDimension) {
- int iconHeight = icon.getIconHeight();
- int iconWidth = icon.getIconWidth();
- int xOff = (cellDimension.width - iconWidth) / 2 * 1000 / cellDimension.width + iconWidth * 1000 / cellDimension.width;
- int yOff = iconHeight / 2 * 1000 / cellDimension.height;
- return new Point(xOff, yOff);
- }
+ Dimension cellDimension = getSize(graph);
+ //contains attrib of cell
+ Map attr = getAttributes();
+ GraphConstants.setBounds(attr, new Rectangle2D.Double(pt.getX(), pt.getY(), cellDimension.getWidth(), cellDimension.getHeight()));
+ GraphConstants.setEditable(attr, false);
+ GraphConstants.setBackground(attr, graph.getBackground());
+ nest.put(this, attr);
- /**
- * Tells if the InputPort of this cell is on the left side
- * @return true if the InputPort of this cell is on the left side
- */
- // Giuseppe De Cicco & Fabio Granara
- public boolean isLeftInputCell() {
- return leftInputCell;
- }
+ //create ports
+ ports = createPorts();
+ Icon icon = GraphConstants.getIcon(attr);
+ updatePortPositions(nest, icon, cellDimension);
+ for (Port port : ports) {
+ add((DefaultPort) port);
+ }
- // Giuseppe De Cicco & Fabio Granara
- public void setLeftInputCell(boolean state) {
- leftInputCell = state;
- }
+ return nest;
+ }
- /**
- * Resets stored parent information for this cell
- */
- public void resetParent() {
- parentRef = getParent();
- }
+ public void updatePortPositions(Map<Object, Map> nest, Icon icon, Dimension cellDimension) {
+ for (Port port : ports) {
+ Map attr = new Hashtable();
+ if (port instanceof InputPort && isLeftInputCell() || port instanceof OutputPort && !isLeftInputCell()) {
+ GraphConstants.setOffset(attr, getInPortOffset(icon, cellDimension));
+ } else {
+ Point offset = getOutPortoffset(icon, cellDimension);
+ GraphConstants.setOffset(attr, offset);
+ }
+ nest.put(port, attr);
+ }
+ }
- /**
- * Tells if this cell parent was changed since last call to resetParent() method
- *
- * @return true if parent changed, false otherwise
- * @see #resetParent()
- */
- public boolean parentChanged() {
- if (parentRef == null && getParent() == null) {
- return false;
- } else if (parentRef == null || getParent() == null) {
- return true;
- } else {
- return !parentRef.equals(getParent());
- }
- }
+ protected Point getInPortOffset(Icon icon, Dimension cellDimension) {
+ int iconHeight = icon.getIconHeight();
+ int iconWidth = icon.getIconWidth();
+ int xOff = (cellDimension.width - iconWidth) / 2 * 1000 / cellDimension.width;
+ int yOff = iconHeight / 2 * 1000 / cellDimension.height;
+ return new Point(xOff, yOff);
+ }
- /**
- * Tells if this station generates or destroys jobs (useful for blocking region
- * management)
- *
- * @return true if this station generates or destroy jobs, false otherwise
- */
- public boolean generateOrDestroyJobs() {
- return false;
- }
+ protected Point getOutPortoffset(Icon icon, Dimension cellDimension) {
+ int iconHeight = icon.getIconHeight();
+ int iconWidth = icon.getIconWidth();
+ int xOff = (cellDimension.width - iconWidth) / 2 * 1000 / cellDimension.width + iconWidth * 1000 / cellDimension.width;
+ int yOff = iconHeight / 2 * 1000 / cellDimension.height;
+ return new Point(xOff, yOff);
+ }
- /**
- * Returns previous parent of this cell (the one present when resetParent()
- * method was called)
- *
- * @return previous parent of this cell
- * @see #resetParent()
- */
- public TreeNode getPrevParent() {
- return parentRef;
- }
+ /**
+ * Tells if the InputPort of this cell is on the left side
+ *
+ * @return true if the InputPort of this cell is on the left side
+ */
+ // Giuseppe De Cicco & Fabio Granara
+ public boolean isLeftInputCell() {
+ return leftInputCell;
+ }
- /**
- * Returns the name of the icon of this cell
- *
- * @return the name of the icon of this cell
- */
- public abstract String getIcon();
+ // Giuseppe De Cicco & Fabio Granara
+ public void setLeftInputCell(boolean state) {
+ leftInputCell = state;
+ }
+ /**
+ * Resets stored parent information for this cell
+ */
+ public void resetParent() {
+ parentRef = getParent();
+ }
+
+ /**
+ * Tells if this cell parent was changed since last call to resetParent() method
+ *
+ * @return true if parent changed, false otherwise
+ * @see #resetParent()
+ */
+ public boolean parentChanged() {
+ if (parentRef == null && getParent() == null) {
+ return false;
+ } else if (parentRef == null || getParent() == null) {
+ return true;
+ } else {
+ return !parentRef.equals(getParent());
+ }
+ }
+
+ /**
+ * Tells if this station generates or destroys jobs (useful for blocking region
+ * management)
+ *
+ * @return true if this station generates or destroy jobs, false otherwise
+ */
+ public boolean generateOrDestroyJobs() {
+ return false;
+ }
+
+ /**
+ * Returns previous parent of this cell (the one present when resetParent()
+ * method was called)
+ *
+ * @return previous parent of this cell
+ * @see #resetParent()
+ */
+ public TreeNode getPrevParent() {
+ return parentRef;
+ }
+
+ /**
+ * Returns the name of the icon of this cell
+ *
+ * @return the name of the icon of this cell
+ */
+ public abstract String getIcon();
}
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtDefaultCellViewFactory.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtDefaultCellViewFactory.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtDefaultCellViewFactory.java (working copy)
@@ -20,6 +20,8 @@
import jmt.gui.jsimgraph.controller.Mediator;
import org.jgraph.graph.DefaultCellViewFactory;
+import org.jgraph.graph.Port;
+import org.jgraph.graph.PortView;
/**
* <p>Title: JmtDefaultCellViewFactory </p>
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdge.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdge.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdge.java (working copy)
@@ -47,6 +47,19 @@
*
*/
public class JmtEdge extends DefaultEdge {
+
+ /*
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Identifies the type of edge, useful for routing purposes.
+ */
+ public enum Type {
+ INVALID,
+ LOOP_BACK_UPPER,
+ LEFT_TO_RIGHT,
+ LOOP_BACK_LOWER,
+ RING
+ };
+
/**
*
*/
@@ -69,6 +82,14 @@
private Mediator mediator;
public ArrayList<Point2D> intersectionEdgePoint = new ArrayList<Point2D>();
+ /*
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Stores the last routing points computed by the algorithm in class JmtRouting
+ */
+ private List<Point2D> routedPoints = new ArrayList<>();
+
+ private Type type = Type.INVALID;
+
// public ArrayList intersectionEdgePoint2=new ArrayList();
public JmtEdge() {
@@ -162,7 +183,8 @@
Point2D tmpMin = controlPoints[i];
Point2D tmpMax = controlPoints[i + 1];
//nel caso di lati che vanno nel verso oposto
- if ((tmpMin.getX() > tmpMax.getX()) || (tmpMin.getY() > tmpMax.getY())) {
+ // Modified by Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio to take into account multi arrows that can have +-1 difference pixels
+ if ((Math.abs(tmpMax.getX() - tmpMin.getX()) > 2 && (tmpMin.getX()) > tmpMax.getX()) || (Math.abs(tmpMax.getY() - tmpMin.getY()) > 2 && tmpMin.getY() > tmpMax.getY())) {
tmpMin = controlPoints[i + 1];
tmpMax = controlPoints[i];
}
@@ -180,7 +202,7 @@
upperSide = true;
// System.out.println("Valore del controlMin "+(int)tmpMin.getX());
// System.out.println("Valore del controlMax "+tmpMax.getX());
- upperPoint = new Point2D.Double((int) tmpMin.getX(), (int) minY);
+ upperPoint = new Point2D.Double((int) tmpMax.getX(), (int) minY);
intersectionVertexPoint.add(upperPoint);
// System.out.println("upper INTERSECTION");
// System.out.println("Intersezione Sopra: x="+tmpMin.getX()+", y="+minY);
@@ -187,7 +209,7 @@
}
if (maxY < tmpMax.getY() && maxY > tmpMin.getY()) {
lowerSide = true;
- lowPoint = new Point2D.Double((int) tmpMin.getX(), (int) maxY);
+ lowPoint = new Point2D.Double((int) tmpMax.getX(), (int) maxY);
intersectionVertexPoint.add(lowPoint);
// System.out.println("lower INTERSECTION");
@@ -250,9 +272,9 @@
intersectionVertexPoint.set(0, lowPoint);
intersectionVertexPoint.set(1, leftPoint);
} else if (upperSide && lowerSide) {
- intersectionVertexPoint.set(0, upperPoint);
- intersectionVertexPoint.set(1, lowPoint);
-
+ //intersectionVertexPoint.set(0, upperPoint);
+ //intersectionVertexPoint.set(1, lowPoint);
+ intersectionVertexPoint.set(0, new Point2D.Double(Math.max(upperPoint.getX(), lowPoint.getX()), Math.max(upperPoint.getY(), lowPoint.getY())));
}
// if (intersectionVertexPoint2.size()>0) {
// System.out.println("Subito dopo il tutto: primo punto: x= "+((Point2D)(intersectionVertexPoint2.get(0))).getX()+", y="+((Point2D)(intersectionVertexPoint2.get(0))).getY());
@@ -767,4 +789,38 @@
return (int) (max - boundsSource.getMaxX());
}
+ /*
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Sets new routing points for this edge
+ */
+ public void setRoutedPoints(List<Point2D> points) {
+ routedPoints.clear();
+ routedPoints.addAll(points);
+ }
+
+ /*
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Gets last computed routing points for this edge
+ */
+ public List<Point2D> getRoutedPoints() {
+ return routedPoints;
+ }
+
+ /*
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Sets new edge type for this JmtEdge
+ */
+ public void setType(Type newType) {
+ type = newType;
+ }
+
+ /*
+ * Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ * Gets the edge type for this JmtEdge
+ */
+ public Type getType() {
+ return type;
+ }
+
+
}
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdgeRenderer.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdgeRenderer.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdgeRenderer.java (working copy)
@@ -32,6 +32,9 @@
* <p>Title: JmtEdgeRenderer </p>
* @author Giuseppe De Cicco & Fabio Granara
* Date: 15-ott-2006
+ * Modified by Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio to take into account +-1 pixel offset
+ * on y coordinates due rounding imprecisions when arranging multiple arrows within the same component
+ * Date: 09-feb-2017
*
*/
public class JmtEdgeRenderer extends EdgeRenderer {
@@ -138,7 +141,7 @@
* */
if (cell.isRing && i == 4) {
// System.out.println("____________ENTRATO NEL RING____________");
- if ((int) p[i].getY() == (int) ((cell.intersectionEdgePoint.get(j))).getY()
+ if (Math.abs((int) p[i].getY() - (int) ((cell.intersectionEdgePoint.get(j))).getY()) <= 2
&& (((int) p[i].getX() < (int) ((cell.intersectionEdgePoint.get(j))).getX()))) {
int intersectionPoint = (int) ((cell.intersectionEdgePoint.get(j))).getX();
@@ -147,7 +150,7 @@
.getX()) / 2), (float) ((p[4])).getY() - 10, (float) ((p[5]).getX()), (float) ((p[5]).getY()));
view.sharedPath.moveTo((float) (p[5].getX()), (float) (p[5]).getY());
}
- } else if ((int) p[i].getY() == (int) ((cell.intersectionEdgePoint.get(j))).getY()
+ } else if (Math.abs((int) p[i].getY() - (int) ((cell.intersectionEdgePoint.get(j))).getY()) <= 2
&& (((int) p[i].getX() > (int) ((cell.intersectionEdgePoint.get(j))).getX()))) {
int intersectionPoint = (int) ((cell.intersectionEdgePoint.get(j))).getX();
if ((p[5].getX() < p[4].getX()) && (intersectionPoint > ((int) p[5].getX()))) {
@@ -158,8 +161,8 @@
}
} else {
- if ((int) p[i + 1].getY() == (int) ((cell.intersectionEdgePoint.get(j))).getY()
- && (int) p[i].getY() == (int) ((cell.intersectionEdgePoint.get(j))).getY()
+ if (Math.abs((int) p[i + 1].getY() - (int) ((cell.intersectionEdgePoint.get(j))).getY()) <= 2
+ && Math.abs((int) p[i].getY() - (int) ((cell.intersectionEdgePoint.get(j))).getY()) <= 2
&& (((int) p[i].getX() < (int) ((cell.intersectionEdgePoint.get(j))).getX()))
&& (((int) p[i + 1].getX() > (int) ((cell.intersectionEdgePoint.get(j))).getX()))) {
@@ -167,7 +170,7 @@
if (((j + 1) < cell.intersectionEdgePoint.size())
&& (((cell.intersectionEdgePoint.get(j + 1))).getX() > ((cell.intersectionEdgePoint.get(j))).getX())
&& (((cell.intersectionEdgePoint.get(j + 1))).getX() - ((cell.intersectionEdgePoint.get(j))).getX() < 10)
- && ((cell.intersectionEdgePoint.get(j))).getY() == ((cell.intersectionEdgePoint.get(j + 1))).getY()) {
+ && Math.abs(((cell.intersectionEdgePoint.get(j))).getY() - ((cell.intersectionEdgePoint.get(j + 1))).getY()) <= 2) {
double middleX = (((cell.intersectionEdgePoint.get(j + 1))).getX() + ((cell.intersectionEdgePoint.get(j)))
.getX()) / 2;
@@ -203,9 +206,9 @@
//per cui la costruzione deve avvenire in modo inverso
else if (((passato == false) || ((passato == true) && (tmp1.size() > 0) && (!tmp1
.contains(cell.intersectionEdgePoint.get(j)))))
- && (int) p[i].getY() == (int) ((cell.intersectionEdgePoint.get(j))).getY()
+ && Math.abs((int) p[i].getY() - (int) ((cell.intersectionEdgePoint.get(j))).getY()) <= 2
&& (((int) p[i].getX() > (int) p[i + 1].getX()))
- && (int) p[i].getY() == (int) ((cell.intersectionEdgePoint.get(j))).getY()
+ && Math.abs((int) p[i].getY() - (int) ((cell.intersectionEdgePoint.get(j))).getY()) <= 2
&& (int) p[i + 1].getX() < (int) ((cell.intersectionEdgePoint.get(j))).getX()) {
// System.out.println("Entratooooooooooooooooooooooooo in elseif");
//questo if serve per fare un grande arco quando ci sono due punti di int. vicini
@@ -214,7 +217,7 @@
int contatore = 0;
for (int q = 0; q < cell.intersectionEdgePoint.size(); q++) {
- if ((cell.intersectionEdgePoint.get(q)).getY() == (cell.intersectionEdgePoint.get(j)).getY()) {
+ if (Math.abs((cell.intersectionEdgePoint.get(q)).getY() - (cell.intersectionEdgePoint.get(j)).getY()) <= 2) {
tmp1.add((cell.intersectionEdgePoint.get(q)).clone());
// cell.intersectionEdgePoint.remove(((Point2D)cell.intersectionEdgePoint.get(q)));
contatore++;
@@ -258,7 +261,7 @@
} else {
- if ((int) p[i].getY() == (int) ((Point2D) (tmp1.get(x))).getY()) {
+ if (Math.abs((int) p[i].getY() - (int) ((Point2D) (tmp1.get(x))).getY()) <= 2) {
view.sharedPath.lineTo((float) ((Point2D) (tmp1.get(x))).getX() + 5, (float) ((Point2D) (tmp1
.get(x))).getY());
view.sharedPath.moveTo((float) ((Point2D) (tmp1.get(x))).getX() + 5, (float) ((Point2D) (tmp1
@@ -293,9 +296,9 @@
// System.out.println("Punti sull'asse"+pointOnFirstPoints.size());
for (int j = 0; j < pointOnFirstPoints.size(); j++) {
if ((p[1].getX() - p[0].getX()) > 0) {
- if ((int) p[0].getY() == (int) ((Point2D) (pointOnFirstPoints.get(j))).getY()) {
+ if (Math.abs((int) p[0].getY() - (int) ((Point2D) (pointOnFirstPoints.get(j))).getY()) <= 2) {
// System.out.println("entro per sistemare il punto zero in jmtedgerenderer");
- if ((p[0].getY() == ((Point2D) pointOnFirstPoints.get(j)).getY())
+ if (Math.abs((p[0].getY() - ((Point2D) pointOnFirstPoints.get(j)).getY())) <= 2
&& ((int) p[0].getX() < (int) ((Point2D) (pointOnFirstPoints.get(j))).getX())
&& (int) ((Point2D) (pointOnFirstPoints.get(j))).getX() < (int) p[1].getX()) {
// c'era 20 e non 10
@@ -306,8 +309,8 @@
.getX())
&& (((Point2D) (pointOnFirstPoints.get(j + 1))).getX()
- ((Point2D) (pointOnFirstPoints.get(j))).getX() < 10)
- && ((Point2D) (pointOnFirstPoints.get(j))).getY() == ((Point2D) (pointOnFirstPoints.get(j + 1)))
- .getY()) {
+ && Math.abs(((Point2D) (pointOnFirstPoints.get(j))).getY() - ((Point2D) (pointOnFirstPoints.get(j + 1)))
+ .getY()) <= 2) {
double middleX = (((Point2D) (pointOnFirstPoints.get(j + 1))).getX() + ((Point2D) (pointOnFirstPoints
.get(j))).getX()) / 2;
@@ -361,7 +364,7 @@
boolean arcogrande = false;
// System.out.println("Sono uguali di y: "+(((Point2D)cell.intersectionEdgePoint.get(cell.intersectionEdgePoint.size()-j-1)).getY()==(int)p[0].getY())+"Coordinata x del punto 0: "+p[0].getX()+"Punto di int: "+((Point2D)cell.intersectionEdgePoint.get(cell.intersectionEdgePoint.size()-j-1)).getX());
- if (((int) p[0].getY() == (int) ((Point2D) pointOnFirstPoints.get(j)).getY())
+ if (Math.abs((int) p[0].getY() -(int) ((Point2D) pointOnFirstPoints.get(j)).getY()) <= 2
&& (((int) p[0].getX() > (int) ((Point2D) (pointOnFirstPoints.get(j))).getX()) && (int) ((Point2D) (pointOnFirstPoints
.get(j))).getX() > (int) p[1].getX())) {
if (((j + 1) < pointOnFirstPoints.size())
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdgeView.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdgeView.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtEdgeView.java (working copy)
@@ -19,11 +19,11 @@
import java.awt.Shape;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
import jmt.gui.jsimgraph.controller.Mediator;
-import org.jgraph.graph.CellViewRenderer;
-import org.jgraph.graph.EdgeView;
+import org.jgraph.graph.*;
/**
* <p>Title: JmtEdgeView </p>
@@ -60,10 +60,41 @@
@Override
public CellViewRenderer getRenderer() {
-
return renderer;
}
+ // Fioratto Raffaele, Pellizzari Filippo, Cardinale Claudio
+ // Tries to adjust port offsets in order to compensate some slight differences between y coordinates of horizontal segments
+ @Override
+ public void refresh(GraphModel graphModel, CellMapper cellMapper, boolean b) {
+ super.refresh(graphModel, cellMapper, b);
+ if (this.getPointCount() >= 4) {
+ int pointCount = this.getPointCount();
+
+ if (this.getPoint(0) != null && this.getPoint(1) != null && (this.getPoint(0).getY() != this.getPoint(1).getY())) {
+ double beforeY = this.getPoint(0).getY();
+ Point2D.Double offset = (Point2D.Double) this.getSource().getAllAttributes().get("offset");
+ offset.setLocation(offset.getX(), offset.getY() + 1);
+ double afterY = this.getPoint(0).getY();
+ double stepY = Math.round((afterY - beforeY) * 1000.0) / 1000.0;
+ double diffY = Math.abs(afterY - this.getPoint(1).getY());
+ double stepYOffset = diffY / stepY;
+ offset.setLocation(offset.getX(), offset.getY() + (this.getPoint(0).getY() > this.getPoint(1).getY() ? -1 : 1) * stepYOffset);
+ }
+
+ if (this.getPoint(pointCount - 1) != null && this.getPoint(pointCount - 2) != null && (this.getPoint(pointCount - 1).getY() != this.getPoint(pointCount - 2).getY())) {
+ double beforeY = this.getPoint(pointCount - 1).getY();
+ Point2D.Double offset = (Point2D.Double) this.getTarget().getAllAttributes().get("offset");
+ offset.setLocation(offset.getX(), offset.getY() + 1);
+ double afterY = this.getPoint(pointCount - 1).getY();
+ double stepY = Math.round((afterY - beforeY) * 1000.0) / 1000.0;
+ double diffY = Math.abs(afterY - this.getPoint(pointCount - 2).getY());
+ double stepYOffset = diffY / stepY;
+ offset.setLocation(offset.getX(), offset.getY() + (this.getPoint(pointCount - 1).getY() > this.getPoint(pointCount - 2).getY() ? -1 : 1) * stepYOffset);
+ }
+ }
+ }
+
// Giuseppe De Cicco & Fabio Granara
@Override
public Shape getShape() {
Index: src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtJGraph.java
===================================================================
--- src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtJGraph.java (revision 978)
+++ src/main/java/jmt/gui/jsimgraph/JGraphMod/JmtJGraph.java (working copy)
@@ -18,23 +18,21 @@
package jmt.gui.jsimgraph.JGraphMod;
-import java.awt.Graphics;
+import java.awt.*;
+import java.awt.geom.Point2D;
import jmt.common.GlobalSettings;
import jmt.gui.common.Defaults;
+import jmt.gui.common.JMTImageLoader;
import jmt.gui.jsimgraph.controller.Mediator;
import org.freehep.graphics2d.VectorGraphics;
import org.freehep.graphicsbase.util.export.ExportDialog;
import org.jgraph.JGraph;
-import org.jgraph.graph.BasicMarqueeHandler;
-import org.jgraph.graph.CellView;
-import org.jgraph.graph.DefaultCellViewFactory;
-import org.jgraph.graph.DefaultGraphModel;
-import org.jgraph.graph.DefaultGraphSelectionModel;
-import org.jgraph.graph.GraphLayoutCache;
-import org.jgraph.graph.GraphModel;