|
@@ -102,7 +102,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
}
|
|
|
|
|
|
|
|
|
- g2.setColor(Color.BLACK);
|
|
|
+
|
|
|
if (drawEdge) {
|
|
|
g2.setStroke(new BasicStroke(2));
|
|
|
g2.drawLine(tempCps.getPosition().x + controller.getScaleDiv2(),
|
|
@@ -112,8 +112,14 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
for (CpsEdge con : model.getEdgesOnCanvas()) {
|
|
|
if (con.getA().getID() != model.getSelectedObjectID() && con.getB().getID() != model.getSelectedObjectID()
|
|
|
&& con != edgeHighlight) {
|
|
|
- g2.setStroke(new BasicStroke(Math.min((con.getFlow() / con.getCapacity() * 4), 4)));
|
|
|
- g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
|
|
|
+ if(con.getFlow()<=con.getCapacity()){
|
|
|
+ g2.setColor(Color.BLACK);
|
|
|
+ g2.setStroke(new BasicStroke(Math.min((con.getFlow() / con.getCapacity() * 4), 4)));
|
|
|
+ }else{
|
|
|
+ g2.setColor(Color.RED);
|
|
|
+ g2.setStroke(new BasicStroke(2));
|
|
|
+ }
|
|
|
+ g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
|
|
|
con.getA().getPosition().y + controller.getScaleDiv2(),
|
|
|
con.getB().getPosition().x + controller.getScaleDiv2(),
|
|
|
con.getB().getPosition().y + controller.getScaleDiv2());
|
|
@@ -127,6 +133,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
if (model.getSelectedObjectID() > 0) {
|
|
|
g2.setColor(Color.BLUE);
|
|
|
for (CpsEdge con : model.getEdgesOnCanvas()) {
|
|
|
+ if(con.getFlow()<=con.getCapacity()){
|
|
|
+ g2.setStroke(new BasicStroke(Math.min((con.getFlow() / con.getCapacity() * 4), 4)));
|
|
|
+ }else{
|
|
|
+ g2.setStroke(new BasicStroke(2));
|
|
|
+ }
|
|
|
if (con.getA().getID() == model.getSelectedObjectID()
|
|
|
|| con.getB().getID() == model.getSelectedObjectID() && con != edgeHighlight) {
|
|
|
g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
|
|
@@ -140,6 +151,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
|
|
|
}
|
|
|
} else if (edgeHighlight != null) {
|
|
|
g2.setColor(Color.BLUE);
|
|
|
+ g2.setStroke(new BasicStroke(2));
|
|
|
g2.drawLine(edgeHighlight.getA().getPosition().x + controller.getScaleDiv2(),
|
|
|
edgeHighlight.getA().getPosition().y + controller.getScaleDiv2(),
|
|
|
edgeHighlight.getB().getPosition().x + controller.getScaleDiv2(),
|