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