BUG: fix the self-tests, revert back to std::string - now works?..

kalpathy · Jan 9, 2014 · 360c848 · 360c848
1 parent f43adb1
commit 360c848
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/Logic/vtkSlicerReportingModuleLogic.cxx b/Logic/vtkSlicerReportingModuleLogic.cxx
@@ -60,6 +60,7 @@
 #include <time.h>
 #include <fstream>
 #include <algorithm>
+//#include <string>
 
 // DCMTK includes
 #include <dcmtk/dcmdata/dcmetinf.h>

diff --git a/Logic/vtkSlicerReportingModuleLogic.h b/Logic/vtkSlicerReportingModuleLogic.h
@@ -32,6 +32,7 @@
 
 // STD includes
 #include <cstdlib>
+//#include <string>
 
 #include "vtkSlicerReportingModuleLogicExport.h"
 
@@ -143,8 +144,8 @@ class VTK_SLICER_REPORTING_MODULE_LOGIC_EXPORT vtkSlicerReportingModuleLogic :
   bool DicomSegRead(vtkCollection*, const std::string fname, vtkMRMLColorNode* colorNode = NULL);
 
   /// set/get the error string
-  vtkGetMacro(ErrorMessage, vtkStdString);
-  vtkSetMacro(ErrorMessage, vtkStdString);
+  vtkGetMacro(ErrorMessage, std::string);
+  vtkSetMacro(ErrorMessage, std::string);
 
   std::string GetFileNameFromUID(std::string uid);
 
@@ -222,7 +223,7 @@ class VTK_SLICER_REPORTING_MODULE_LOGIC_EXPORT vtkSlicerReportingModuleLogic :
   std::map<std::string, ColorCategorizationMapType> colorCategorizationMaps;
 
   /// save an error string to pass to the gui, reset when test passes
-  vtkStdString ErrorMessage;
+  std::string ErrorMessage;
 };
 
 #endif
diff --git a/Testing/Python/ReportingSelfTest.py b/Testing/Python/ReportingSelfTest.py
@@ -306,15 +306,19 @@ def test_ReportingAIMRoundTrip(self):
       self.delayDisplay('Importing DICOM')
       mainWindow = slicer.util.mainWindow()
       mainWindow.moduleSelector().selectModule('DICOM')
-      dicomWidget.dicomApp.suspendModel()
+      #dicomWidget.dicomApp.suspendModel()
       indexer = ctk.ctkDICOMIndexer()
       indexer.addDirectory(slicer.dicomDatabase, dicomFilesDirectory, None)
       indexer.waitForImportFinished()
-      dicomWidget.dicomApp.resumeModel()
-      dicomWidget.detailsPopup.open()
-      # click on the first row of the tree
-      index = dicomWidget.tree.indexAt(qt.QPoint(0,0))
-      dicomWidget.onTreeClicked(index)
+
+      patient = slicer.dicomDatabase.patients()[0]
+      studies = slicer.dicomDatabase.studiesForPatient(patient)
+      series = [slicer.dicomDatabase.seriesForStudy(study) for study in studies]
+      seriesUIDs = [uid for uidList in series for uid in uidList]
+      dicomWidget.detailsPopup.offerLoadables(seriesUIDs, 'SeriesUIDList')
+      dicomWidget.detailsPopup.examineForLoading()
+
+      loadablesByPlugin = dicomWidget.detailsPopup.loadablesByPlugin
 
       self.delayDisplay('Loading Selection')
       dicomWidget.detailsPopup.loadCheckedLoadables()

diff --git a/Util/LabelToDICOMSEGConverter/Testing/Python/LabelToDICOMSEGConverterSelfTest.py b/Util/LabelToDICOMSEGConverter/Testing/Python/LabelToDICOMSEGConverterSelfTest.py
@@ -302,11 +302,15 @@ def test_LabelToDICOMSEGConverterRoundTrip(self):
 
       self.importDICOM(slicer.dicomDatabase, dicomFilesDirectory)
 
-      dicomWidget.detailsPopup.open()
-      # click on the first row of the tree
-      index = dicomWidget.tree.indexAt(qt.QPoint(0,0))
-      dicomWidget.onTreeClicked(index)
-
+      patient = slicer.dicomDatabase.patients()[0]
+      studies = slicer.dicomDatabase.studiesForPatient(patient)
+      series = [slicer.dicomDatabase.seriesForStudy(study) for study in studies]
+      seriesUIDs = [uid for uidList in series for uid in uidList]
+      dicomWidget.detailsPopup.offerLoadables(seriesUIDs, 'SeriesUIDList')
+      dicomWidget.detailsPopup.examineForLoading()
+
+      loadablesByPlugin = dicomWidget.detailsPopup.loadablesByPlugin
+
       self.delayDisplay('Loading Selection')
       dicomWidget.detailsPopup.loadCheckedLoadables()
 
@@ -358,10 +362,14 @@ def test_LabelToDICOMSEGConverterRoundTrip(self):
 
       slicer.mrmlScene.Clear(0)
 
-      # try to load back the segmentation from DICOM module
-      dicomWidget.detailsPopup.open()
-      index = dicomWidget.tree.indexAt(qt.QPoint(0,0))
-      dicomWidget.onTreeClicked(index)
+      patient = slicer.dicomDatabase.patients()[0]
+      studies = slicer.dicomDatabase.studiesForPatient(patient)
+      series = [slicer.dicomDatabase.seriesForStudy(study) for study in studies]
+      seriesUIDs = [uid for uidList in series for uid in uidList]
+      dicomWidget.detailsPopup.offerLoadables(seriesUIDs, 'SeriesUIDList')
+      dicomWidget.detailsPopup.examineForLoading()
+
+      loadablesByPlugin = dicomWidget.detailsPopup.loadablesByPlugin
 
       self.delayDisplay('Wait',10000)
 
@@ -408,8 +416,6 @@ def cleanupDir(self, d):
 
   def importDICOM(self, dicomDatabase, dicomFilesDirectory):
     dicomWidget = slicer.modules.dicom.widgetRepresentation().self()
-    dicomWidget.dicomApp.suspendModel()
     indexer = ctk.ctkDICOMIndexer()
     indexer.addDirectory(dicomDatabase, dicomFilesDirectory, None)
     indexer.waitForImportFinished()
-    dicomWidget.dicomApp.resumeModel()