Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons

src/ui/view/UpperNodeCanvas.java

@@ -602,20 +602,22 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			} else {
 				g2.setStroke(new BasicStroke(2));
 			}
-			g2.drawLine(edgeHighlight.getA().getPosition().x, edgeHighlight.getA().getPosition().y,
-					edgeHighlight.getB().getPosition().x, edgeHighlight.getB().getPosition().y);
+			if (upperNode.getNodeEdges().contains(edgeHighlight)) {
+				g2.drawLine(edgeHighlight.getA().getPosition().x, edgeHighlight.getA().getPosition().y,
+						edgeHighlight.getB().getPosition().x, edgeHighlight.getB().getPosition().y);
 
-			if (edgeHighlight.getCapacity() == -1) {
-				maxCap = Character.toString('\u221e');
-			} else if (edgeHighlight.getCapacity() == -2) {
-				maxCap = "???";
-			} else {
-				maxCap = String.valueOf(edgeHighlight.getCapacity());
-			}
-			if (showedInformation[0]) {
-				g2.drawString(edgeHighlight.getFlow() + "/" + maxCap,
-						(edgeHighlight.getA().getPosition().x + edgeHighlight.getB().getPosition().x) / 2,
-						(edgeHighlight.getA().getPosition().y + edgeHighlight.getB().getPosition().y) / 2);
+				if (edgeHighlight.getCapacity() == -1) {
+					maxCap = Character.toString('\u221e');
+				} else if (edgeHighlight.getCapacity() == -2) {
+					maxCap = "???";
+				} else {
+					maxCap = String.valueOf(edgeHighlight.getCapacity());
+				}
+				if (showedInformation[0]) {
+					g2.drawString(edgeHighlight.getFlow() + "/" + maxCap,
+							(edgeHighlight.getA().getPosition().x + edgeHighlight.getB().getPosition().x) / 2,
+							(edgeHighlight.getA().getPosition().y + edgeHighlight.getB().getPosition().y) / 2);
+				}
 			}
 		}
 
@@ -716,7 +718,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 								g2.setStroke(new BasicStroke(2));
 							}
 							if (ed.getA().getId() == model.getSelectedObjectID()
-									|| ed.getB().getId() == model.getSelectedObjectID())
+									|| ed.getB().getId() == model.getSelectedObjectID() || edgeHighlight == ed)
 								g2.setColor(Color.BLUE);
 						} else {
 							g2.setColor(Color.DARK_GRAY);
@@ -1199,12 +1201,12 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			}
 
 			cx = borderPos >> 1;
-			cy = (int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count);
-			if (x - controller.getScale() <= cx && y - controller.getScale() <= cy && x >= cx && y >= cy) {
+			cy = (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count);
+			if (x - 50 <= cx && y - 50 <= cy && x >= cx && y >= cy) {
 
 				on = true;
-				toolTipPos.x = cx - model.getScaleDiv2();
-				toolTipPos.y = cy + controller.getScale();
+				toolTipPos.x = cx - 25;
+				toolTipPos.y = cy + 50;
 				toolTipText = cps.getName() + ", " + cps.getId();
 
 			}
@@ -1445,10 +1447,12 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					obj = p.getB();
 					doTest = true;
 				}
-				// g2.drawImage(img, (borderPos >> 1) - 25, (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count), 50, 50, null);
+				// g2.drawImage(img, (borderPos >> 1) - 25, (int) (scalediv20 +
+				// 5 + (50 + scalediv20 + 10) * count), 50, 50, null);
 				if (doTest) {
-					Line2D l = new Line2D.Float((borderPos >> 1) - 25, (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count),
-							obj.getPosition().x, obj.getPosition().y);
+					Line2D l = new Line2D.Float((borderPos >> 1) - 25,
+							(int) (scalediv20 + 5 + 25 + (50 + scalediv20 + 10) * count), obj.getPosition().x,
+							obj.getPosition().y);
 					if ((borderPos >> 1) > obj.getPosition().x) {
 						hx = (borderPos >> 1) - 25 + model.getScaleDiv2() + 7;
 						lx = obj.getPosition().x + model.getScaleDiv2() - 7;
@@ -1457,10 +1461,10 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 						hx = obj.getPosition().x + model.getScaleDiv2() + 7;
 					}
 					if ((int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count) > obj.getPosition().y) {
-						hy = (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count)+ model.getScaleDiv2() + 7;
+						hy = (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count) + model.getScaleDiv2() + 7;
 						ly = obj.getPosition().y + model.getScaleDiv2() - 7;
 					} else {
-						ly = (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count)+ model.getScaleDiv2() - 7;
+						ly = (int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count) + model.getScaleDiv2() - 7;
 						hy = obj.getPosition().y + model.getScaleDiv2() + 7;
 					}
 
@@ -1470,9 +1474,8 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 						return p;
 					}
 				}
-				count++;
-
 			}
+			count++;
 		}
 		return null;
 	}