UI changes, added 2D image option (disable promptpoints sync)

Author: bingogome

samm-python-terminal/sam_server.py

@@ -1,3 +1,23 @@
+"""
+MIT License
+Copyright (c) 2023 Yihao Liu
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+"""
+
 from segment_anything import sam_model_registry, SamPredictor
 from PIL import Image
 import numpy as np

samm/SammBase/Resources/UI/SammBase.ui

@@ -101,21 +101,21 @@
           </size>
          </property>
          <property name="text">
-          <string>Work Space Config:</string>
+          <string>Work Space Config</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0" colspan="3">
         <widget class="QLabel" name="label_7">
          <property name="text">
-          <string>Data Type:</string>
+          <string>Data Type</string>
          </property>
         </widget>
        </item>
        <item row="0" column="0" colspan="3">
         <widget class="QLabel" name="label_6">
          <property name="text">
-          <string>Work on:</string>
+          <string>Work on</string>
          </property>
         </widget>
        </item>
@@ -161,7 +161,7 @@
           </size>
          </property>
          <property name="text">
-          <string>Volume Data</string>
+          <string>Data</string>
          </property>
         </widget>
        </item>

samm/SammBase/SammBaseLib/LogicSamm.py

@@ -1,6 +1,6 @@
 """
 MIT License
-Copyright (c) 2022 [Insert copyright holders]
+Copyright (c) 2023 Yihao Liu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -66,6 +66,8 @@ def setDefaultParameters(self, parameterNode):
         """
         Initialize parameter node with default settings.
         """
+        if not parameterNode.GetParameter("sammDataOptions"):
+            parameterNode.SetParameter("sammDataOptions", "Volume")
 
     def processGetVolumeMetaData(self, imageDataShape):
         """

samm/SammBase/SammBaseLib/UtilConnections.py

@@ -1,6 +1,6 @@
 """
 MIT License
-Copyright (c) 2022 [Insert copyright holders]
+Copyright (c) 2023 Yihao Liu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

samm/SammBase/SammBaseLib/UtilSlicerFuncs.py

@@ -1,6 +1,6 @@
 """
 MIT License
-Copyright (c) 2022 Yihao Liu
+Copyright (c) 2023 Yihao Liu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

samm/SammBase/SammBaseLib/WidgetSamm.py

@@ -1,6 +1,6 @@
 """
 MIT License
-Copyright (c) 2022 [Insert copyright holders]
+Copyright (c) 2023 Yihao Liu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights

samm/SammBase/SammBaseLib/WidgetSammBase.py

@@ -1,6 +1,6 @@
 """
 MIT License
-Copyright (c) 2022 [Insert copyright holders]
+Copyright (c) 2023 Yihao Liu
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
 in the Software without restriction, including without limitation the rights
@@ -39,11 +39,16 @@ def setup(self):
         self.addObserver(slicer.mrmlScene, slicer.mrmlScene.EndCloseEvent, self.onSceneEndClose)
 
         # UI
+
+        self.ui.radioDataVolume.connect("toggled(bool)", self.onRadioDataOptions)
+        self.ui.radioData2D.connect("toggled(bool)", self.onRadioDataOptions)
+
         self.ui.pushComputePredictor.connect('clicked(bool)', self.onPushComputePredictor)
         self.ui.pushStartMaskSync.connect('clicked(bool)', self.onPushStartMaskSync)
         self.ui.pushStopMaskSync.connect('clicked(bool)', self.onPushStopMaskSync)
         self.ui.pushFreezeSlice.connect('clicked(bool)', self.onPushFreezeSlice)
         self.ui.pushUnfreezeSlice.connect('clicked(bool)', self.onPushUnfreezeSlice)
+
         self.ui.comboVolumeNode.connect("currentNodeChanged(vtkMRMLNode*)", self.updateParameterNodeFromGUI)
         self.ui.markupsAdd.connect("markupsNodeChanged()", self.updateParameterNodeFromGUI)
         self.ui.markupsRemove.connect("markupsNodeChanged()", self.updateParameterNodeFromGUI)
@@ -100,6 +105,12 @@ def updateParameterNodeFromGUI(self, caller=None, event=None):
 
         self._parameterNode.EndModify(wasModified)
 
+    def onRadioDataOptions(self):
+        if self.ui.radioDataVolume.checked:
+            self._parameterNode.SetParameter("sammDataOptions", "Volume")
+        if self.ui.radioData2D.checked:
+            self._parameterNode.SetParameter("sammDataOptions", "2D")
+
     def onPushComputePredictor(self):
         self.logic.processComputePredictor()
 
@@ -110,8 +121,9 @@ def onPushStartMaskSync(self):
         self.logic._flag_mask_sync = True
         self.logic.processInitMaskSync()
         self.logic.processStartMaskSync()
-        self.logic._flag_promptpts_sync = True
-        self.logic.processPromptPointsSync()
+        if self._parameterNode.GetParameter("sammDataOptions") == "Volume":
+            self.logic._flag_promptpts_sync = True
+            self.logic.processPromptPointsSync()
 
     def onPushStopMaskSync(self):
         self.logic._flag_promptpts_sync = False