Преглед на файлове

gelöschte objekte werden auch detracked

dominik.rieder преди 7 години
родител
ревизия
1903a77d79
променени са 2 файла, в които са добавени 16 реда и са изтрити 0 реда
  1. 15 0
      src/classes/CpsEdge.java
  2. 1 0
      src/ui/view/MyCanvas.java

+ 15 - 0
src/classes/CpsEdge.java

@@ -24,6 +24,12 @@ public class CpsEdge {
 	 * repair it is through manual change (setStateEdge)
 	 */
 	boolean isWorking;
+	
+	/*
+	 * Is true when a Connection to an Group Object, is connected inside the Group. 
+	 * Is false when not
+	 */
+	boolean isConnected;
 	// for internal use --> flow of electricity (simulation state)
 	ArrayList<Integer> tags;
 	// for internal use --> flow of electricity (simulation state)
@@ -70,6 +76,7 @@ public class CpsEdge {
 		this.maxCapacity = maxCap;
 		flow = 0;
 		isWorking = true;
+		isConnected = true;
 		pseudoTags = new ArrayList<Integer>();
 	}
 
@@ -260,5 +267,13 @@ public class CpsEdge {
 			}
 		}
 	}
+	
+	public boolean getConnected(){
+		return isConnected;
+	}
+	
+	public void setConnected(boolean state){
+		isConnected = state;
+	}
 
 }

+ 1 - 0
src/ui/view/MyCanvas.java

@@ -325,6 +325,7 @@ public class MyCanvas extends JPanel implements MouseListener, MouseMotionListen
 				// Remove the selected Object objects
 				for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
 					controller.delCanvasObject(cps);
+					controller.removeTrackingObj(cps);
 					// Remove UpperNodeTab if UpperNode deleted
 					if (cps instanceof CpsUpperNode) {
 						JTabbedPane tabbedPane = (JTabbedPane) getParent().getParent().getParent();