Browse Source

Housekeeping of tools and browser - specifying unique names, etc.

Andrej Studen 5 years ago
parent
commit
4150f9e368

+ 1 - 1
DICOMtools/exportDicom.py

@@ -13,7 +13,7 @@ class exportDicom(slicer.ScriptedLoadableModule.ScriptedLoadableModule):
         slicer.ScriptedLoadableModule.ScriptedLoadableModule.__init__(self, parent)
         self.className="exportDicom"
         self.parent.title="exportDicom"
-        self.parent.categories = ["LabKeyDICOM"]
+        self.parent.categories = ["LabKey"]
         self.parent.dependencies = []
         self.parent.contributors = ["Andrej Studen (University of Ljubljana)"] # replace with "Firstname Lastname (Organization)"
         self.parent.helpText = """

BIN
DICOMtools/exportDicom.pyc


+ 1 - 1
DICOMtools/importDicom.py

@@ -13,7 +13,7 @@ class importDicom(slicer.ScriptedLoadableModule.ScriptedLoadableModule):
         slicer.ScriptedLoadableModule.ScriptedLoadableModule.__init__(self, parent)
         self.className="importDICOM"
         self.parent.title="importDICOM"
-        self.parent.categories = ["LabKeyDICOM"]
+        self.parent.categories = ["LabKey"]
         self.parent.dependencies = []
         self.parent.contributors = ["Andrej Studen (UL/FMF)"] # replace with "Firstname Lastname (Organization)"
         self.parent.helpText = """

BIN
DICOMtools/importDicom.pyc


+ 1 - 1
DICOMtools/loadDicom.py

@@ -16,7 +16,7 @@ class loadDicom(slicer.ScriptedLoadableModule.ScriptedLoadableModule):
         slicer.ScriptedLoadableModule.ScriptedLoadableModule.__init__(self, parent)
         self.className="loadDicom"
         self.parent.title="loadDicom"
-        self.parent.categories = ["LabKeyDICOM"]
+        self.parent.categories = ["LabKey"]
         self.parent.dependencies = []
         self.parent.contributors = ["Andrej Studen (UL/FMF)"] # replace with "Firstname Lastname (Organization)"
         self.parent.helpText = """

BIN
DICOMtools/loadDicom.pyc


+ 2 - 2
DICOMtools/vtkInterface.py

@@ -8,8 +8,8 @@ import SimpleITK as sitk
 
 class vtkInterface:
   def __init__(self, parent):
-    parent.title = "vtk Interface"
-    parent.categories = ["LabKeyDICOM"]
+    #parent.title = "vtk Interface"
+    #parent.categories = ["LabKey"]
     parent.dependencies = []
     parent.contributors = ["Andrej Studen (FMF/JSI)"] # replace with "Firstname Lastname (Org)"
     parent.helpText = """

BIN
DICOMtools/vtkInterface.pyc


+ 0 - 7
README.md

@@ -51,11 +51,4 @@ generate your own unique UUID.
 
 ![exportDICOM](DICOMtools/Resources/Screenshots/exportDICOM.png)
 
-
-The extension consists of four classes, mostly API with minimal GUI:
-- importDicom, a set of tools roughly based on DICOMLib. 
-- loadDicom, similar to above, but resorting to DCMTK tools wrapped by Slicer
-- exportDicom, utility to generate DICOM files with configurable content
-- vtkInterface, a numpy to vtk converter
-- 
 [FreeDICOM]: "https://www.medicalconnections.co.uk/FreeUID/"

+ 0 - 0
labkeyBrowser/Resources/Icons/labkeySlicerPythonExtension.png → labkeyBrowser/Resources/Icons/labkeyBrowser.png


+ 8 - 8
labkeyBrowser/labkeyBrowser.py

@@ -10,19 +10,19 @@ import json
 # labkeySlicerPythonExtension
 #
 
-class labkeySlicerPythonExtension(ScriptedLoadableModule):
+class labkeyBrowser(ScriptedLoadableModule):
   """Uses ScriptedLoadableModule base class, available at:
   https://github.com/Slicer/Slicer/blob/master/Base/Python/slicer/ScriptedLoadableModule.py
   """
 
   def __init__(self, parent):
     ScriptedLoadableModule.__init__(self, parent)
-    self.parent.title = "labkeySlicerPythonExtension" # TODO make this more human readable by adding spaces
+    self.parent.title = "labkeyBrowser" # TODO make this more human readable by adding spaces
     self.parent.categories = ["LabKey"]
     self.parent.dependencies = []
     self.parent.contributors = ["Andrej Studen (UL/FMF)"] # replace with "Firstname Lastname (Organization)"
     self.parent.helpText = """
-    Labkey interface to slicer
+    Interface to files in LabKey
     """
     self.parent.acknowledgementText = """
     Developed within the medical physics research programme of the Slovenian research agency.
@@ -32,7 +32,7 @@ class labkeySlicerPythonExtension(ScriptedLoadableModule):
 # labkeySlicerPythonExtensionWidget
 #
 
-class labkeySlicerPythonExtensionWidget(ScriptedLoadableModuleWidget):
+class labkeyBrowserWidget(ScriptedLoadableModuleWidget):
   """Uses ScriptedLoadableModuleWidget base class, available at:
   https://github.com/Slicer/Slicer/blob/master/Base/Python/slicer/ScriptedLoadableModule.py
   """
@@ -40,7 +40,7 @@ class labkeySlicerPythonExtensionWidget(ScriptedLoadableModuleWidget):
   def setup(self):
     ScriptedLoadableModuleWidget.setup(self)
     # Instantiate and connect widgets ...
-    self.logic=labkeySlicerPythonExtensionLogic(self)
+    self.logic=labkeyBrowserLogic(self)
     self.network=slicerNetwork.labkeyURIHandler()
     #
     # Parameters Area
@@ -326,7 +326,7 @@ class labkeySlicerPythonExtensionWidget(ScriptedLoadableModuleWidget):
 # labkeySlicerPythonExtensionLogic
 #
 
-class labkeySlicerPythonExtensionLogic(ScriptedLoadableModuleLogic):
+class labkeyBrowserLogic(ScriptedLoadableModuleLogic):
   """This class should implement all the actual
   computation done by your module.  The interface
   should be such that other python code can import
@@ -407,7 +407,7 @@ class labkeySlicerPythonExtensionLogic(ScriptedLoadableModuleLogic):
     return True
 
 
-class labkeySlicerPythonExtensionTest(ScriptedLoadableModuleTest):
+class labkeyBrowserTest(ScriptedLoadableModuleTest):
   """
   This is the test case for your scripted module.
   Uses ScriptedLoadableModuleTest base class, available at:
@@ -425,7 +425,7 @@ class labkeySlicerPythonExtensionTest(ScriptedLoadableModuleTest):
     self.setUp()
     self.test_labkeySlicerPythonExtension1()
 
-  def test_labkeySlicerPythonExtension1(self):
+  def test_labkeyBrowser(self):
     """ Ideally you should have several levels of tests.  At the lowest level
     tests sould exercise the functionality of the logic with different inputs
     (both valid and invalid).  At higher levels your tests should emulate the