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/GlobalVariables.java

@@ -0,0 +1,5 @@
+package classes;
+
+public class GlobalVariables {
+	public static int SCALE = 40;
+}

src/classes/HolonObject.java

@@ -34,10 +34,11 @@ public class HolonObject extends CpsObject {
 	}
 
 	public HolonObject(CpsObject obj) {
-		super(obj.objName);
-		/*
-		 * this.consumers = obj.consumers; this.producers = obj.producers;
-		 */
+		super(obj);
+		consumers = new ArrayList<HolonElement>();
+		producers = new ArrayList<HolonElement>();
+		this.consumers = ((HolonObject)obj).getConsumers();
+		this.producers = ((HolonObject)obj).getProducers();
 	}
 
 	public void addConsumer(HolonElement consumer) {

src/ui/view/GUI.java

@@ -56,6 +56,7 @@ import javax.swing.ImageIcon;
 
 import classes.Category;
 import classes.CpsObject;
+import classes.GlobalVariables;
 import classes.HolonElement;
 import classes.HolonObject;
 import classes.HolonSwitch;
@@ -200,7 +201,7 @@ public class GUI implements CategoryListener {
 		splitPane_2.setDividerLocation(200);
 
 		splitPane.setLeftComponent(scrollPane_1);
-		img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(30, 30,
+		img = new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage().getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE,
 				java.awt.Image.SCALE_SMOOTH);
 		Icon icon = new ImageIcon(img);
 
@@ -214,21 +215,22 @@ public class GUI implements CategoryListener {
 				CpsObject tempCPS = null;
 
 				for (Category cat : model.getCategories()) {
+					if (value.toString().compareTo(cat.getCompareName()) == 0) {
+						label.setText(cat.getCompareName());
+					}
 					for (CpsObject cps : cat.getObjects()) {
 						if (value.toString().compareTo(cps.getCompareName()) == 0) {
 							tempCPS = cps;
-							// System.out.println(tempCPS.getImage());
 							imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-									.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
+									.getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE, java.awt.Image.SCALE_SMOOTH);
 							if (imgR != null) {
 								label.setIcon(new ImageIcon(imgR));
 							}
-						} else {
-							
+							label.setText(cps.getName());
 						}
 					}
 				}
-				label.setText(value.toString());
+				if(label.getText().length() == 0) label.setText(value.toString());
 				return label;
 
 			}
@@ -247,14 +249,7 @@ public class GUI implements CategoryListener {
 			public void mouseReleased(MouseEvent e) {
 				try {
 					if (dragging) {
-
-						// if(){
-						// HolonSwitch h = new HolonSwitch(actualObjectClicked);
-						// }else if(){
-						// HolonTransformer h = new
-						// HolonTransformer(actualObjectClicked);
-						// }else{
-						HolonObject h = new HolonObject(actualObjectClicked);
+						HolonObject h = new HolonObject(tempCps);
 						h.setPos((int) canvas.getMousePosition().getX(), (int) canvas.getMousePosition().getY());
 						controller.addObject(h);
 						for (int i = 0; i < model.getObjectsOnCanvas().size(); i++) {
@@ -292,7 +287,7 @@ public class GUI implements CategoryListener {
 						for (CpsObject cps : cat.getObjects()) {
 							if (actualObjectClicked.compareTo(cps.getCompareName()) == 0) {
 								img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-										.getScaledInstance(30, 30, java.awt.Image.SCALE_SMOOTH);
+										.getScaledInstance(GlobalVariables.SCALE, GlobalVariables.SCALE, java.awt.Image.SCALE_SMOOTH);
 								tempCps = cps;
 								dragging = true;
 								Cursor cursor = Toolkit.getDefaultToolkit().createCustomCursor(img, new Point(0, 0),

src/ui/view/MyCanvas.java

@@ -19,6 +19,7 @@ import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 
 import classes.CpsObject;
+import classes.GlobalVariables;
 import classes.HolonElement;
 import classes.HolonObject;
 import ui.model.*;
@@ -51,8 +52,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,7 +68,9 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		}
 		
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
-			g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
+			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
+			g.drawImage(img, cps.getPos().x, cps.getPos().y, GlobalVariables.SCALE, GlobalVariables.SCALE, null);
+			//g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
 		}
 	}
 
@@ -97,13 +100,12 @@ 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 - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
 				tempCps = cps;
 			}
 		}
 		if(tempCps != null){
-			selectRect.setBounds(tempCps.getPos().x-1, tempCps.getPos().y-1, 32, 32);
+			selectRect.setBounds(tempCps.getPos().x-(GlobalVariables.SCALE/20), tempCps.getPos().y-(GlobalVariables.SCALE/20), GlobalVariables.SCALE+GlobalVariables.SCALE/10, GlobalVariables.SCALE+GlobalVariables.SCALE/10);
 			System.out.println("Select");
 		}else {
 			selectRect.setRect(0, 0, 0, 0);
@@ -118,7 +120,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			x = e.getX();
 			y = e.getY();
 			dragging = false;
-			tempCps.setPos(e.getX() - 15, e.getY() - 15);
+			tempCps.setPos(e.getX() - GlobalVariables.SCALE/2, e.getY() - GlobalVariables.SCALE/2);
 			tempCps = null;
 			repaint();
 		}
@@ -138,9 +140,9 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	public void mouseDragged(MouseEvent e) {
 		// TODO Auto-generated method stub
 			try {
-				tempCps.setPos(e.getX() - 15, e.getY() - 15);
+				tempCps.setPos(e.getX() - GlobalVariables.SCALE/2, e.getY() - GlobalVariables.SCALE/2);
 				dragging = true;
-				selectRect.setLocation(tempCps.getPos().x-1, tempCps.getPos().y-1);
+				selectRect.setLocation(tempCps.getPos().x-(GlobalVariables.SCALE/20), tempCps.getPos().y-(GlobalVariables.SCALE/20));
 				repaint();
 				System.out.println("drag: " + e.getX() + " " + e.getY());
 			} catch (Exception e2) {