Teh-Hai Julian Zheng il y a 7 ans
Parent
commit
36909dfb4d

BIN
res/Images/power-plant.png


BIN
res/Images/switch-off.png


BIN
res/Images/switch-on.png


BIN
res/Images/transformer-1.png


+ 1 - 0
src/classes/CpsNode.java

@@ -12,5 +12,6 @@ public class CpsNode extends CpsObject {
 		this.setImage("/Images/node.png");
 		this.setSav("Canvas");
 	}
+	
 
 }

+ 2 - 0
src/classes/HolonObject.java

@@ -2,6 +2,8 @@ package classes;
 
 import java.util.ArrayList;
 
+import ui.model.idCounter;
+
 public class HolonObject extends CpsObject {
 
 	/* Array of all consumers */

+ 1 - 1
src/ui/controller/CategoryController.java

@@ -37,7 +37,7 @@ public class CategoryController {
 		house.setSav("Building");
 
 		HolonTransformer transformer = new HolonTransformer("Transformer");
-		transformer.setImage("/Images/transformer.png");
+		transformer.setImage("/Images/transformer-1.png");
 		transformer.setSav("Component");
 		
 		HolonSwitch sw = new HolonSwitch("Switch");

+ 1 - 0
src/ui/view/MyCanvas.java

@@ -414,6 +414,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		// ins leere Gedragged
 		if (node) {
 			CpsNode n = new CpsNode("Node");
+			n.setID(idCounter.nextId());
 			n.setPosition(x - model.getScaleDiv2(), y - model.getScaleDiv2());
 			controller.addObjectCanvas(n);