Fix: Incomplete Fixes for CGALi2vLungs example

CognitionGuidedSurgery · May 22, 2014 · 479d7f3 · 479d7f3
1 parent 50fa2b5
commit 479d7f3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/examples/CGALi2vLungs/Lungs_new.xml b/examples/CGALi2vLungs/Lungs_new.xml
@@ -18,21 +18,22 @@
             <material>
                 <region id="patMaterial01" indices="${bodyToIndexGroup}">
                     <linearElasticMaterial youngModulus="100" poissonRatio="0.4"/>
-                    <mass density="0.001"/>
+                    <mass massDensity="0.001"/>
                 </region>
                 <region id="patMaterial02" indices="${bonesToIndexGroup}">
                     <linearElasticMaterial youngModulus="19000" poissonRatio="0.4"/>
-                    <mass density="0.001"/>
+                    <mass massDensity="0.001"/>
                 </region>
                 <region id="patMaterial03" indices="${lung1ToIndexGroup}">
                     <linearElasticMaterial youngModulus="100" poissonRatio="0.4"/>
-                    <mass density="0.001"/>
+                    <mass massDensity="0.001"/>
                 </region>
                 <region id="patMaterial04" indices="${lung2ToIndexGroup}">
                     <linearElasticMaterial youngModulus="100" poissonRatio="0.4"/>
-                    <mass density="0.001"/>
+                    <mass massDensity="0.001"/>
                 </region>
             </material>
+
 
             <constraints>
                 <constraint forStep="${initial}" name="1">
@@ -86,7 +87,7 @@
 
         <paraview id="a" data="${disp}"/>
         <!-- nonsense -->
-        <generateDVF id="dvf1" RefMesh="${disp}" DeformedMesh="${combo_mesh}" multipleReferenceGrids="false"
+        <generateDVF id="dvf1" RefMesh="${disp}" DeformedMesh="${surfaceExtraction}" multipleReferenceGrids="false"
                      DVFFilename="dvf01.vtk"/>
     </workflow>
 

diff --git a/operators/CMakeLists.txt b/operators/CMakeLists.txt
@@ -36,7 +36,7 @@ INCLUDE(${VTK_USE_FILE})
 # SWIG
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
-SET(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/bin)
+SET(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/bin/release)
 
 
 
@@ -152,7 +152,7 @@ MACRO(MSML_LIBRARY)
     )
 
   IF(WIN32 AND NOT CYGWIN)
-    ADD_LIBRARY(${ML_NAME} SHARED ${ML_SOURCES})
+    ADD_LIBRARY(${ML_NAME} STATIC ${ML_SOURCES})
   ELSE()
     ADD_LIBRARY(${ML_NAME} SHARED ${ML_SOURCES})
   ENDIF()

diff --git a/operators/MiscMeshOperators/PostProcessingOperators.cpp b/operators/MiscMeshOperators/PostProcessingOperators.cpp
@@ -732,7 +732,7 @@ void ApplyDVF(vtkImageData* inputImage, vtkImageData* outputDefImage, vtkImageDa
     }
 }
 
-std::string GenerateDVFPython(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename, bool multipleReferenceGrids)
+std::string GenerateDVF(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename, bool multipleReferenceGrids)
 {
     if (multipleReferenceGrids)
     {

diff --git a/operators/MiscMeshOperators/PostProcessingOperators.h b/operators/MiscMeshOperators/PostProcessingOperators.h
@@ -167,7 +167,7 @@ Post Processing
 
 
 
-.. cpp:function:: std::string GenerateDVFPython(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename, bool multipleReferenceGrids)
+.. cpp:function:: std::string GenerateDVF(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename, bool multipleReferenceGrids)
 
     :param  const char* referenceGridFilename:
     :param  const char* outputDVFFilename:
@@ -278,7 +278,7 @@ LIBRARY_API void ColorMeshFromComparison(vtkUnstructuredGrid* inputMesh, vtkUnst
 LIBRARY_API void MergeMeshes(vtkUnstructuredGrid* pointsMesh, vtkUnstructuredGrid* cellsMesh, vtkUnstructuredGrid* outputMesh);
 LIBRARY_API void MergeMeshes(const char* pointsMeshFilename, const char* cellsMeshFilename, const char* outputMeshFilename);
 
-LIBRARY_API std::string GenerateDVFPython(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename, bool multipleReferenceGrids);
+LIBRARY_API std::string GenerateDVF(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename, bool multipleReferenceGrids);
 LIBRARY_API void GenerateDVF(const char* referenceGridFilename, const char* outputDVFFilename, const char* deformedGridFilename);
 LIBRARY_API void GenerateDVF(vtkUnstructuredGrid* referenceGrid, vtkImageData* outputDVF, vtkUnstructuredGrid* deformedGrid);