Merge branch 'master' into complex

Author: dcwhite

README.md

@@ -37,6 +37,7 @@ For documentation, please see: http://sciinstitute.github.io/SCIRun/
   - Apple clang 5.1
   - Qt 4.8
     + Download from http://releases.qt-project.org/qt4/source/qt-mac-opensource-4.8.4.dmg.
+    + The above dmg will not work if using OS X 10.11. In this case Qt 4.8 can be acquired through macports using the command 'sudo port install qt4-mac' - more on macports here: https://www.macports.org/install.php
 * Windows (tested on Windows 7, 8)
   - Visual Studio 2013
   - Qt 4.8

src/Interface/Modules/Render/ViewScene.cc

@@ -1074,7 +1074,7 @@ GeometryHandle ViewSceneDialog::buildGeometryScaleBar()
   //text
   std::stringstream ss;
   std::string oneline;
-  ss << scaleBar_.length << " " << scaleBar_.unit;
+  ss << scaleBar_.length * scaleBar_.multiplier << " " << scaleBar_.unit;
   oneline = ss.str();
   double text_len = 0.0;
   if (textBuilder_.isInit() && textBuilder_.isValid())

src/Interface/Modules/Render/ViewSceneControls.ui

@@ -254,8 +254,6 @@
           <zorder></zorder>
           <zorder></zorder>
           <zorder></zorder>
-          <zorder></zorder>
-          <zorder></zorder>
          </widget>
         </item>
         <item row="2" column="0" colspan="3">
@@ -384,10 +382,6 @@
             </widget>
            </item>
           </layout>
-          <zorder>currentBackgroundLabel_</zorder>
-          <zorder>setBackgroundColorPushButton_</zorder>
-          <zorder>currentBackgroundLabel_</zorder>
-          <zorder>setBackgroundColorPushButton_</zorder>
          </widget>
         </item>
         <item row="6" column="0">
@@ -1366,6 +1360,9 @@
               </size>
              </property>
              <property name="inputMask">
+              <string/>
+             </property>
+             <property name="text">
               <string>mm</string>
              </property>
             </widget>

src/Interface/Modules/Render/ViewSceneControlsDock.cc

@@ -110,6 +110,7 @@ ViewSceneControlsDock::ViewSceneControlsDock(const QString& name, ViewSceneDialo
   connect(numTicksSpinBox_, SIGNAL(valueChanged(int)), parent, SLOT(setScaleBarNumTicks(int)));
   connect(scaleBarMultiplierDoubleSpinBox_, SIGNAL(valueChanged(double)), parent, SLOT(setScaleBarMultiplier(double)));
   connect(scaleBarLineWidthDoubleSpinBox_, SIGNAL(valueChanged(double)), parent, SLOT(setScaleBarLineWidth(double)));
+  connect(scaleBarUnitLineEdit_, SIGNAL(textEdited(const QString&)), parent, SLOT(setScaleBarUnitValue(const QString&)));
   //-----------Controls Tab-------------------//
   connect(saveScreenShotOnUpdateCheckBox_, SIGNAL(stateChanged(int)), parent, SLOT(saveNewGeometryChanged(int)));
   connect(mouseControlComboBox_, SIGNAL(currentIndexChanged(int)), parent, SLOT(menuMouseControlChanged(int)));