Browse Source

fixed some issues

dominik.rieder 7 years ago
parent
commit
5a37003015
3 changed files with 11 additions and 7 deletions
  1. 7 1
      src/ui/model/Model.java
  2. 1 3
      src/ui/view/GUI.java
  3. 3 3
      src/ui/view/UpperNodeCanvas.java

+ 7 - 1
src/ui/model/Model.java

@@ -24,7 +24,7 @@ import ui.view.Console;
  * @author Gruppe14
  *
  */
-public class Model {
+public class Model{
 
 	// Global Variables
 	private int canvasX = 1000;
@@ -644,4 +644,10 @@ public class Model {
 		graphListeners.add(gl);
 	}
 
+	public void addObjectsToGraphListeners(){
+		for(GraphListener gl : graphListeners){
+			gl.addTrackedObject(trackingObj);
+		}
+	}
+
 }

+ 1 - 3
src/ui/view/GUI.java

@@ -126,6 +126,7 @@ public class GUI<E> implements CategoryListener {
 
 	private splitPane statSplitPane;
 	private JScrollPane statScrollPane;
+	private UpperNodeCanvas unc;;
 
 	private final JLabel maxGraph = new JLabel("100%");
 	private final JLabel medGraph = new JLabel("50%");
@@ -235,7 +236,6 @@ public class GUI<E> implements CategoryListener {
 	private Console console = new Console();
 	private MyCanvas canvas;
 	private UnitGraph unitGraph;
-	private StatisticGraph statGraph;
 	private final JSplitPane splitPane3 = new JSplitPane();
 	private final JSlider sizeSlider = new JSlider();
 	private final JLabel lblImageSize = new JLabel(Languages.getLanguage()[94]);
@@ -284,7 +284,6 @@ public class GUI<E> implements CategoryListener {
 		statScrollPane = new JScrollPane(statSplitPane);
 		this.canvas = new MyCanvas(model, control);
 		this.unitGraph = new UnitGraph(model, control);
-		this.statGraph = new StatisticGraph(model, controller);
 		control.initListener(this);
 		controller.setCanvas(canvas);
 		model.setConsole(console);
@@ -1971,7 +1970,6 @@ 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, "");
 		} else {

+ 3 - 3
src/ui/view/UpperNodeCanvas.java

@@ -138,7 +138,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		itemGroup.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				controller.addUpperNode("NodeOfNode", UpperNode);
+				controller.addUpperNode("NodeOfNode", upperNode);
 				repaint();
 			}
 		});
@@ -146,7 +146,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 		itemUngroup.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				controller.delUpperNode((CpsUpperNode) tempCps, UpperNode);
+				controller.delUpperNode((CpsUpperNode) tempCps, upperNode);
 				repaint();
 			}
 		});
@@ -207,7 +207,7 @@ public class UpperNodeCanvas extends JPanel implements MouseListener, MouseMotio
 			public void actionPerformed(ActionEvent e) {
 				// Remove the selected Object objects
 				for (AbstractCpsObject cps : model.getSelectedCpsObjects()) {
-					controller.delObjUpperNode(cps, UpperNode);
+					controller.delObjUpperNode(cps, upperNode);
 				}
 				model.getSelectedCpsObjects().clear();
 				tempCps = null;