merge fix

src/ui/view/MyCanvas.java

@@ -102,28 +102,19 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		// drawEdges
 		g2.setColor(Color.BLACK);
 		if (drawEdge)
-<<<<<<< HEAD
-			g2.drawLine(tempCps.getPosition().x + GlobalVariables.SCALE_DIVIDED2,
-					tempCps.getPosition().y + GlobalVariables.SCALE_DIVIDED2, x, y);
-=======
-			g2.drawLine(tempCps.getPos().x + controller.getScaleDiv2(),
-					tempCps.getPos().y + controller.getScaleDiv2(), x, y);
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
+			g2.drawLine(tempCps.getPosition().x + controller.getScaleDiv2(),
+					tempCps.getPosition().y + controller.getScaleDiv2(), x, y);
 
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			for (CpsObject con : cps.getConnectedTo()) {
 				if (con.getID() != model.getSelectedObjectID() && cps.getID() != model.getSelectedObjectID())
-<<<<<<< HEAD
-					g2.drawLine(cps.getPosition().x + GlobalVariables.SCALE_DIVIDED2,
-							cps.getPosition().y + GlobalVariables.SCALE_DIVIDED2,
-							con.getPosition().x + GlobalVariables.SCALE_DIVIDED2,
-							con.getPosition().y + GlobalVariables.SCALE_DIVIDED2);
-=======
-					g2.drawLine(cps.getPos().x + controller.getScaleDiv2(),
-							cps.getPos().y + controller.getScaleDiv2(),
-							con.getPos().x + controller.getScaleDiv2(),
-							con.getPos().y + controller.getScaleDiv2());
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
+					g2.drawLine(cps.getPosition().x + controller.getScaleDiv2(),
+							cps.getPosition().y + controller.getScaleDiv2(),
+							con.getPosition().x + controller.getScaleDiv2(),
+							con.getPosition().y + controller.getScaleDiv2());
+
 			}
 		}
 
@@ -132,28 +123,22 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			for (CpsObject con : cps.getConnectedTo()) {
 				if (con.getID() == model.getSelectedObjectID())
-<<<<<<< HEAD
-					g2.drawLine(cps.getPosition().x + GlobalVariables.SCALE_DIVIDED2,
-							cps.getPosition().y + GlobalVariables.SCALE_DIVIDED2,
-							con.getPosition().x + GlobalVariables.SCALE_DIVIDED2,
-							con.getPosition().y + GlobalVariables.SCALE_DIVIDED2);
-=======
-					g2.drawLine(cps.getPos().x + controller.getScaleDiv2(),
-							cps.getPos().y + controller.getScaleDiv2(),
-							con.getPos().x + controller.getScaleDiv2(),
-							con.getPos().y + controller.getScaleDiv2());
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
+					g2.drawLine(cps.getPosition().x + controller.getScaleDiv2(),
+							cps.getPosition().y + controller.getScaleDiv2(),
+							con.getPosition().x + controller.getScaleDiv2(),
+							con.getPosition().y + controller.getScaleDiv2());
+
 			}
 		}
 
 		// Objects
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
 			img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
-<<<<<<< HEAD
-			g2.drawImage(img, cps.getPosition().x, cps.getPosition().y, GlobalVariables.SCALE, GlobalVariables.SCALE, null);
-=======
-			g2.drawImage(img, cps.getPos().x, cps.getPos().y, controller.getScale(), controller.getScale(), null);
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
+			g2.drawImage(img, cps.getPosition().x, cps.getPosition().y, controller.getScale(), controller.getScale(),
+					null);
+
 		}
 	}
 
@@ -183,15 +168,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 		tempCps = null;
 		// Object Selection
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
-<<<<<<< HEAD
+
 			cx = cps.getPosition().x;
 			cy = cps.getPosition().y;
-			if (x - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
-=======
-			cx = cps.getPos().x;
-			cy = cps.getPos().y;
 			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
 				tempCps = cps;
 				if (e.isControlDown())
 					drawEdge = true;
@@ -216,11 +197,9 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			y = e.getY();
 
 			dragging = false;
-<<<<<<< HEAD
-			tempCps.setPosition(e.getX() - GlobalVariables.SCALE_DIVIDED2, e.getY() - GlobalVariables.SCALE_DIVIDED2);
-=======
-			tempCps.setPos(e.getX() - controller.getScaleDiv2(), e.getY() - controller.getScaleDiv2());
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
+			tempCps.setPosition(e.getX() - controller.getScaleDiv2(), e.getY() - controller.getScaleDiv2());
+
 			tempCps = null;
 		}
 
@@ -246,17 +225,12 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 			repaint();
 		} else {
 			try {
-<<<<<<< HEAD
-				tempCps.setPosition(e.getX() - GlobalVariables.SCALE_DIVIDED2, e.getY() - GlobalVariables.SCALE_DIVIDED2);
-				dragging = true;
-				selectRect.setLocation(tempCps.getPosition().x - (GlobalVariables.SCALE / 20),
-						tempCps.getPosition().y - (GlobalVariables.SCALE / 20));
-=======
-				tempCps.setPos(e.getX() - controller.getScaleDiv2(), e.getY() - controller.getScaleDiv2());
+
+				tempCps.setPosition(e.getX() - controller.getScaleDiv2(), e.getY() - controller.getScaleDiv2());
 				dragging = true;
-				selectRect.setLocation(tempCps.getPos().x - (controller.getScale() / 20),
-						tempCps.getPos().y - (controller.getScale() / 20));
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+				selectRect.setLocation(tempCps.getPosition().x - (controller.getScale() / 20),
+						tempCps.getPosition().y - (controller.getScale() / 20));
+
 				objectTT.setTipText(tempCps.getName());
 				objectTT.setLocation(tempCps.getPosition().x, tempCps.getPosition().y);
 				repaint();
@@ -273,15 +247,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 
 		boolean on = false;
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
-<<<<<<< HEAD
+
 			cx = cps.getPosition().x;
 			cy = cps.getPosition().y;
-			if (x - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
-=======
-			cx = cps.getPos().x;
-			cy = cps.getPos().y;
 			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
 				objectTT.setTipText(cps.getName());
 				objectTT.setLocation(cx, cy);
 				on = true;
@@ -298,17 +268,12 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	 */
 	private void objectSelectionHighlighting() {
 		if (tempCps != null) {
-<<<<<<< HEAD
-			selectRect.setBounds(tempCps.getPosition().x - (GlobalVariables.SCALE / 20),
-					tempCps.getPosition().y - (GlobalVariables.SCALE / 20),
-					GlobalVariables.SCALE + GlobalVariables.SCALE / 10,
-					GlobalVariables.SCALE + GlobalVariables.SCALE / 10);
-=======
-			selectRect.setBounds(tempCps.getPos().x - (controller.getScale() / 20),
-					tempCps.getPos().y - (controller.getScale() / 20),
+
+			selectRect.setBounds(tempCps.getPosition().x - (controller.getScale() / 20),
+					tempCps.getPosition().y - (controller.getScale() / 20),
 					controller.getScale() + controller.getScale() / 10,
 					controller.getScale() + controller.getScale() / 10);
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
 			controller.setSelectedObjectID(tempCps.getID());
 		} else {
 			controller.setSelectedObjectID(0);
@@ -321,15 +286,11 @@ class MyCanvas extends JPanel implements MouseListener, MouseMotionListener {
 	 */
 	private void drawDeleteEdge() {
 		for (CpsObject cps : model.getObjectsOnCanvas()) {
-<<<<<<< HEAD
+
 			cx = cps.getPosition().x;
 			cy = cps.getPosition().y;
-			if (x - GlobalVariables.SCALE <= cx && y - GlobalVariables.SCALE <= cy && x >= cx && y >= cy) {
-=======
-			cx = cps.getPos().x;
-			cy = cps.getPos().y;
 			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
->>>>>>> cfc3d43ad93ea7d7c8145b30eb7c48f5dd5f5d0a
+
 				if (!cps.getConnectedTo().contains(tempCps)) {
 					cps.AddConnection(tempCps);
 					tempCps.AddConnection(cps);