Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop

src/classes/HolonSwitch.java

@@ -20,19 +20,22 @@ public class HolonSwitch extends CpsObject {
 
 	public HolonSwitch(String ObjName) {
 		super(ObjName);
-		setState(false);
+		setState(true);
+		setActiveAt(true);
 	}
 
 	public HolonSwitch(String ObjName, String obj) {
 		super(ObjName);
 		super.setName(obj);
-		setState(false);
+		setState(true);
 		setActiveAt(true);
 	}
 
 	public HolonSwitch(CpsObject obj) {
 		super(obj);
-		setState(((HolonSwitch) obj).getState());
+		super.setName(obj.getName());
+		setState(true);
+		setActiveAt(true);
 	}
 
 	public void switchState() {
@@ -50,6 +53,11 @@ public class HolonSwitch extends CpsObject {
 
 	public void setState(boolean state) {
 		this.active = state;
+		if (this.active == true) {
+			setImage("/Images/switch-on.png");
+		} else {
+			setImage("/Images/switch-off.png");
+		}
 	}
 
 	/**

src/ui/controller/CategoryController.java

@@ -33,7 +33,7 @@ public class CategoryController {
 		addNewHolonObject(mpC.searchCategory("Energy"), "Power Plant", new ArrayList<HolonElement>(), "/Images/power-plant.png");
 		addNewHolonObject(mpC.searchCategory("Building"), "House", new ArrayList<HolonElement>(), "/Images/home-2.png");
 		addNewHolonTransformer(mpC.searchCategory("Component"), "Transformer", "/Images/transformer-1.png");
-		addNewHolonSwitch(mpC.searchCategory("Component"), "Switch", "/Images/switch-off.png");
+		addNewHolonSwitch(mpC.searchCategory("Component"), "Switch", "/Images/switch-on.png");
 
 	}
 

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) {
@@ -176,7 +166,15 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			if (cps.getID() == model.getSelectedObjectID() && controller.searchByID(model.getSelectedObjectID()) != null
 					&& controller.searchByID(model.getSelectedObjectID()) instanceof CpsNode) {
 				img = new ImageIcon(this.getClass().getResource("/Images/node_selected.png")).getImage();
-			} else {
+			}
+			else {
+				if (cps instanceof HolonSwitch) {
+					if (((HolonSwitch) cps).getActiveAt()[model.getCurIteration()]) {
+						((HolonSwitch) cps).setState(true);
+					} else {
+						((HolonSwitch) cps).setState(false);
+					}
+				} 
 				if (cps == tempCps) {
 					g2.setColor(Color.BLUE);
 					g2.fillRect((int) selectRect.getX(), (int) selectRect.getY(), (int) selectRect.getWidth(),
@@ -185,7 +183,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), 
@@ -207,11 +205,6 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 
 	@Override
 	public void mouseClicked(MouseEvent e) {
-		// If double clicked on a Switch change the Image to on/off
-		if (doubleClick() && tempCps != null && tempCps.getClass() == HolonSwitch.class) {
-			((HolonSwitch) tempCps).switchState();
-		}
-		repaint();
 	}
 
 	@Override
@@ -398,13 +391,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 +416,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);
 

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();
 		}