left panel in an uppernode is now fixed

src/ui/view/GUI.java

@@ -701,6 +701,11 @@ public class GUI<E> implements CategoryListener {
 				} else {
 					canvas.repaint();
 				}
+				if (!initSplit && ((JScrollPane) tabbedPane2.getSelectedComponent()).getViewport()
+						.getComponent(0) instanceof UpperNodeCanvas) {
+					((UpperNodeCanvas) ((JScrollPane) tabbedPane2.getSelectedComponent()).getViewport().getComponent(0))
+							.repaint();
+				}
 			}
 		});
 
@@ -2203,14 +2208,15 @@ public class GUI<E> implements CategoryListener {
 						new ButtonTabComponent(tabbedPane, tabbedPane2));
 				if (!initSplit) {
 					tabbedPane2.add(temp.getName(), null);
-					//tabbedPane2.setTabComponentAt(tabbedPane2.getTabCount() - 1,
-						//	new ButtonTabComponent(tabbedPane, tabbedPane2));
+					// tabbedPane2.setTabComponentAt(tabbedPane2.getTabCount() -
+					// 1,
+					// new ButtonTabComponent(tabbedPane, tabbedPane2));
 				}
 			} else {
 				tabbedPane2.add(temp.getName(), sp);
 				tabbedPane2.setSelectedComponent(sp);
-				//tabbedPane2.setTabComponentAt(tabbedPane2.getTabCount() - 1,
-					//	new ButtonTabComponent(tabbedPane, tabbedPane2));
+				// tabbedPane2.setTabComponentAt(tabbedPane2.getTabCount() - 1,
+				// new ButtonTabComponent(tabbedPane, tabbedPane2));
 
 				tabbedPane.add(temp.getName(), null);
 				tabbedPane.setTabComponentAt(tabbedPane.getTabCount() - 1,

src/ui/view/UpperNodeCanvas.java

@@ -139,7 +139,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		scalediv20 = model.getScale() / 20;
 
 		// Cps objecte aus dem border links schieben
-		borderPos = (int) (model.getScale() + controller.getScaleDiv2() + scalediv20 + scalediv20 + 10);
+		borderPos = (int) (50 + scalediv20 + scalediv20 + 10);
 		for (AbstractCpsObject cps : upperNode.getNodes()) {
 			if (cps.getPosition().x < model.getScaleDiv2() + borderPos + 5) {
 				cps.setPosition(new Position(borderPos + 5, cps.getPosition().y));
@@ -422,9 +422,6 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 		g2.setRenderingHints(rh);
 
-		// Left Border
-		borderPos = (int) (model.getScale() + scalediv20 + scalediv20 + 10);
-
 		// Paint the Background
 		if (!upperNode.getImagePath().isEmpty()) {
 			img = new ImageIcon(upperNode.getImagePath()).getImage();
@@ -676,8 +673,8 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					if (obj != null) {
 						g2.setColor(Color.BLUE);
 						g2.drawLine(obj.getPosition().x, obj.getPosition().y, (borderPos >> 1),
-								(int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count)
-										+ model.getScaleDiv2());
+								(int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count)
+										+ 25);
 					}
 				}
 			}
@@ -686,10 +683,10 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			if (showedInformation[3]) {
 				g2.setColor(cps.getBorderColor());
 				if (g2.getColor() != Color.WHITE) {
-					g2.fillRect((int) ((borderPos >> 1) - model.getScaleDiv2() - scalediv20) - 3,
-							(int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count - scalediv20) - 3,
-							(int) (controller.getScale() + ((scalediv20 + 3) * 2)),
-							(int) (controller.getScale() + ((scalediv20 + 3) * 2)));
+					g2.fillRect((int) ((borderPos >> 1) - 25 - scalediv20) - 3,
+							(int) (scalediv20 + 5 + (25 + scalediv20 + 10) * count - scalediv20) - 3,
+							(int) (50 + ((scalediv20 + 3) * 2)),
+							(int) (50 + ((scalediv20 + 3) * 2)));
 				}
 			}
 
@@ -709,17 +706,17 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 				if ((cps == tempCps && model.getSelectedCpsObjects().size() == 0 && tempSelected.size() == 0)
 						|| model.getSelectedCpsObjects().contains(cps) || tempSelected.contains(cps)) {
 					g2.setColor(Color.BLUE);
-					g2.fillRect((int) ((borderPos >> 1) - model.getScaleDiv2() - scalediv20),
-							(int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count - scalediv20),
-							(int) (controller.getScale() + (scalediv20 * 2)),
-							(int) (controller.getScale() + (scalediv20 * 2)));
+					g2.fillRect((int) ((borderPos >> 1) - 25 - scalediv20),
+							(int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count - scalediv20),
+							(int) (50 + (scalediv20 * 2)),
+							(int) (50 + (scalediv20 * 2)));
 				} else if (cps instanceof HolonObject) {
 					g2.setColor(((HolonObject) cps).getColor());
 
-					g2.fillRect((int) ((borderPos >> 1) - model.getScaleDiv2() - scalediv20),
-							(int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count - scalediv20),
-							(int) (controller.getScale() + (scalediv20 * 2)),
-							(int) (controller.getScale() + (scalediv20 * 2)));
+					g2.fillRect((int) ((borderPos >> 1) - 25 - scalediv20),
+							(int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count - scalediv20),
+							(int) (50 + (scalediv20 * 2)),
+							(int) (50 + (scalediv20 * 2)));
 				}
 				// draw image
 				File checkPath = new File(cps.getImage());
@@ -729,9 +726,9 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 					img = new ImageIcon(this.getClass().getResource(cps.getImage())).getImage();
 				}
 			}
-			g2.drawImage(img, (borderPos >> 1) - model.getScaleDiv2(),
-					(int) (scalediv20 + 5 + (model.getScale() + scalediv20 + 10) * count), controller.getScale(),
-					controller.getScale(), null);
+			g2.drawImage(img, (borderPos >> 1) - 25,
+					(int) (scalediv20 + 5 + (50 + scalediv20 + 10) * count), 50,
+					50, null);
 			count++;
 		}