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 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"<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 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"<setScalarPrinter(new MyScalarPrinter); return sb; +#else + ScalarBar *sb = new ScalarBar; + ScalarBar::TextProperties tp; + tp._fontFile = "fonts/times.ttf"; + + sb->setTextProperties(tp); + + return sb; +#endif }