X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.trend%2Fsrc%2Forg%2Fsimantics%2Ftrend%2Fimpl%2FTrendNode.java;h=dba76ccad2afdc13565cdc1412a62ab20a358883;hp=1d19e2f1775c1df298d31fa864a02ac3c1be4242;hb=876ede6b867e2e7966ffb46cc69dc820969c4394;hpb=b9450ae725ed484f18cb4a3a44eddc6da01ec9d7

diff --git a/bundles/org.simantics.trend/src/org/simantics/trend/impl/TrendNode.java b/bundles/org.simantics.trend/src/org/simantics/trend/impl/TrendNode.java
index 1d19e2f17..dba76ccad 100644
--- a/bundles/org.simantics.trend/src/org/simantics/trend/impl/TrendNode.java
+++ b/bundles/org.simantics.trend/src/org/simantics/trend/impl/TrendNode.java
@@ -60,7 +60,6 @@ import org.simantics.utils.format.ValueFormat;
 
 import gnu.trove.map.TObjectIntMap;
 import gnu.trove.map.hash.TObjectIntHashMap;
-import gnu.trove.procedure.TIntProcedure;
 import gnu.trove.procedure.TObjectProcedure;
 
 public class TrendNode extends G2DParentNode implements TrendLayout {
@@ -276,7 +275,6 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 
 		TObjectIntMap<String> newItemMap = itemIndexMap(newSpec.items);
 		TObjectIntMap<String> currentItemMap = itemIndexMap(spec.items);
-		TObjectIntMap<String> addedItemMap = subtract(newItemMap, currentItemMap);
 		TObjectIntMap<String> removedItemMap = subtract(currentItemMap, newItemMap);
 		Map<String, VertRuler> existingRulers = new HashMap<>();
 		if (this.spec.axisMode == YAxisMode.MultiAxis) {
@@ -347,6 +345,9 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 				for (int i=0; i<analogItems.size(); i++)
 					vertRulers.add( addNode(VertRuler.class) );
 			} else {
+				// Remove rulers of the items that were removed
+				// and add new rulers to have enough of them for
+				// each separate analog signal.
 				removedItemMap.forEachKey(new TObjectProcedure<String>() {
 					@Override
 					public boolean execute(String id) {
@@ -358,13 +359,10 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 						return true;
 					}
 				});
-				addedItemMap.forEachValue(new TIntProcedure() {
-					@Override
-					public boolean execute(int index) {
-						vertRulers.add( index, addNode(VertRuler.class) );
-						return true;
-					}
-				});
+				for (int i = vertRulers.size(); i < analogItems.size(); ++i) {
+					VertRuler ruler = addNode(VertRuler.class);
+					vertRulers.add(ruler);
+				}
 			}
 
 			for (int i = 0; i < analogItems.size(); i++) {