added default cylinder values. pr requests by @dwhite

Author: Brig Bagley

src/Interface/Modules/Visualization/CreateBasicColorMapDialog.cc

@@ -32,6 +32,7 @@
 using namespace SCIRun::Gui;
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun::Core::Datatypes;
 
 CreateBasicColorMapDialog::CreateBasicColorMapDialog(const std::string& name, ModuleStateHandle state,
   QWidget* parent /* = 0 */)

src/Interface/Modules/Visualization/CreateBasicColorMapDialog.h

@@ -31,9 +31,8 @@
 
 #include "Interface/Modules/Visualization/ui_CreateBasicColorMap.h"
 #include <Interface/Modules/Base/ModuleDialogGeneric.h>
-#include <Interface/Modules/Visualization/share.h>
 #include <Core/Datatypes/ColorMap.h>
-using namespace SCIRun::Core::Datatypes;
+#include <Interface/Modules/Visualization/share.h>
 
 namespace SCIRun {
 namespace Gui {
@@ -50,7 +49,7 @@ class SCISHARE CreateBasicColorMapDialog : public ModuleDialogGeneric,
   virtual void pull();
  private Q_SLOTS:
   void updateColorMapPreview(QString s);
-  const QString buildGradientString(ColorMap cm);
+  const QString buildGradientString(SCIRun::Core::Datatypes::ColorMap cm);
   void setShiftSlider(QString s);
   void setResolutionSlider(QString s);
   void setShiftText(int i);

src/Interface/Modules/Visualization/ShowFieldDialog.cc

@@ -73,6 +73,10 @@ 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);
 
   connect(defaultMeshColorButton_, SIGNAL(clicked()), this, SLOT(assignDefaultMeshColor()));
 

src/Modules/Visualization/ShowField.cc

@@ -81,8 +81,8 @@ void ShowFieldModule::setStateDefaults()
   state->setValue(FaceTransparencyValue, 0.65f);
   state->setValue(EdgeTransparencyValue, 0.65f);
   state->setValue(SphereScaleValue, 1.0);
-  state->setValue(CylinderRadius, 0.05);
-  state->setValue(CylinderResolution, 8);
+  state->setValue(CylinderRadius, 1.0);
+  state->setValue(CylinderResolution, 5);
   faceTransparencyValue_ = 0.65f;
   edgeTransparencyValue_ = 0.65f;
   sphereScalar_ = 1.0;
@@ -200,11 +200,6 @@ GeometryHandle ShowFieldModule::buildGeometryObject(
   bool showNodes = state->getValue(ShowFieldModule::ShowNodes).toBool();
   bool showEdges = state->getValue(ShowFieldModule::ShowEdges).toBool();
   bool showFaces = state->getValue(ShowFieldModule::ShowFaces).toBool();
-  const ColorRGB meshColor(state->getValue(ShowFieldModule::DefaultMeshColor).toString());
-  float meshRed = static_cast<float>(meshColor.r() / 255.0f);
-  float meshGreen = static_cast<float>(meshColor.g() / 255.0f);
-  float meshBlue = static_cast<float>(meshColor.b() / 255.0f);
-
   // Resultant geometry type (representing a spire object and a number of passes).
   GeometryHandle geom(new GeometryObject(field));
   geom->objectName = id;
@@ -1471,11 +1466,9 @@ void ShowFieldModule::renderEdges(
   }
   GeometryObject::SpireIBO::PRIMITIVE primIn = GeometryObject::SpireIBO::LINES;
   // Use cylinders...
-  if (state.get(RenderState::USE_CYLINDER)) {
-    renderType = GeometryObject::RENDER_VBO_IBO;
+  if (state.get(RenderState::USE_CYLINDER))
     primIn = GeometryObject::SpireIBO::TRIANGLES;
     vboOnGPU = true;
-  }
   auto my_state = this->get_state();
   double num_strips = double(my_state->getValue(CylinderResolution).toInt());
   double radius = my_state->getValue(CylinderRadius).toDouble();