wip commit (read)

This commit is a wip based on the outcome of Peter's comments regarding
the inheritance. If the 3 layer inheritance is preferred, then you will
have to subclass this.

OpenwaterHealth/OpenLIFU-python#289 (review)

Author: arhowe00

OpenLIFULib/OpenLIFULib/Resources/python-requirements.txt

@@ -1,2 +1,2 @@
-openlifu==0.3.1
+git+https://github.com/OpenwaterHealth/OpenLIFU-python.git@d243ef7ca3f34daee3f293d7e6bb10b541ee86fa
 bcrypt

OpenLIFUProtocolConfig/OpenLIFUProtocolConfig.py

@@ -257,8 +257,8 @@ def setup(self) -> None:
         self.abstract_apodization_method_definition_widget = OpenLIFUAbstractApodizationMethodDefinitionFormWidget()
         replace_widget(self.ui.abstractApodizationMethodDefinitionWidgetPlaceholder, self.abstract_apodization_method_definition_widget, self.ui)
 
-        self.segmentation_method_definition_widget = OpenLIFUAbstractDataclassDefinitionFormWidget(cls=openlifu_lz().seg.SegmentationMethod, parent=self.ui.segmentationMethodDefinitionWidgetPlaceholder.parentWidget(), collapsible_title="Segmentation Method")
-        replace_widget(self.ui.segmentationMethodDefinitionWidgetPlaceholder, self.segmentation_method_definition_widget, self.ui)
+        self.abstract_segmentation_method_definition_widget = OpenLIFUAbstractMultipleABCDefinitionFormWidget(cls_list=[openlifu_lz().seg.seg_methods.UniformSegmentation, openlifu_lz().seg.seg_methods.UniformTissue, openlifu_lz().seg.seg_methods.UniformWater], parent=self.ui.abstractSegmentationMethodDefinitionWidgetPlaceholder.parentWidget(), is_collapsible=False, collapsible_title="Segmentation Method", custom_abc_title="Segmentation Method")
+        replace_widget(self.ui.abstractSegmentationMethodDefinitionWidgetPlaceholder, self.abstract_segmentation_method_definition_widget, self.ui)
 
         self.parameter_constraints_widget = OpenLIFUParameterConstraintsWidget()
         replace_widget(self.ui.parameterConstraintsWidgetPlaceholder, self.parameter_constraints_widget, self.ui)
@@ -301,7 +301,7 @@ def setup(self) -> None:
         self.sim_setup_definition_widget.add_value_changed_signals(trigger_unsaved_changes)
         self.abstract_delay_method_definition_widget.add_value_changed_signals(trigger_unsaved_changes)
         self.abstract_apodization_method_definition_widget.add_value_changed_signals(trigger_unsaved_changes)
-        self.segmentation_method_definition_widget.add_value_changed_signals(trigger_unsaved_changes)
+        self.abstract_segmentation_method_definition_widget.add_value_changed_signals(trigger_unsaved_changes)
         self.parameter_constraints_widget.table.itemChanged.connect(lambda *_: trigger_unsaved_changes())
         self.target_constraints_widget.table.itemChanged.connect(lambda *_: trigger_unsaved_changes())
         self.solution_analysis_options_definition_widget.add_value_changed_signals(trigger_unsaved_changes)
@@ -652,7 +652,7 @@ def updateProtocolDisplayFromProtocol(self, protocol: "openlifu.plan.Protocol"):
         self.sim_setup_definition_widget.update_form_from_class(protocol.sim_setup)
         self.abstract_delay_method_definition_widget.update_form_from_class(protocol.delay_method)
         self.abstract_apodization_method_definition_widget.update_form_from_class(protocol.apod_method)
-        self.segmentation_method_definition_widget.update_form_from_class(protocol.seg_method)
+        self.abstract_segmentation_method_definition_widget.update_form_from_class(protocol.seg_method)
         self.parameter_constraints_widget.from_dict(protocol.param_constraints)
         self.target_constraints_widget.from_list(protocol.target_constraints)
         self.solution_analysis_options_definition_widget.update_form_from_class(protocol.analysis_options)
@@ -691,7 +691,7 @@ def getProtocolFromGUI(self) -> "openlifu.plan.Protocol":
         sim_setup = self.sim_setup_definition_widget.get_form_as_class()
         delay_method = self.abstract_delay_method_definition_widget.get_form_as_class()
         apodization_method = self.abstract_apodization_method_definition_widget.get_form_as_class()
-        segmentation_method = self.segmentation_method_definition_widget.get_form_as_class()
+        segmentation_method = self.abstract_segmentation_method_definition_widget.get_form_as_class()
         parameter_constraints = self.parameter_constraints_widget.to_dict()
         target_constraints = self.target_constraints_widget.to_list()
         solution_analysis_options = self.solution_analysis_options_definition_widget.get_form_as_class()
@@ -734,7 +734,7 @@ def setProtocolEditorEnabled(self, enabled: bool) -> None:
         self.sim_setup_definition_widget.setEnabled(enabled)
         self.abstract_delay_method_definition_widget.setEnabled(enabled)
         self.abstract_apodization_method_definition_widget.setEnabled(enabled)
-        self.segmentation_method_definition_widget.setEnabled(enabled)
+        self.abstract_segmentation_method_definition_widget.setEnabled(enabled)
         self.parameter_constraints_widget.setEnabled(enabled)
         self.target_constraints_widget.setEnabled(enabled)
         self.solution_analysis_options_definition_widget.setEnabled(enabled)
@@ -923,7 +923,7 @@ def get_default_apodization_method(cls):
 
     @classmethod
     def get_default_segmentation_method(cls):
-        return openlifu_lz().seg.seg_methods.Water()
+        return openlifu_lz().seg.seg_methods.UniformWater()
 
     @classmethod
     def get_default_parameter_constraints(cls):

OpenLIFUProtocolConfig/Resources/UI/OpenLIFUProtocolConfig.ui

@@ -266,13 +266,13 @@ OpenLIFUAbstractApodizationMethodDefinitionWidget</string>
        </widget>
       </item>
       <item>
-       <widget class="QWidget" name="segmentationMethodDefinitionWidgetPlaceholder" native="true">
+       <widget class="QWidget" name="abstractSegmentationMethodDefinitionWidgetPlaceholder" native="true">
         <layout class="QVBoxLayout" name="verticalLayout_13">
          <item>
-          <widget class="QLabel" name="segmentationMethodDefinitionWidgetPlaceholderLabel">
+          <widget class="QLabel" name="abstractSegmentationMethodDefinitionWidgetPlaceholderLabel">
            <property name="text">
             <string>Placeholder for an
-OpenLIFUSegmentationMethodDefinitionWidget</string>
+OpenLIFUAbstractSegmentationMethodDefinitionWidget</string>
            </property>
           </widget>
          </item>