ENH: apply changes needed for the new label map node

naucoin · Jun 4, 2015 · ce4af75 · ce4af75
1 parent 88338b9
commit ce4af75
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/Logic/vtkSlicerLongitudinalPETCTLogic.cxx b/Logic/vtkSlicerLongitudinalPETCTLogic.cxx
@@ -20,8 +20,6 @@
 
 
 
-// MRML includes
-
 // VTK includes
 #include <vtkNew.h>
 
@@ -43,7 +41,7 @@
 
 // MRML includes
 #include <vtkMRMLVolumeNode.h>
-#include <vtkMRMLScalarVolumeNode.h>
+#include <vtkMRMLLabelMapVolumeNode.h>
 
 #include <vtkMRMLLinearTransformNode.h>
 #include <vtkMRMLColorTableNode.h>
@@ -79,7 +77,7 @@ bool vtkSlicerLongitudinalPETCTLogic::CenterStudyVolumeNodes(vtkMRMLLongitudinal
 
   vtkMRMLScalarVolumeNode* petVolume = study->GetPETVolumeNode();
   vtkMRMLScalarVolumeNode* ctVolume = study->GetCTVolumeNode();
-  vtkMRMLScalarVolumeNode* petLabelVolume = study->GetPETLabelVolumeNode();
+  vtkMRMLLabelMapVolumeNode* petLabelVolume = study->GetPETLabelVolumeNode();
 
   if (petVolume == NULL || ctVolume == NULL || petLabelVolume == NULL || petVolume->GetImageData() == NULL
       || ctVolume->GetImageData() == NULL || petLabelVolume->GetImageData() == NULL)

diff --git a/MRML/vtkMRMLLongitudinalPETCTSegmentationNode.h b/MRML/vtkMRMLLongitudinalPETCTSegmentationNode.h
@@ -38,7 +38,7 @@ Version: $Revision: 1.3 $
 
 #include <vtkSmartPointer.h>
 
-#include <vtkMRMLScalarVolumeNode.h>
+#include <vtkMRMLLabelMapVolumeNode.h>
 #include <vtkMRMLModelHierarchyNode.h>
 #include <vtkIntArray.h>
 
@@ -81,7 +81,7 @@ class VTK_SLICER_LONGITUDINALPETCT_MODULE_MRML_EXPORT vtkMRMLLongitudinalPETCTSe
   void SetAndObserveLabelVolumeNodeID(const std::string& labelVolumeNodeID);
   vtkGetStringMacro(LabelVolumeNodeID);
 
-  vtkGetMacro(LabelVolumeNode,vtkMRMLScalarVolumeNode*);
+  vtkGetMacro(LabelVolumeNode,vtkMRMLLabelMapVolumeNode*);
 
   void SetAndObserveModelHierarchyNodeID(const char* modelHierarchyNodeID);
   void SetAndObserveModelHierarchyNodeID(const std::string& modelHierarchyNodeID);
@@ -133,7 +133,7 @@ class VTK_SLICER_LONGITUDINALPETCT_MODULE_MRML_EXPORT vtkMRMLLongitudinalPETCTSe
   char* LabelVolumeNodeID;
   char* ModelHierarchyNodeID;
 
-  vtkMRMLScalarVolumeNode* LabelVolumeNode;
+  vtkMRMLLabelMapVolumeNode* LabelVolumeNode;
   vtkMRMLModelHierarchyNode* ModelHierarchyNode;
 
   double ROIxyz[3];

diff --git a/MRML/vtkMRMLLongitudinalPETCTStudyNode.cxx b/MRML/vtkMRMLLongitudinalPETCTStudyNode.cxx
@@ -322,11 +322,11 @@ vtkMRMLLongitudinalPETCTStudyNode::SetAndObservePETLabelVolumeNodeID(
             this);
     }
 
-  vtkMRMLScalarVolumeNode* petLblNode = NULL;
+  vtkMRMLLabelMapVolumeNode* petLblNode = NULL;
 
   if (this->GetScene() && petLabelVolumeNodeID)
     {
-      petLblNode = vtkMRMLScalarVolumeNode::SafeDownCast(
+      petLblNode = vtkMRMLLabelMapVolumeNode::SafeDownCast(
           this->GetScene()->GetNodeByID(petLabelVolumeNodeID));
     }
 

diff --git a/MRML/vtkMRMLLongitudinalPETCTStudyNode.h b/MRML/vtkMRMLLongitudinalPETCTStudyNode.h
@@ -42,7 +42,7 @@
 
 #include <vtkMRMLVolumeRenderingDisplayNode.h>
 #include <vtkMRMLLinearTransformNode.h>
-#include <vtkMRMLScalarVolumeNode.h>
+#include <vtkMRMLLabelMapVolumeNode.h>
 #include <vtkMRMLAnnotationROINode.h>
 
 
@@ -90,7 +90,7 @@ class VTK_SLICER_LONGITUDINALPETCT_MODULE_MRML_EXPORT vtkMRMLLongitudinalPETCTSt
   void SetAndObservePETLabelVolumeNodeID(const std::string& petLabelVolumeNodeID);
   vtkGetStringMacro(PETLabelVolumeNodeID);
 
-  vtkGetMacro(PETLabelVolumeNode,vtkMRMLScalarVolumeNode*);
+  vtkGetMacro(PETLabelVolumeNode,vtkMRMLLabelMapVolumeNode*);
 
 
   void SetAndObserveRegistrationTransformNodeID(const char* registrationTransformNodeID);
@@ -147,7 +147,7 @@ class VTK_SLICER_LONGITUDINALPETCT_MODULE_MRML_EXPORT vtkMRMLLongitudinalPETCTSt
 
   vtkMRMLScalarVolumeNode* PETVolumeNode;
   vtkMRMLScalarVolumeNode* CTVolumeNode;
-  vtkMRMLScalarVolumeNode* PETLabelVolumeNode;
+  vtkMRMLLabelMapVolumeNode* PETLabelVolumeNode;
 
   vtkMRMLLinearTransformNode* RegistrationTransformNode;
   vtkMRMLVolumeRenderingDisplayNode* VolumeRenderingDisplayNode;