Kevin Trometer преди 7 години
родител
ревизия
bc82bb1bfa
променени са 3 файла, в които са добавени 28 реда и са изтрити 25 реда
  1. 10 13
      .classpath
  2. 2 2
      src/ui/view/GUI.java
  3. 16 10
      src/ui/view/UnitGraph.java

+ 10 - 13
.classpath

@@ -1,13 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="res"/>
-	<classpathentry excluding="src/|res/" kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="jars/json-simple-1.1.1.jar"/>
-	<classpathentry kind="lib" path="/home/jessey/git/praktikum-holons/libs/json-simple-1.1.1.jar"/>
-	<classpathentry kind="lib" path="/home/jessey/git/praktikum-holons/libs/commons-lang-2.5.jar"/>
-	<classpathentry kind="lib" path="/home/jessey/git/praktikum-holons/libs/json-smart-1.0.6.3.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="res"/>
+	<classpathentry excluding="src/|res/" kind="src" path=""/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="jars/json-simple-1.1.1.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

+ 2 - 2
src/ui/view/GUI.java

@@ -386,13 +386,13 @@ public class GUI<E> implements CategoryListener {
 						} else {
 							holonEleNamesDisplayed = ele.getEleName() + " ";
 						}
-
+						unitGraph.repaintWithNewElement(selectedElements);
 					}
 				} else if (ele != null) {
 					selectedElements.clear();
 					selectedElements.add(ele);
 					holonEleNamesDisplayed = ele.getEleName() + " ";
-					unitGraph.repaintWithNewElement(ele);
+					unitGraph.repaintWithNewElement(selectedElements);
 				} else {
 					elementGraph.setText("None ");
 					unitGraph.empty();

+ 16 - 10
src/ui/view/UnitGraph.java

@@ -13,6 +13,7 @@ import java.awt.event.MouseMotionListener;
 import java.awt.geom.CubicCurve2D;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Line2D;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.awt.Point;
 
@@ -48,7 +49,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 	private boolean isElement = false;
 	private boolean isSwitch = false;
 
-	private HolonElement tempElement;
+	private ArrayList<HolonElement> tempElements = new ArrayList<>();
 	private HolonSwitch tempSwitch;
 	private Model model;
 	private Control controller;
@@ -376,7 +377,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 			// Delete a Point
 			if (deletePoint && tempP.getX() != 0
 					&& (tempP.getX() != this.getWidth() / scaleX || tempP != pointList.getLast())) {
-				System.out.println("x: " + tempP.getY());
+				System.out.println("y: " + tempP.getY());
 				// pointList.remove(tempP);
 			}
 			// Delete This for
@@ -437,7 +438,7 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 	 */
 	public void empty() {
 		pointList = null;
-		tempElement = null;
+		tempElements = null;
 		tempSwitch = null;
 		arrayOfFloats = null;
 		arrayOfBooleans = null;
@@ -484,13 +485,13 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 	 * @param HolonElement
 	 *            ele, which should be visualized
 	 */
-	public void repaintWithNewElement(HolonElement ele) {
-		arrayOfFloats = ele.getEnergyAt();
-		tempElement = ele;
-		pointList = ele.getGraphPoints();
+	public void repaintWithNewElement(ArrayList<HolonElement> selectedElement) {
+		arrayOfFloats = selectedElement.get(selectedElement.size() - 1).getEnergyAt();
+		tempElements = selectedElement;
+		pointList = selectedElement.get(selectedElement.size() - 1).getGraphPoints();
 		isSwitch = false;
 		isElement = true;
-		MAXIMUM = tempElement.getEnergy();
+		MAXIMUM = selectedElement.get(selectedElement.size() - 1).getEnergy();
 		// First time clicked on the Element
 		if (pointList.isEmpty()) {
 			pointList.addFirst(new Point(0, 0));
@@ -569,8 +570,13 @@ class UnitGraph extends JPanel implements MouseListener, MouseMotionListener, Co
 	 * Fills the Arrays of each HolonElement
 	 */
 	public void fillArrayofValue() {
-		for (int i = 0; i < arrayOfFloats.length; i++) {
-			arrayOfFloats[i] = convertToValueY(getYValueAt_2((int) (i * width / (model.getIterations() - 1))));
+		for (HolonElement he : tempElements) {
+			MAXIMUM = he.getEnergy();
+			arrayOfFloats = he.getEnergyAt();
+			he.setGraphPoints(pointList);
+			for (int i = 0; i < arrayOfFloats.length; i++) {
+				arrayOfFloats[i] = convertToValueY(getYValueAt_2((int) (i * width / (model.getIterations() - 1))));
+			}
 		}
 	}