Improve default color support

Author: dcwhite

src/ExampleNets/regression/basicViz.srn5

@@ -138,7 +138,7 @@
 									<name>DefaultMeshColor</name>
 									<value>
 										<which>2</which>
-										<value>Color(160,160,164)</value>
+										<value>Color(0.831373,0.15552,0.123156)</value>
 									</value>
 								</second>
 							</item>
@@ -186,7 +186,7 @@
 									<name>FaceTransparency</name>
 									<value>
 										<which>3</which>
-										<value>0</value>
+										<value>1</value>
 									</value>
 								</second>
 							</item>

src/Interface/Modules/Visualization/ShowFieldDialog.cc

@@ -73,7 +73,7 @@ ShowFieldDialog::ShowFieldDialog(const std::string& name, ModuleStateHandle stat
   connectButtonToExecuteSignal(edgesAsCylindersButton_);
   connectButtonToExecuteSignal(nodesAsPointsButton_);
   connectButtonToExecuteSignal(nodesAsSpheresButton_);
-  
+
   //default values
   cylinder_rad_spin->setValue(1.0);
   cylinder_res_spin->setValue(5);
@@ -122,10 +122,12 @@ void ShowFieldDialog::pull()
   pull_newVersionToReplaceOld();
   Pulling p(this);
   ColorRGB color(state_->getValue(ShowFieldModule::DefaultMeshColor).toString());
+  //std::cout << "pull color: " << color.r() << " " << color.g() << " " << color.b() << std::endl;
+  // check for old saved color format: integers 0-255.
   defaultMeshColor_ = QColor(
-    static_cast<int>(color.r() * 255.0),
-    static_cast<int>(color.g() * 255.0),
-    static_cast<int>(color.b() * 255.0));
+    static_cast<int>(color.r() > 1 ? color.r() : color.r() * 255.0),
+    static_cast<int>(color.g() > 1 ? color.g() : color.g() * 255.0),
+    static_cast<int>(color.b() > 1 ? color.b() : color.b() * 255.0));
 }
 
 void ShowFieldDialog::assignDefaultMeshColor()
@@ -142,5 +144,7 @@ void ShowFieldDialog::assignDefaultMeshColor()
 
 void ShowFieldDialog::pushColor()
 {
-  state_->setValue(ShowFieldModule::DefaultMeshColor, ColorRGB(defaultMeshColor_.red() / 255.0, defaultMeshColor_.green() / 255.0, defaultMeshColor_.blue() / 255.0).toString());
+  //std::cout << "push color: " << defaultMeshColor_.redF() << " " << defaultMeshColor_.greenF() << " " << defaultMeshColor_.blueF() << std::endl;
+  state_->setValue(ShowFieldModule::DefaultMeshColor, ColorRGB(defaultMeshColor_.redF(), defaultMeshColor_.greenF(), defaultMeshColor_.blueF()).toString());
+  Q_EMIT executeActionTriggered();
 }