From 82eb1d7e0f62014af2c188773a607dfe5c10c826 Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Tue, 31 Dec 2013 13:43:50 +0000
Subject: [PATCH] ScatterCtrl_Demo: Included units

git-svn-id: svn://ultimatepp.org/upp/trunk@6705 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 examples/ScatterCtrl_Demo/tab4.cpp | 6 +++---
 examples/ScatterCtrl_Demo/tab7.cpp | 1 +
 examples/ScatterCtrl_Demo/tab8.cpp | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/examples/ScatterCtrl_Demo/tab4.cpp b/examples/ScatterCtrl_Demo/tab4.cpp
index 783efbb36..a486aa983 100644
--- a/examples/ScatterCtrl_Demo/tab4.cpp
+++ b/examples/ScatterCtrl_Demo/tab4.cpp
@@ -11,13 +11,13 @@ void Tab4::Init()
 	scatter.SetMouseHandling(true).ShowContextMenu();
 	
 	s1 <<Pointf(1,-6)<<Pointf(2,-4)<<Pointf(3,2)<<Pointf(4,8)<<Pointf(5,8)<<Pointf(6,15)<<Pointf(7,20)<<Pointf(8,25)<<Pointf(9,14)<<Pointf(10,10)<<Pointf(11,3)<<Pointf(12,-11);
-	scatter.AddSeries(s1).Legend("2005");
+	scatter.AddSeries(s1).Legend("2005").Units("ºC");
 	
 	s2 <<Pointf(1,-12)<<Pointf(2,-7)<<Pointf(3,0)<<Pointf(4,2)<<Pointf(5,10)<<Pointf(6,18)<<Pointf(7,25)<<Pointf(8,26)<<Pointf(9,15)<<Pointf(10,12)<<Pointf(11,7)<<Pointf(12,-6);
-	scatter.AddSeries(s2).Legend("2006").MarkStyle<CircleMarkPlot>();
+	scatter.AddSeries(s2).Legend("2006").Units("ºC").MarkStyle<CircleMarkPlot>();
 	
 	scatter.Graduation_FormatX(ScatterCtrl::MON)
-		   .SetLabelY("Temperature [176 C]")
+		   .SetLabelY("Temperature")
 		   .SetMarkWidth(1, 4)
 		   .SetMinXmin(0).SetMaxXmax(13);
 }
diff --git a/examples/ScatterCtrl_Demo/tab7.cpp b/examples/ScatterCtrl_Demo/tab7.cpp
index 2d93b64ce..e8ce6207f 100644
--- a/examples/ScatterCtrl_Demo/tab7.cpp
+++ b/examples/ScatterCtrl_Demo/tab7.cpp
@@ -5,6 +5,7 @@ void Tab7::Init()
 {
 	CtrlLayout(*this);	
 	HSizePos().VSizePos();
+	scatter.SetRange(80, 100);
 	
 	bAddSeries 			<<= THISBACK(AddSeries);
 	bRemoveLastSeries 	<<= THISBACK(RemoveLastSeries);
diff --git a/examples/ScatterCtrl_Demo/tab8.cpp b/examples/ScatterCtrl_Demo/tab8.cpp
index 87a22bcdb..4616c2431 100644
--- a/examples/ScatterCtrl_Demo/tab8.cpp
+++ b/examples/ScatterCtrl_Demo/tab8.cpp
@@ -13,17 +13,17 @@ void Tab8::Init()
 	scatter.AddSeries(s3).Legend("Device 1").PlotStyle<BarSeriesPlot>(barWidth).NoMark().Stroke(2, Gray()).Dash(LINE_SOLID).Fill(LtGray());
 	
 	s1<<Pointf(1,-6)<<Pointf(2,-4)<<Pointf(3,2)<<Pointf(4,8)<<Pointf(5,8)<<Pointf(6,15)<<Pointf(7,20)<<Pointf(8,30)<<Pointf(9,14)<<Pointf(10,10)<<Pointf(11,3)<<Pointf(12,-11);
-	scatter.AddSeries(s1).Legend("Temperature").Stroke(3, Null).Dash(LINE_DASHED).MarkStyle<SquareMarkPlot>();
+	scatter.AddSeries(s1).Legend("Temperature").Units("ºC").Stroke(3, Null).Dash(LINE_DASHED).MarkStyle<SquareMarkPlot>();
 	
 	s2 <<Pointf(1,1008)<<Pointf(2,1012)<<Pointf(3,1016)<<Pointf(4,1012)<<Pointf(5,1008)<<Pointf(6,1016)<<Pointf(7,1012)<<Pointf(8,1004)<<Pointf(9,1000)<<Pointf(10,1001)<<Pointf(11,1000)<<Pointf(12,1002);
-	scatter.AddSeries(s2).Legend("Pressure").Stroke(3, Null).Dash("15 6 6 6 3 6 6 6").SetDataPrimaryY(false);
+	scatter.AddSeries(s2).Legend("Pressure").Units("mBar").Stroke(3, Null).Dash("15 6 6 6 3 6 6 6").SetDataPrimaryY(false);
 	scatter.SetDrawY2Reticle();
 	
 	scatter.cbModifFormatX = THISBACK(MyFormat);
 	scatter.cbModifFormatDeltaX = THISBACK(MyFormatDelta);
 	scatter.SetMaxRange(40).SetMinRange(2, 20)
-		   .SetLabelY("Temperature [C]")
-	       .SetLabelY2("Pressure [mBar]")
+		   .SetLabelY("Temperature")
+	       .SetLabelY2("Pressure")
 		   .SetMarkWidth(1, 4);
 	scatter.ShowInfo()
 		   .ShowContextMenu();