Browse Source

ich will pullen

Kevin Trometer 7 years ago
parent
commit
4bd99ae2c4
2 changed files with 22 additions and 9 deletions
  1. 10 8
      src/ui/view/GUI.java
  2. 12 1
      src/ui/view/UpperNodeCanvas.java

+ 10 - 8
src/ui/view/GUI.java

@@ -922,9 +922,10 @@ public class GUI<E> implements CategoryListener {
 									((HolonSwitch) getActualCps()).setManualState(bTemp);
 								}
 							}
-						}// else if (getActualCps() instanceof AbstractCpsObject) {
-							getActualCps().setName(temp.toString());
-						//}
+						} // else if (getActualCps() instanceof
+							// AbstractCpsObject) {
+						getActualCps().setName(temp.toString());
+						// }
 					} else {
 						temp = tableModelProperties.getValueAt(selValueY, selValueX);
 						btemp = tableModelProperties.getValueAt(mousePos.y / tableProperties.getRowHeight(),
@@ -2058,13 +2059,14 @@ public class GUI<E> implements CategoryListener {
 	 */
 	private void openNewUpperNodeTab() {
 		UpperNodeCanvas unc;
-		if(((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
-		.getComponent(0) instanceof MyCanvas){
-			unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp, "" );
+		if (((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0) instanceof MyCanvas) {
+			unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp, "");
 		} else {
-			unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp, ((UpperNodeCanvas)((JScrollPane) tabbedPane.getSelectedComponent()).getViewport().getComponent(0)).path+" -> " );	
+			unc = new UpperNodeCanvas(model, controller, (CpsUpperNode) temp,
+					((UpperNodeCanvas) ((JScrollPane) tabbedPane.getSelectedComponent()).getViewport()
+							.getComponent(0)).path + " -> ");
 		}
-		
+
 		unc.setBorder(null);
 		unc.setBackground(Color.WHITE);
 		unc.setPreferredSize(new Dimension(model.getCanvasX(), model.getCanvasY()));

+ 12 - 1
src/ui/view/UpperNodeCanvas.java

@@ -27,6 +27,8 @@ import javax.swing.JPopupMenu;
 import javax.swing.JScrollPane;
 import javax.swing.JToolTip;
 
+import com.sun.scenario.effect.impl.state.BoxRenderState;
+
 import classes.CpsEdge;
 import classes.CpsNode;
 import classes.CpsUpperNode;
@@ -56,6 +58,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 	private int cx, cy;
 	private int sx, sy; // Mark Coords
 	private float scalediv20;
+	private int borderPos = 100;
 
 	// Path
 	public String path;
@@ -247,11 +250,19 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		String maxCap;
 		super.paintComponent(g);
 		((JScrollPane)this.getParent().getParent()).setColumnHeaderView(breadCrumb);
+		
 		// Rendering
 		g2 = (Graphics2D) g;
 		RenderingHints rh = new RenderingHints(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 		g2.setRenderingHints(rh);
-
+		
+		//Border
+		g2.setColor(new Color(240, 240, 240));
+		g2.fillRect(0, 0, borderPos, this.getHeight());
+		g2.setColor(Color.BLACK);
+		g2.drawLine(borderPos, 0, borderPos, this.getHeight());
+		g2.drawLine(0, 0, this.getWidth(), 0);
+		
 		// Test SubNet Coloring
 		int i = 0;
 		for (SubNet s : controller.getSimManager().getSubNets()) {