X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.trend%2Fsrc%2Forg%2Fsimantics%2Ftrend%2Fimpl%2FTrendNode.java;h=80ffa97679a748d6afd218cd5876ebb0a73050e2;hb=refs%2Fheads%2Frelease%2F1.43.0-CVM2;hp=575af21f5aa77265d0ee80298ceb1e8c3eb791dd;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

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 575af21f5..80ffa9767 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
@@ -87,6 +87,7 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 	public TrendQualitySpec quality = TrendQualitySpec.DEFAULT;
 	public boolean printing = false;
 	boolean singleAxis;
+	boolean singleAxisShowLegends;
 	
 	// Data nodes
 	List<ItemNode> analogItems = new ArrayList<ItemNode>();
@@ -243,7 +244,8 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 		TObjectIntMap<String> map = new TObjectIntHashMap<>(items.size(), 0.5f, -1);
 		for (int i = 0; i < items.size(); ++i) {
 			TrendItem it = items.get(i);
-			map.put(it.groupItemId, i);
+			if (!it.hidden)
+				map.put(it.groupItemId, i);
 		}
 		return map;
 	}
@@ -321,7 +323,27 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 
 		// Setup vertical ruler nodes
 		singleAxis = spec.axisMode == YAxisMode.SingleAxis;
-		if (singleAxis) {
+		singleAxisShowLegends = spec.axisMode == YAxisMode.SingleAxisShowLegends;
+		if(singleAxisShowLegends) {
+			if (yaxisModeChanged || vertRulers.size() != 1 || vertRuler == null) {
+				for (VertRuler vr : vertRulers) removeNode(vr);
+				vertRulers.clear();
+
+				vertRuler = addNode("VertRuler", VertRuler.class);
+				vertRulers.add( vertRuler );
+			}
+
+			vertRuler.manualscale = true;
+			vertRuler.singleAxisShowLegendsMaxLegends = spec.singleAxisShowLegendsMaxLegends;
+			for (int i=0; i<analogItems.size(); i++) {
+				ItemNode item = analogItems.get(i);
+				vertRuler.addExtraLabel(item.item.label, item.color);
+				item.ruler = vertRuler;
+				item.trendNode = this;
+				if (item.item.scale instanceof Scale.Manual == false) vertRuler.manualscale = false;
+			}
+		}
+		else if (singleAxis) {
 			if (yaxisModeChanged || vertRulers.size() != 1 || vertRuler == null) {
 				for (VertRuler vr : vertRulers) removeNode(vr);
 				vertRulers.clear();
@@ -369,8 +391,8 @@ public class TrendNode extends G2DParentNode implements TrendLayout {
 				ItemNode item = analogItems.get(i);
 				VertRuler vr = vertRulers.get(i);
 				vr.setZIndex(1000 + i);
-				vr.color = item.color;
 				vr.label = item.item.label;
+				vr.color = item.color;
 				vr.manualscale = item.item.scale instanceof Scale.Manual;
 				item.ruler = vr;
 				item.trendNode = this;