Browse Source

max objects entfernt aus statisticgraph

Kevin Trometer 8 years ago
parent
commit
2fc1257b6a
1 changed files with 31 additions and 36 deletions
  1. 31 36
      src/ui/view/StatisticGraph.java

+ 31 - 36
src/ui/view/StatisticGraph.java

@@ -24,9 +24,6 @@ public class StatisticGraph extends JPanel {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	// Max Objects
-	final int MAX_OBJECTS = 8;
-
 	// Maximum y Value
 	double maximum = 0;
 
@@ -83,39 +80,39 @@ public class StatisticGraph extends JPanel {
 			g2.drawLine(0, i, this.getWidth(), i);
 		}
 
-		if(model != null){
-		isSimRunning = model.getIsSimulation();
-
-		// if sim is on
-		if (isSimRunning) {
-			g2.setStroke(new BasicStroke(3));
-
-			// Calculate the Maximum
-			calcMaximum();
-
-			// Calculate values for each set and add them
-			addValues();
-
-			//Create Paths and draw them
-			for (TrackedDataSet set : objects) {
-				path.reset();
-				switch (set.getProperty()) {
-				case TrackedDataSet.CONSUMPTION:
-				case TrackedDataSet.PRODUCTION:
-				case TrackedDataSet.ACTIVATED_ELEMENTS:
-					createPathFloats(set);
-					break;
-				case TrackedDataSet.ON_OFF:
-					createPathBooleans(set);
-					break;
-				default:
-					break;
+		if (model != null) {
+			isSimRunning = model.getIsSimulation();
+
+			// if sim is on
+			if (isSimRunning) {
+				g2.setStroke(new BasicStroke(3));
+
+				// Calculate the Maximum
+				calcMaximum();
+
+				// Calculate values for each set and add them
+				addValues();
+
+				// Create Paths and draw them
+				for (TrackedDataSet set : objects) {
+					path.reset();
+					switch (set.getProperty()) {
+					case TrackedDataSet.CONSUMPTION:
+					case TrackedDataSet.PRODUCTION:
+					case TrackedDataSet.ACTIVATED_ELEMENTS:
+						createPathFloats(set);
+						break;
+					case TrackedDataSet.ON_OFF:
+						createPathBooleans(set);
+						break;
+					default:
+						break;
+					}
+					g2.setColor(set.getColor());
+					g2.draw(path);
 				}
-				g2.setColor(set.getColor());
-				g2.draw(path);
 			}
 		}
-		}
 	}
 
 	/**
@@ -125,9 +122,7 @@ public class StatisticGraph extends JPanel {
 	 *            the Object to add
 	 */
 	public void addObject(TrackedDataSet set) {
-		if (objects.size() < MAX_OBJECTS && !objects.contains(set)) {
-			objects.add(set);
-		}
+		objects.add(set);
 	}
 
 	/**