Changeset 6653 for geovis

Timestamp:

Dec 3, 2016 11:40:44 AM (8 years ago)

Author:

ldelgass

Message:

Use same label/box style for copyright,scale bar as coords readout

File:

• geovis/trunk/Renderer.cpp (modified) (4 diffs)

geovis/trunk/Renderer.cpp

@@ -501 +501 @@
             new osgEarth::Util::Controls::HBox(osgEarth::Util::Controls::Control::ALIGN_RIGHT,
                                                osgEarth::Util::Controls::Control::ALIGN_TOP,
-                                               osgEarth::Util::Controls::Gutter(0, 2, 2, 0), 2.0f);
+                                               osgEarth::Util::Controls::Gutter(2, 2, 2, 2), 2.0f);
         _debugLabel = 
             new osgEarth::Util::Controls::LabelControl("Selection: None", 12.0f);
         _debugLabel->setForeColor(osg::Vec4f(0, 0, 0, 1));
-        //_debugLabel->setHaloColor(osg::Vec4f(1, 1, 1, 1));
         _debugBox->addControl(_debugLabel.get());
         _debugBox->setVertFill(true);
@@ -517 +516 @@
         new osgEarth::Util::Controls::HBox(osgEarth::Util::Controls::Control::ALIGN_RIGHT,
                                            osgEarth::Util::Controls::Control::ALIGN_BOTTOM,
-                                           osgEarth::Util::Controls::Gutter(0, 2, 2, 0), 2.0f);
+                                           osgEarth::Util::Controls::Gutter(2, 2, 2, 2), 2.0f);
     _attribution = "Map data © OpenStreetMap";
     _copyrightLabel =
         new osgEarth::Util::Controls::LabelControl(_attribution, 12.0f);
-    _copyrightLabel->setForeColor(osg::Vec4f(1, 1, 1, 1));
-    _copyrightLabel->setHaloColor(osg::Vec4f(0, 0, 0, 1));
+    _copyrightLabel->setForeColor(osg::Vec4f(0, 0, 0, 1));
     _copyrightLabel->setEncoding(osgText::String::ENCODING_UTF8);
     _scaleLabel =
         new osgEarth::Util::Controls::LabelControl("- km", 12.0f);
-    _scaleLabel->setForeColor(osg::Vec4f(1, 1, 1, 1));
-    _scaleLabel->setHaloColor(osg::Vec4f(0, 0, 0, 1));
+    _scaleLabel->setForeColor(osg::Vec4f(0, 0, 0, 1));
     _scaleBar =
         new osgEarth::Util::Controls::Frame();
@@ -538 +535 @@
     _copyrightScaleBox->addControl(_scaleLabel.get());
     _copyrightScaleBox->addControl(_scaleBar.get());
+    _copyrightScaleBox->setVertFill(true);
+    _copyrightScaleBox->setForeColor(osg::Vec4f(0, 0, 0, 1));
+    _copyrightScaleBox->setBackColor(osg::Vec4f(1, 1, 1, 0.6));
     osgEarth::Util::Controls::ControlCanvas::getOrCreate(_viewer.get())->addControl(_copyrightScaleBox.get());
     // Install an event callback to handle scale bar updates
@@ -677 +677 @@
             new osgEarth::Util::Controls::HBox(osgEarth::Util::Controls::Control::ALIGN_LEFT,
                                                osgEarth::Util::Controls::Control::ALIGN_TOP,
-                                               osgEarth::Util::Controls::Gutter(0, 2, 2, 0), 2.0f);
+                                               osgEarth::Util::Controls::Gutter(2, 2, 2, 2), 2.0f);
         _coordsBox->setVertFill(true);
         _coordsBox->setForeColor(osg::Vec4f(0, 0, 0, 1));