Fem: Remove selection observer - fixes FreeCAD#14001

Author: marioalexis84

src/Mod/Fem/femguiutils/selection_widgets.py

@@ -592,6 +592,11 @@ def has_equal_references_shape_types(self, ref_shty=""):
                 return False
         return True
 
+    def finish_selection(self):
+        self.setback_listobj_visibility()
+        if self.sel_server:
+            FreeCADGui.Selection.removeObserver(self.sel_server)
+
 
 class FemSelectionObserver:
     """selection observer especially for the needs of geometry reference selection of FEM"""

src/Mod/Fem/femtaskpanels/task_constraint_bodyheatsource.py

@@ -100,6 +100,7 @@ def open(self):
 
     def reject(self):
         self.restore_visibility()
+        self.selection_widget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         return True
 
@@ -110,6 +111,7 @@ def accept(self):
         self.obj.Mode = self.mode
 
         self.obj.Document.recompute()
+        self.selection_widget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self.restore_visibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_centrif.py

@@ -155,13 +155,8 @@ def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
 
-        self.AxisSelectionWidget.setback_listobj_visibility()
-        if self.AxisSelectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.AxisSelectionWidget.sel_server)
-
-        self.BodySelectionWidget.setback_listobj_visibility()
-        if self.BodySelectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.BodySelectionWidget.sel_server)
+        self.AxisSelectionWidget.finish_selection()
+        self.BodySelectionWidget.finish_selection()
 
         doc.resetEdit()
 

src/Mod/Fem/femtaskpanels/task_constraint_currentdensity.py

@@ -78,6 +78,7 @@ def open(self):
 
     def reject(self):
         self._restoreVisibility()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         return True
 
@@ -86,6 +87,7 @@ def accept(self):
             self._obj.References = self._selectionWidget.references
         self._applyWidgetChanges()
         self._obj.Document.recompute()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_electrostaticpotential.py

@@ -102,6 +102,7 @@ def open(self):
 
     def reject(self):
         self._restoreVisibility()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         return True
 
@@ -110,6 +111,7 @@ def accept(self):
             self._obj.References = self._selectionWidget.references
         self._applyWidgetChanges()
         self._obj.Document.recompute()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_flowvelocity.py

@@ -169,6 +169,7 @@ def open(self):
             self._part.ViewObject.show()
 
     def reject(self):
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True
@@ -178,6 +179,7 @@ def accept(self):
             self._obj.References = self._selectionWidget.references
         self._applyWidgetChanges()
         self._obj.Document.recompute()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_initialflowvelocity.py

@@ -168,6 +168,7 @@ def open(self):
             self._part.ViewObject.show()
 
     def reject(self):
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True
@@ -177,6 +178,7 @@ def accept(self):
             self._obj.References = self._selectionWidget.references
         self._applyWidgetChanges()
         self._obj.Document.recompute()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_initialpressure.py

@@ -77,6 +77,7 @@ def open(self):
 
     def reject(self):
         self._restoreVisibility()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         return True
 
@@ -85,6 +86,7 @@ def accept(self):
             self._obj.References = self._selectionWidget.references
         self._applyWidgetChanges()
         self._obj.Document.recompute()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_magnetization.py

@@ -78,6 +78,7 @@ def open(self):
 
     def reject(self):
         self._restoreVisibility()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         return True
 
@@ -86,6 +87,7 @@ def accept(self):
             self._obj.References = self._selectionWidget.references
         self._applyWidgetChanges()
         self._obj.Document.recompute()
+        self._selectionWidget.finish_selection()
         FreeCADGui.ActiveDocument.resetEdit()
         self._restoreVisibility()
         return True

src/Mod/Fem/femtaskpanels/task_constraint_sectionprint.py

@@ -105,9 +105,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def init_parameter_widget(self):

src/Mod/Fem/femtaskpanels/task_constraint_tie.py

@@ -111,9 +111,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def init_parameter_widget(self):

src/Mod/Fem/femtaskpanels/task_element_fluid1D.py

@@ -255,9 +255,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def get_fluidsection_props(self):

src/Mod/Fem/femtaskpanels/task_element_geometry1D.py

@@ -112,9 +112,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def get_beamsection_props(self):

src/Mod/Fem/femtaskpanels/task_element_geometry2D.py

@@ -81,9 +81,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def init_parameter_widget(self):

src/Mod/Fem/femtaskpanels/task_element_rotation1D.py

@@ -81,9 +81,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def rotation_changed(self, base_quantity_value):

src/Mod/Fem/femtaskpanels/task_material_common.py

@@ -230,9 +230,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def do_not_set_thermal_zeros(self):

src/Mod/Fem/femtaskpanels/task_mesh_boundarylayer.py

@@ -93,9 +93,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def init_parameter_widget(self):

src/Mod/Fem/femtaskpanels/task_mesh_group.py

@@ -87,9 +87,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def init_parameter_widget(self):

src/Mod/Fem/femtaskpanels/task_mesh_region.py

@@ -82,9 +82,7 @@ def reject(self):
     def recompute_and_set_back_all(self):
         doc = FreeCADGui.getDocument(self.obj.Document)
         doc.Document.recompute()
-        self.selectionWidget.setback_listobj_visibility()
-        if self.selectionWidget.sel_server:
-            FreeCADGui.Selection.removeObserver(self.selectionWidget.sel_server)
+        self.selectionWidget.finish_selection()
         doc.resetEdit()
 
     def init_parameter_widget(self):