Browse Source

neue Dummy Pics

Kevin Trometer 7 years ago
parent
commit
c3a25df1ae

BIN
bin/Images/Thumbs.db


BIN
bin/ui/controller/CategoryController.class


BIN
bin/ui/view/MyCanvas.class


BIN
res/Images/Dummy_PowerPlant.png


BIN
res/Images/Dummy_Switch.png


BIN
res/Images/Dummy_Transformator.png


BIN
res/Images/Thumbs.db


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

@@ -36,10 +36,13 @@ public class CategoryController {
 		Category component = new Category("Component");
 
 		HolonObject powerp = new HolonObject("Power Plant");
+		powerp.setImage("/Images/Dummy_PowerPlant.png");
 		HolonObject house = new HolonObject("House");
-		house.setImage("/Images/house.png");
+		house.setImage("/Images/Dummy_House.png");
 		HolonTransformer transformer = new HolonTransformer("Transformer");
+		transformer.setImage("/Images/Dummy_Transformator.png");
 		HolonSwitch sw = new HolonSwitch("Switch");
+		sw.setImage("/Images/Dummy_Switch.png");
 
 		addObject(energy, powerp);
 		addObject(building, house);

+ 7 - 5
src/ui/view/MyCanvas.java

@@ -34,6 +34,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	private int y = 0;
 	private Model model;
 	private final Control controller;
+	private int cx;
+	private int cy;
 	
 	boolean dragging = false;
 	boolean dropDelete = false;
@@ -112,8 +114,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		// TODO Auto-generated method stub
 		x = e.getX();
 		y = e.getY();
-		int cx;
-		int cy;
+		
 		tempCps = null;
 		//Object Selection
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
@@ -123,7 +124,8 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 				tempCps = cps;
 			}
 		}
-		//Object Selection Highlighting ( selectRect)
+		
+		//Object Selection Highlighting (selectRect)
 		objectSelectionHighlighting();
 		
 		repaint();		
@@ -134,6 +136,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		if (dragging) {
 			x = e.getX();
 			y = e.getY();
+			
 			dragging = false;
 			tempCps.setPos(e.getX() - GlobalVariables.SCALE/2, e.getY() - GlobalVariables.SCALE/2);
 			tempCps = null;
@@ -169,8 +172,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	public void mouseMoved(MouseEvent e) {
 		x = e.getX();
 		y = e.getY();
-		int cx;
-		int cy;
+		
 		boolean on = false;
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			cx = cps.getPos().x;