Changeset 6246 for geovis/trunk

Timestamp:

Apr 5, 2016 11:14:22 AM (8 years ago)

Author:

ldelgass

Message:

rename member var

Location:

geovis/trunk

Files:

• Renderer.cpp (modified) (2 diffs)
• Renderer.h (modified) (1 diff)

geovis/trunk/Renderer.cpp

@@ -495 +495 @@
 void Renderer::initControls()
 {
-    if (_hbox.valid())
-        return;
-    _hbox = 
+    if (_copyrightScaleBox.valid())
+        return;
+    _copyrightScaleBox = 
         new osgEarth::Util::Controls::HBox(osgEarth::Util::Controls::Control::ALIGN_RIGHT,
                                            osgEarth::Util::Controls::Control::ALIGN_BOTTOM,
@@ -518 +518 @@
     _scaleBar->setBorderColor(osg::Vec4f(0, 0, 0 ,1));
     _scaleBar->setBorderWidth(1.0);
-    _hbox->addControl(_copyrightLabel.get());
-    _hbox->addControl(_scaleLabel.get());
-    _hbox->addControl(_scaleBar.get());
-    osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(_hbox.get());
+    _copyrightScaleBox->addControl(_copyrightLabel.get());
+    _copyrightScaleBox->addControl(_scaleLabel.get());
+    _copyrightScaleBox->addControl(_scaleBar.get());
+    osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(_copyrightScaleBox.get());
     // Install an event callback to handle scale bar updates
     // Can't use an update callback since that will trigger

geovis/trunk/Renderer.h

@@ -663 +663 @@
     osg::ref_ptr<MouseCoordsTool> _mouseCoordsTool;
     osg::ref_ptr<MouseCoordsCallback> _coordsCallback;
-    osg::ref_ptr<osgEarth::Util::Controls::HBox> _hbox;
+    osg::ref_ptr<osgEarth::Util::Controls::HBox> _copyrightScaleBox;
     osg::ref_ptr<osgEarth::Util::Controls::LabelControl> _copyrightLabel;
     osg::ref_ptr<osgEarth::Util::Controls::LabelControl> _scaleLabel;