Kevin Trometer 7 anni fa
parent
commit
a86d4cc832
2 ha cambiato i file con 14 aggiunte e 11 eliminazioni
  1. 6 6
      src/ui/view/GUI.java
  2. 8 5
      src/ui/view/MyCanvas.java

+ 6 - 6
src/ui/view/GUI.java

@@ -515,7 +515,7 @@ public class GUI<E> implements CategoryListener {
 			@Override
 			public void stateChanged(ChangeEvent e) {
 				controller.setScale(sizeSlider.getValue());
-				tree.setRowHeight(model.getScale());
+				tree.setRowHeight(50);
 				canvas.objectSelectionHighlighting();
 				canvas.repaint();
 			}
@@ -866,10 +866,10 @@ public class GUI<E> implements CategoryListener {
 								File checkPath = new File(cps.getImage());
 								if (checkPath.exists()) {
 									imgR = new ImageIcon(cps.getImage()).getImage().getScaledInstance(
-											controller.getScale(), controller.getScale(), java.awt.Image.SCALE_SMOOTH);
+											50, 50, java.awt.Image.SCALE_SMOOTH);
 								} else {
 									imgR = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-											.getScaledInstance(controller.getScale(), controller.getScale(),
+											.getScaledInstance(50, 50,
 													java.awt.Image.SCALE_SMOOTH);
 								}
 								if (imgR != null) {
@@ -880,7 +880,7 @@ public class GUI<E> implements CategoryListener {
 						}
 					}
 				}
-				tree.setRowHeight(model.getScale());
+				tree.setRowHeight(50);
 				if (hasFocus) {
 					label.setForeground(new Color(0, 0, 255));
 					label.setOpaque(true);
@@ -973,11 +973,11 @@ public class GUI<E> implements CategoryListener {
 									File checkPath = new File(cps.getImage());
 									if (checkPath.exists()) {
 										img = new ImageIcon(cps.getImage()).getImage().getScaledInstance(
-												controller.getScale(), controller.getScale(),
+												50, 50,
 												java.awt.Image.SCALE_SMOOTH);
 									} else {
 										img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage()
-												.getScaledInstance(controller.getScale(), controller.getScale(),
+												.getScaledInstance(50, 50,
 														java.awt.Image.SCALE_SMOOTH);
 									}
 									tempCps = cps;

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

@@ -196,7 +196,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 		}
 
 		// Highlighted Edge
-		if (model.getSelectedObjectID() > 0) {
+		if (model.getSelectedObjectID() > 0 || !model.getSelectedCpsObjects().isEmpty() || !TempSelected.isEmpty()) {
 			g2.setColor(Color.BLUE);
 			for (CpsEdge con : model.getEdgesOnCanvas()) {
 				if (con.getFlow() <= con.getCapacity()) {
@@ -205,7 +205,10 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					g2.setStroke(new BasicStroke(2));
 				}
 				if (con.getA().getID() == model.getSelectedObjectID()
-						|| con.getB().getID() == model.getSelectedObjectID() && con != edgeHighlight) {
+						|| model.getSelectedCpsObjects().contains(con.getA()) || TempSelected.contains(con.getA())
+						|| con.getB().getID() == model.getSelectedObjectID()
+						|| model.getSelectedCpsObjects().contains(con.getB())
+						|| TempSelected.contains(con.getB()) && con != edgeHighlight) {
 					g2.drawLine(con.getA().getPosition().x + controller.getScaleDiv2(),
 							con.getA().getPosition().y + controller.getScaleDiv2(),
 							con.getB().getPosition().x + controller.getScaleDiv2(),
@@ -256,7 +259,6 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 						(int) (controller.getScale() + ((scalediv20 + 3) * 2)),
 						(int) (controller.getScale() + ((scalediv20 + 3) * 2)));
 			}
-			
 
 			// node image
 			if (cps instanceof CpsNode && (model.getSelectedCpsObjects().contains(cps) || TempSelected.contains(cps))) {
@@ -510,8 +512,9 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 					y1 = y;
 					y2 = sy;
 				}
-				if (x1 <= cps.getPosition().x+model.getScaleDiv2() && y1 <= cps.getPosition().y+model.getScaleDiv2() && x2 >= cps.getPosition().x+model.getScaleDiv2()
-						&& y2 >= cps.getPosition().y+model.getScaleDiv2()) {
+				if (x1 <= cps.getPosition().x + model.getScaleDiv2() && y1 <= cps.getPosition().y + model.getScaleDiv2()
+						&& x2 >= cps.getPosition().x + model.getScaleDiv2()
+						&& y2 >= cps.getPosition().y + model.getScaleDiv2()) {
 					TempSelected.add(cps);
 
 				}