Global Scaling

src/classes/GlobalVariables.java

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

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);
 
@@ -221,7 +222,7 @@ public class GUI implements CategoryListener {
 						if (value.toString().compareTo(cps.getCompareName()) == 0) {
 							tempCPS = cps;
 							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));
 							}
@@ -286,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.*;
@@ -68,7 +69,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
-			g.drawImage(img, cps.getPos().x, cps.getPos().y, 30, 30, null);
+			g.drawImage(img, cps.getPos().x, cps.getPos().y, GlobalVariables.SCALE, GlobalVariables.SCALE, null);
 			//g.drawImage(img, cps.getPos().x, cps.getPos().y, null);
 		}
 	}
@@ -104,7 +105,7 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			}
 		}
 		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);
@@ -119,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();
 		}
@@ -139,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) {