Merge branch 'master' into issues_SV

Author: dcwhite

README.md

@@ -55,8 +55,9 @@ For documentation, please see: http://sciinstitute.github.io/SCIRun/
 #### CMake Build Generators
 * Windows
   - Visual Studio 2013
-* OS X (tested on 10.7 and 10.8)
-  - Unix Makefiles (Xcode not currently supported)
+* OS X (tested on 10.7 and 10.8 and 10.10)
+  - Unix Makefiles 
+  - Xcode 
 * Linux (tested on Ubuntu 12.10)
   - Unix Makefiles
 

src/Interface/Modules/Fields/EditMeshBoundingBox.ui

@@ -334,7 +334,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="enabled">
-      <bool>false</bool>
+      <bool>true</bool>
      </property>
      <property name="font">
       <font>
@@ -357,6 +357,9 @@
         </item>
         <item>
          <widget class="QToolButton" name="doubleUpScaleToolButton_">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
           <property name="text">
            <string>++</string>
           </property>
@@ -458,4 +461,10 @@
  </widget>
  <resources/>
  <connections/>
+ <slots>
+  <slot>ScaleUpPush()</slot>
+  <slot>ScaleDoubleUpPush()</slot>
+  <slot>ScaleDownPush()</slot>
+  <slot>ScaleDoubleDownPush()</slot>
+ </slots>
 </ui>

src/Interface/Modules/Fields/EditMeshBoundingBoxDialog.cc

@@ -34,9 +34,10 @@ using namespace SCIRun::Dataflow::Networks;
 
 EditMeshBoundingBoxDialog::EditMeshBoundingBoxDialog(const std::string& name, ModuleStateHandle state,
   QWidget* parent /* = 0 */)
-  : ModuleDialogGeneric(state, parent)
+: ModuleDialogGeneric(state, parent), scale_(1.0)
 {
   setupUi(this);
+  //custom value for cylinder size
   setWindowTitle(QString::fromStdString(name));
   fixSize();
 
@@ -58,8 +59,30 @@ EditMeshBoundingBoxDialog::EditMeshBoundingBoxDialog(const std::string& name, Mo
   addDynamicLabelManager(inputSizeXLabel_, EditMeshBoundingBoxModule::InputSizeX);
   addDynamicLabelManager(inputSizeYLabel_, EditMeshBoundingBoxModule::InputSizeY);
   addDynamicLabelManager(inputSizeZLabel_, EditMeshBoundingBoxModule::InputSizeZ);
+    
+    addDoubleSpinBoxManager(&spinner_scale_, EditMeshBoundingBoxModule::Scale);
+    connectButtonToExecuteSignal(downScaleToolButton_);
+    connectButtonToExecuteSignal(upScaleToolButton_);
+    connectButtonToExecuteSignal(doubleDownScaleToolButton_);
+    connectButtonToExecuteSignal(doubleUpScaleToolButton_);
+    
+
+    
+    
+    connect(upScaleToolButton_, SIGNAL(clicked()), this, SLOT(ScaleUpPush()));
+    connect(doubleUpScaleToolButton_, SIGNAL(clicked()), this, SLOT(ScaleDoubleUpPush()));
+    connect(downScaleToolButton_, SIGNAL(clicked()), this, SLOT(ScaleDownPush()));
+    connect(doubleDownScaleToolButton_, SIGNAL(clicked()), this, SLOT(ScaleDoubleDownPush()));
+
+    
+    
 }
 
+void EditMeshBoundingBoxDialog::ScaleUpPush() { scale_*=1.25; spinner_scale_.setValue(scale_); }
+void EditMeshBoundingBoxDialog::ScaleDoubleUpPush() { scale_*=1.5625; spinner_scale_.setValue(scale_); }
+void EditMeshBoundingBoxDialog::ScaleDownPush() { scale_*=0.8; spinner_scale_.setValue(scale_); }
+void EditMeshBoundingBoxDialog::ScaleDoubleDownPush() { scale_*=0.64; spinner_scale_.setValue(scale_); }
+
 void EditMeshBoundingBoxDialog::pull()
 {
   pull_newVersionToReplaceOld();

src/Interface/Modules/Fields/EditMeshBoundingBoxDialog.h

@@ -46,6 +46,14 @@ class SCISHARE EditMeshBoundingBoxDialog : public ModuleDialogGeneric,
     SCIRun::Dataflow::Networks::ModuleStateHandle state,
     QWidget* parent = 0);
   virtual void pull();
+    
+    QDoubleSpinBox spinner_scale_;
+    double scale_;
+private Q_SLOTS:
+     void ScaleUpPush();
+     void ScaleDoubleUpPush();
+     void ScaleDownPush();
+     void ScaleDoubleDownPush();
 };
 
 }

src/Interface/Modules/Render/ES/systems/RenderTransBasicSys.cc

@@ -307,7 +307,8 @@ class RenderBasicSysTrans :
     bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
     bool cullFace = glIsEnabled(GL_CULL_FACE);
     bool blend = glIsEnabled(GL_BLEND);
-
+      
+    GL(glEnable(GL_DEPTH_TEST));
     GL(glDepthMask(GL_FALSE));
     GL(glDisable(GL_CULL_FACE));
     GL(glEnable(GL_BLEND));

src/Interface/Modules/Render/ES/systems/RenderTransColorMapSys.cc

@@ -129,24 +129,29 @@ class RenderColorMapSysTrans :
       return;
     }
 
-    camera.front().data.projection;
-
     char* vbo_buffer = reinterpret_cast<char*>(pass.front().vbo.data->getBuffer());
+    uint32_t* ibo_buffer = reinterpret_cast<uint32_t*>(pass.front().ibo.data->getBuffer());
     size_t num_triangles = pass.front().ibo.data->getBufferSize() / (sizeof(uint32_t) * 3);
-    size_t stride_vbo = pass.front().vbo.data->getBufferSize() / (num_triangles * 3);
+    
+    size_t stride_vbo = 0;
+    for (auto a : pass.front().vbo.attributes)
+        stride_vbo += a.sizeInBytes;
 
     std::vector<DepthIndex> rel_depth(num_triangles);
-    Core::Geometry::Vector dir(camera.front().data.worldToView[0][2], camera.front().data.worldToView[1][2], camera.front().data.worldToView[2][2]);
+    Core::Geometry::Vector dir(
+    camera.front().data.worldToView[0][2],
+    camera.front().data.worldToView[1][2],
+    camera.front().data.worldToView[2][2]);
 
     for (size_t j = 0; j < num_triangles; j++)
     {
-      float* vertex1 = reinterpret_cast<float*>(vbo_buffer + stride_vbo * (j * 3));
+      float* vertex1 = reinterpret_cast<float*>(vbo_buffer + stride_vbo * (ibo_buffer[j*3]));
       Core::Geometry::Point node1(vertex1[0], vertex1[1], vertex1[2]);
 
-      float* vertex2 = reinterpret_cast<float*>(vbo_buffer + stride_vbo * (j * 3 + 1));
+      float* vertex2 = reinterpret_cast<float*>(vbo_buffer + stride_vbo * (ibo_buffer[j*3+1]));
       Core::Geometry::Point node2(vertex2[0], vertex2[1], vertex2[2]);
 
-      float* vertex3 = reinterpret_cast<float*>(vbo_buffer + stride_vbo * (j * 3 + 2));
+      float* vertex3 = reinterpret_cast<float*>(vbo_buffer + stride_vbo * (ibo_buffer[j*3+2]));
       Core::Geometry::Point node3(vertex3[0], vertex3[1], vertex3[2]);
 
       rel_depth[j].mDepth = Core::Geometry::Dot(dir, node1) + Core::Geometry::Dot(dir, node2) + Core::Geometry::Dot(dir, node3);
@@ -305,7 +310,8 @@ class RenderColorMapSysTrans :
     bool depthMask = glIsEnabled(GL_DEPTH_WRITEMASK);
     bool cullFace = glIsEnabled(GL_CULL_FACE);
     bool blend = glIsEnabled(GL_BLEND);
-
+      
+    GL(glEnable(GL_DEPTH_TEST));
     GL(glDepthMask(GL_FALSE));
     GL(glDisable(GL_CULL_FACE));
     GL(glEnable(GL_BLEND));

src/Modules/Fields/CMakeLists.txt

@@ -53,6 +53,8 @@ TARGET_LINK_LIBRARIES(Modules_Fields
   Core_Datatypes_Mesh
   Algorithms_Field
   Core_Datatypes_Legacy_Field
+  ${OPENGL_LIBRARIES}
+  ${CPM_LIBRARIES}
 )
 
 IF(BUILD_SHARED_LIBS)