From 8ad75d0cebcb14855e29c5ded07a5ccf0322d6e2 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 20 Oct 2003 09:01:16 +0000
Subject: [PATCH] Fixed print on scalar bar example.

---
 examples/osgscalarbar/osgscalarbar.cpp | 65 ++++++++++++++------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/examples/osgscalarbar/osgscalarbar.cpp b/examples/osgscalarbar/osgscalarbar.cpp
index 58bad3a33..8b96a2b31 100644
--- a/examples/osgscalarbar/osgscalarbar.cpp
+++ b/examples/osgscalarbar/osgscalarbar.cpp
@@ -27,40 +27,45 @@ using namespace osgSim;
 
 osg::Node* createScalarBar()
 {
-//     ScalarsToColors* stc = new ScalarsToColors(0.0f,1.0f);
-// 	ScalarBar* sb = new ScalarBar(2,3,stc);
-//
-//     // Create a custom color set
-//     std::vector<osg::Vec4> cs;
-//     cs.push_back(osg::Vec4(1.0f,0.0f,0.0f,1.0f));   // R
-//     cs.push_back(osg::Vec4(0.0f,0.0f,1.0f,1.0f));   // B
-//
-// 	// Create a custom scalar printer
-//     struct MyScalarPrinter: public ScalarBar::ScalarPrinter
-// 	{
-//         std::string printScalar(float scalar)
-// 		{
-// 		    std::cout<<"In MyScalarPrinter::printScalar"<<std::endl;
-//             if(scalar==0.0f) return "Hello";
-// 			else if(scalar==1.0f) return "Goodbye";
-// 			else return ScalarBar::ScalarPrinter::printScalar(scalar);
-// 		}
-// 	};
-//
-//     ColorRange* stc = new ColorRange(0.0f,1.0f,cs);
-// 	//ScalarBar* sb = new ScalarBar(2, 2, stc, "ScalarBar", ScalarBar::HORIZONTAL, 0.25f, new MyScalarPrinter);
-// 	ScalarBar* sb = new ScalarBar(2, 2, stc, "ScalarBar", ScalarBar::VERTICAL, 4.0f, new MyScalarPrinter);
-// 	sb->setScalarPrinter(new MyScalarPrinter);
-//
-// 	return sb;
+#if 1
+    //ScalarsToColors* stc = new ScalarsToColors(0.0f,1.0f);
+    //ScalarBar* sb = new ScalarBar(2,3,stc,"STC_ScalarBar");
 
-    ScalarBar *sb = new ScalarBar;
-    ScalarBar::TextProperties tp;
-	tp._fontFile = "fonts/times.ttf";
+    // Create a custom color set
+    std::vector<osg::Vec4> cs;
+    cs.push_back(osg::Vec4(1.0f,0.0f,0.0f,1.0f));   // R
+    cs.push_back(osg::Vec4(0.0f,1.0f,0.0f,1.0f));   // G
+    cs.push_back(osg::Vec4(1.0f,1.0f,0.0f,1.0f));   // G
+    cs.push_back(osg::Vec4(0.0f,0.0f,1.0f,1.0f));   // B
+    cs.push_back(osg::Vec4(0.0f,1.0f,1.0f,1.0f));   // R
 
-	sb->setTextProperties(tp);
+    // Create a custom scalar printer
+    struct MyScalarPrinter: public ScalarBar::ScalarPrinter
+    {
+        std::string printScalar(float scalar)
+        {
+            std::cout<<"In MyScalarPrinter::printScalar"<<std::endl;
+            if(scalar==0.0f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Bottom";
+            else if(scalar==0.5f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Middle";
+            else if(scalar==1.0f) return ScalarBar::ScalarPrinter::printScalar(scalar)+" Top";
+            else return ScalarBar::ScalarPrinter::printScalar(scalar);
+        }
+    };
+
+    ColorRange* cr = new ColorRange(0.0f,1.0f,cs);
+    ScalarBar* sb = new ScalarBar(20, 11, cr, "ScalarBar", ScalarBar::VERTICAL, 4.0f, new MyScalarPrinter);
+    sb->setScalarPrinter(new MyScalarPrinter);
 
     return sb;
+#else
+    ScalarBar *sb = new ScalarBar;
+    ScalarBar::TextProperties tp;
+    tp._fontFile = "fonts/times.ttf";
+
+    sb->setTextProperties(tp);
+
+    return sb;
+#endif
 
 }