Browse Source

value change

Kevin Trometer 7 years ago
parent
commit
d301df7a8a
2 changed files with 12 additions and 24 deletions
  1. 6 23
      src/ui/view/MyCanvas.java
  2. 6 1
      src/ui/view/UnitGraph.java

+ 6 - 23
src/ui/view/MyCanvas.java

@@ -98,16 +98,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 		g2.setRenderingHints(rh);
 
-		// Supplied Highlighting
-
-		/*
-		 * // Selection if (selectRect != null &&
-		 * controller.searchByID(model.getSelectedObjectID()) != null &&
-		 * controller.searchByID(model.getSelectedObjectID()).getClass() !=
-		 * CpsNode.class) { g2.setColor(Color.BLUE); g2.fillRect((int)
-		 * selectRect.getX(), (int) selectRect.getY(), (int)
-		 * selectRect.getWidth(), (int) selectRect.getHeight()); }
-		 */
 		// drawEdges
 		// g2.setColor(Color.BLACK);
 		if (drawEdge) {
@@ -185,7 +175,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 					if (((HolonObject) cps).getSupplied()) {
 						g2.setColor(Color.GREEN);
 					} else {
-						g2.setColor(Color.GRAY);
+						g2.setColor(Color.RED);
 					}
 					g2.fillRect(cps.getPosition().x - (controller.getScale() / 20),
 							cps.getPosition().y - (controller.getScale() / 20), 
@@ -398,13 +388,12 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				}
 				if (newEdge) {
 					e = new CpsEdge(cps, tempCps);
-					// cps.AddConnection(e);
-					// tempCps.AddConnection(e);
+					controller.calculateStateForTimeStep(model.getCurIteration());
 					controller.AddEdgeOnCanvas(e);
 				}
 			}
 		}
-		// Auf eine Edge gezoggen?
+		// Edge auf eine Edge gezogen?
 		if (onEdge) {
 			CpsEdge p = mousePositionOnEdge(x, y);
 			if (p != null) {
@@ -424,17 +413,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				k = p.getB();
 
 				e = new CpsEdge(n, tempCps);
-				// n.AddConnection(e);
-				// tempCps.AddConnection(e);
-
+				
 				e1 = new CpsEdge(n, r);
-				// n.AddConnection(e1);
-				// r.AddConnection(e1);
-
+				
 				e2 = new CpsEdge(n, k);
-				// n.AddConnection(e2);
-				// k.AddConnection(e2);
-
+				
 				p.getA().getConnections().remove(p);
 				p.getB().getConnections().remove(p);
 

+ 6 - 1
src/ui/view/UnitGraph.java

@@ -583,7 +583,12 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 			MAXIMUM = he.getEnergy();
 			he.setGraphPoints((LinkedList<Point>) pointList.clone());
 			for (int i = 0; i < arrayOfFloats.length; i++) {
-				he.getEnergyAt()[i] = convertToValueY(getYValueAt_2((int) (i * width / (model.getIterations() - 1))));
+				if (he.getEnergy() >=0 ) {
+					he.getEnergyAt()[i] = convertToValueY(getYValueAt_2((int) (i * width / (model.getIterations() - 1))));	
+				} else {
+					he.getEnergyAt()[i] = -convertToValueY(getYValueAt_2((int) (i * width / (model.getIterations() - 1))));
+				}
+				
 			}
 			arrayOfFloats = he.getEnergyAt();
 		}