|
@@ -54,7 +54,8 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
|
|
|
|
ArrayList<HolonElement> dataSelected = new ArrayList<HolonElement>();
|
|
ArrayList<HolonElement> dataSelected = new ArrayList<HolonElement>();
|
|
ArrayList<CpsObject> TempSelected = new ArrayList<CpsObject>();
|
|
ArrayList<CpsObject> TempSelected = new ArrayList<CpsObject>();
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ private boolean[] showedInformation = new boolean[3];
|
|
private boolean dragging = false; // for dragging
|
|
private boolean dragging = false; // for dragging
|
|
private boolean dragged = false; // if an object/objects was/were dragged
|
|
private boolean dragged = false; // if an object/objects was/were dragged
|
|
private boolean drawEdge = false; // for drawing edges
|
|
private boolean drawEdge = false; // for drawing edges
|
|
@@ -152,9 +153,11 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
con.getA().getPosition().y + controller.getScaleDiv2(),
|
|
con.getA().getPosition().y + controller.getScaleDiv2(),
|
|
con.getB().getPosition().x + controller.getScaleDiv2(),
|
|
con.getB().getPosition().x + controller.getScaleDiv2(),
|
|
con.getB().getPosition().y + controller.getScaleDiv2());
|
|
con.getB().getPosition().y + controller.getScaleDiv2());
|
|
- g2.drawString(con.getFlow() + "/" + con.getCapacity(),
|
|
|
|
- (con.getA().getPosition().x + con.getB().getPosition().x) / 2 + controller.getScaleDiv2(),
|
|
|
|
- (con.getA().getPosition().y + con.getB().getPosition().y) / 2 + controller.getScaleDiv2());
|
|
|
|
|
|
+ if(showedInformation[0]){
|
|
|
|
+ g2.drawString(con.getFlow() + "/" + con.getCapacity(),
|
|
|
|
+ (con.getA().getPosition().x + con.getB().getPosition().x) / 2 + controller.getScaleDiv2(),
|
|
|
|
+ (con.getA().getPosition().y + con.getB().getPosition().y) / 2 + controller.getScaleDiv2());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else if (edgeHighlight != null) {
|
|
} else if (edgeHighlight != null) {
|
|
@@ -164,11 +167,13 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
edgeHighlight.getA().getPosition().y + controller.getScaleDiv2(),
|
|
edgeHighlight.getA().getPosition().y + controller.getScaleDiv2(),
|
|
edgeHighlight.getB().getPosition().x + controller.getScaleDiv2(),
|
|
edgeHighlight.getB().getPosition().x + controller.getScaleDiv2(),
|
|
edgeHighlight.getB().getPosition().y + controller.getScaleDiv2());
|
|
edgeHighlight.getB().getPosition().y + controller.getScaleDiv2());
|
|
- g2.drawString(edgeHighlight.getFlow() + "/" + edgeHighlight.getCapacity(),
|
|
|
|
- (edgeHighlight.getA().getPosition().x + edgeHighlight.getB().getPosition().x) / 2
|
|
|
|
|
|
+ if(showedInformation[0]){
|
|
|
|
+ g2.drawString(edgeHighlight.getFlow() + "/" + edgeHighlight.getCapacity(),
|
|
|
|
+ (edgeHighlight.getA().getPosition().x + edgeHighlight.getB().getPosition().x) / 2
|
|
+ controller.getScaleDiv2(),
|
|
+ controller.getScaleDiv2(),
|
|
- (edgeHighlight.getA().getPosition().y + edgeHighlight.getB().getPosition().y) / 2
|
|
|
|
- + controller.getScaleDiv2());
|
|
|
|
|
|
+ (edgeHighlight.getA().getPosition().y + edgeHighlight.getB().getPosition().y) / 2
|
|
|
|
+ + controller.getScaleDiv2());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
// Objects
|
|
// Objects
|
|
@@ -629,4 +634,15 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
|
|
public void setEdgeCapacity(float cap) {
|
|
public void setEdgeCapacity(float cap) {
|
|
edgeCapacity = cap;
|
|
edgeCapacity = cap;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public void setShowedInformation(boolean connection, boolean object) {
|
|
|
|
+ showedInformation[0] = connection;
|
|
|
|
+ showedInformation[1] = object;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean[] getShowedInformation(){
|
|
|
|
+ return showedInformation;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|