Merge pull request #198 from che85/fix_api_calls

WIP: fixes wrong api calls caused by Slicer Core changes (issue #197)

DICOMPlugins/DICOMSegmentationPlugin.py

@@ -177,15 +177,14 @@ def load(self,loadable):
           regionModCode, regionModCodingScheme, regionModCodeMeaning = \
             self.getValuesFromCodeSequence(segment, "AnatomicRegionModifierSequence")
 
-          dummyTerminologyWidget = slicer.qSlicerTerminologyNavigatorWidget() # Still cannot call static methods from python
-          segmentTerminologyTag = dummyTerminologyWidget.serializeTerminologyEntry(
-                                          loadable.name,
-                                          categoryCode, categoryCodingScheme, categoryCodeMeaning,
-                                          typeCode, typeCodingScheme, typeCodeMeaning,
-                                          typeModCode, typeModCodingScheme, typeModCodeMeaning,
-                                          loadable.name,
-                                          regionCode, regionCodingScheme, regionCodeMeaning,
-                                          regionModCode, regionModCodingScheme, regionModCodeMeaning)
+          segmentTerminologyTag = terminologiesLogic.SerializeTerminologyEntry(
+                                    loadable.name,
+                                    categoryCode, categoryCodingScheme, categoryCodeMeaning,
+                                    typeCode, typeCodingScheme, typeCodeMeaning,
+                                    typeModCode, typeModCodingScheme, typeModCodeMeaning,
+                                    loadable.name,
+                                    regionCode, regionCodingScheme, regionCodeMeaning,
+                                    regionModCode, regionModCodingScheme, regionModCodeMeaning)
           # end of processing a line of terminology
 
           # TODO: Create logic class that both CLI and this plugin uses so that we don't need to have temporary NRRD
@@ -334,6 +333,15 @@ class EmptySegmentsFoundError(ValueError):
   class NoNonEmptySegmentsFoundError(ValueError):
       pass
 
+  @staticmethod
+  def getDeserializedTerminologyEntry(vtkSegment):
+    terminologyEntry = slicer.vtkSlicerTerminologyEntry()
+    tag = vtk.mutable("")
+    vtkSegment.GetTag(vtkSegment.GetTerminologyEntryTagName(), tag)
+    terminologyLogic = slicer.modules.terminologies.logic()
+    terminologyLogic.DeserializeTerminologyEntry(tag, terminologyEntry)
+    return terminologyEntry
+
   @staticmethod
   def saveJSON(data, destination):
     with open(os.path.join(destination), 'w') as outfile:
@@ -563,14 +571,6 @@ def checkTerminologyOfSegments(self, segmentIDs):
       if any(v is None for v in [category, propType]):
         raise ValueError("Segment {} has missing attributes. Make sure to set terminology.".format(segment.GetName()))
 
-  def getDeserializedTerminologyEntry(self, vtkSegment):
-    terminologyWidget = slicer.qSlicerTerminologyNavigatorWidget()
-    terminologyEntry = slicer.vtkSlicerTerminologyEntry()
-    tag = vtk.mutable("")
-    vtkSegment.GetTag(vtkSegment.GetTerminologyEntryTagName(), tag)
-    terminologyWidget.deserializeTerminologyEntry(tag, terminologyEntry)
-    return terminologyEntry
-
   def createJSONFromTerminologyContext(self, terminologyEntry):
     segmentData = dict()
 

QuantitativeReporting.py

@@ -760,6 +760,7 @@ def setup(self):
     super(QuantitativeReportingSegmentEditorWidget, self).setup()
     if self.developerMode:
       self.reloadCollapsibleButton.hide()
+    self.editor.switchToSegmentationsButtonVisible = False
     self.editor.segmentationNodeSelectorVisible = False
     self.editor.setEffectButtonStyle(qt.Qt.ToolButtonIconOnly)
     self.clearSegmentationEditorSelectors()
@@ -973,7 +974,7 @@ def generateJSON4DcmSR(self, dcmSegmentationFile, sourceVolumeNode):
       data["segmentationSOPInstanceUID"] = segmentationSOPInstanceUID
       segment = self.segmentationNode.GetSegmentation().GetSegment(segmentID)
 
-      terminologyEntry = self.getDeserializedTerminologyEntry(segment)
+      terminologyEntry = DICOMSegmentationExporter.getDeserializedTerminologyEntry(segment)
 
       data["Finding"] = self.createJSONFromTerminologyContext(terminologyEntry)["SegmentedPropertyTypeCodeSequence"]
       anatomicContext = self.createJSONFromAnatomicContext(terminologyEntry)
@@ -1005,14 +1006,6 @@ def _createCodeSequence(self, vtkStringifiedCodedEntry):
       codeSequence[key] = value
     return codeSequence
 
-  def getDeserializedTerminologyEntry(self, segment):
-    terminologyWidget = slicer.qSlicerTerminologyNavigatorWidget()
-    terminologyEntry = slicer.vtkSlicerTerminologyEntry()
-    tag = vtk.mutable("")
-    segment.GetTag(segment.GetTerminologyEntryTagName(), tag)
-    terminologyWidget.deserializeTerminologyEntry(tag, terminologyEntry)
-    return terminologyEntry
-
 
 class CustomDICOMDetailsWidget(DICOMDetailsWidget, ParameterNodeObservationMixin):