objects auf canvas

src/classes/HolonObject.java

@@ -34,7 +34,7 @@ public class HolonObject extends CpsObject {
 	}
 
 	public HolonObject(CpsObject obj) {
-		super(obj.objName);
+		super(obj);
 		consumers = new ArrayList<HolonElement>();
 		producers = new ArrayList<HolonElement>();
 		this.consumers = ((HolonObject)obj).getConsumers();

src/ui/view/MyCanvas.java

@@ -51,8 +51,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			}
 		});
 
-		img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
-				.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
+		//img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
+		//		.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
 		
 		this.addMouseListener(this);
 		this.addMouseMotionListener(this);
@@ -67,6 +67,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		}
 		
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
+			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
+			System.out.println(cps.getImage());
 			g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
 		}
 	}
@@ -97,8 +99,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			int cx = cps.getPos().x;
 			int cy = cps.getPos().y;
-			if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x + img.getWidth(null) >= cx
-					&& y + img.getHeight(null) >= cy) {
+			if (x - img.getWidth(null) <= cx && y - img.getHeight(null) <= cy && x >= cx && y >= cy) {
 				tempCps = cps;
 			}
 		}