Browse Source

edges are now displayed with in relation to flow/capacity

Jessey Widhalm 7 years ago
parent
commit
497da9dd1f

BIN
.gradle/2.2.1/taskArtifacts/cache.properties.lock


BIN
.gradle/2.2.1/taskArtifacts/fileHashes.bin


BIN
.gradle/2.2.1/taskArtifacts/fileSnapshots.bin


BIN
.gradle/2.2.1/taskArtifacts/taskArtifacts.bin


+ 2 - 9
build.gradle

@@ -36,15 +36,8 @@ sourceSets {
     }
 }
 
-repositories {
-   flatDir {
-       dirs 'jars'
-   }
-}
-
-
-dependencies {
-   compile name: 'json-simple-1.1.1'
+ dependencies {   
+       compile fileTree(dir: 'jars', include: ['*.jar'])
 }
 /*
 // In this section you declare where to find the dependencies of your project

+ 1 - 0
src/classes/CpsEdge.java

@@ -11,6 +11,7 @@ public class CpsEdge {
 	public CpsEdge(CpsObject A, CpsObject B){
 		setA(A);
 		setB(B);
+		this.flow = 50;
 		this.A.AddConnection(this);
 		this.B.AddConnection(this);
 		this.maxCapacity = 100;

+ 15 - 3
src/ui/view/MyCanvas.java

@@ -102,7 +102,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		}
 
 		// drawEdges
-		g2.setColor(Color.BLACK);
+		//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(),