FEM small stuff

src/Mod/Fem/PyGui/_TaskPanelFemElementFluid1D.py

@@ -357,8 +357,11 @@ def add_references(self):
         FreeCADGui.Selection.clearSelection()
         # start SelectionObserver and parse the function to add the References to the widget
         print_message = "Select Edges by single click on them to add them to the list"
-        import FemSelectionObserver
-        self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
+        if not self.sel_server:
+            # if we do not check, we would start a new SelectionObserver on every click on addReference button
+            # but close only one SelectionObserver on leaving the task panel
+            import FemSelectionObserver
+            self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
 
     def selectionParser(self, selection):
         # print('selection: ', selection[0].Shape.ShapeType, '  ', selection[0].Name, '  ', selection[1])

src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry1D.py

@@ -156,8 +156,11 @@ def add_references(self):
         FreeCADGui.Selection.clearSelection()
         # start SelectionObserver and parse the function to add the References to the widget
         print_message = "Select Edges by single click on them to add them to the list"
-        import FemSelectionObserver
-        self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
+        if not self.sel_server:
+            # if we do not check, we would start a new SelectionObserver on every click on addReference button
+            # but close only one SelectionObserver on leaving the task panel
+            import FemSelectionObserver
+            self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
 
     def selectionParser(self, selection):
         # print('selection: ', selection[0].Shape.ShapeType, '  ', selection[0].Name, '  ', selection[1])

src/Mod/Fem/PyGui/_TaskPanelFemElementGeometry2D.py

@@ -114,8 +114,11 @@ def add_references(self):
         FreeCADGui.Selection.clearSelection()
         # start SelectionObserver and parse the function to add the References to the widget
         print_message = "Select Faces by single click on them to add them to the list"
-        import FemSelectionObserver
-        self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
+        if not self.sel_server:
+            # if we do not check, we would start a new SelectionObserver on every click on addReference button
+            # but close only one SelectionObserver on leaving the task panel
+            import FemSelectionObserver
+            self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
 
     def selectionParser(self, selection):
         # print('selection: ', selection[0].Shape.ShapeType, '  ', selection[0].Name, '  ', selection[1])

src/Mod/Fem/PyGui/_TaskPanelFemMaterial.py

@@ -541,8 +541,11 @@ def add_references(self):
             print_message = self.selection_mode_solid_print_message
         else:
             print_message = self.selection_mode_std_print_message
-        import FemSelectionObserver
-        self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
+        if not self.sel_server:
+            # if we do not check, we would start a new SelectionObserver on every click on addReference button
+            # but close only one SelectionObserver on leaving the task panel
+            import FemSelectionObserver
+            self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
 
     def selectionParser(self, selection):
         print('selection: ', selection[0].Shape.ShapeType, ' --> ', selection[0].Name, ' --> ', selection[1])

src/Mod/Fem/PyGui/_TaskPanelFemMeshGroup.py

@@ -137,8 +137,11 @@ def add_references(self):
             print_message = self.selection_mode_solid_print_message
         else:
             print_message = self.selection_mode_std_print_message
-        import FemSelectionObserver
-        self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
+        if not self.sel_server:
+            # if we do not check, we would start a new SelectionObserver on every click on addReference button
+            # but close only one SelectionObserver on leaving the task panel
+            import FemSelectionObserver
+            self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
 
     def selectionParser(self, selection):
         print('selection: ', selection[0].Shape.ShapeType, '  ', selection[0].Name, '  ', selection[1])

src/Mod/Fem/PyGui/_TaskPanelFemMeshRegion.py

@@ -48,6 +48,7 @@ def __init__(self, obj):
         QtCore.QObject.connect(self.form.rb_standard, QtCore.SIGNAL("toggled(bool)"), self.choose_selection_mode_standard)
         QtCore.QObject.connect(self.form.rb_solid, QtCore.SIGNAL("toggled(bool)"), self.choose_selection_mode_solid)
         QtCore.QObject.connect(self.form.pushButton_Reference, QtCore.SIGNAL("clicked()"), self.add_references)
+        self.form.list_References.itemSelectionChanged.connect(self.select_clicked_reference_shape)
         self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu)
         self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked)
 
@@ -132,8 +133,11 @@ def add_references(self):
             print_message = self.selection_mode_solid_print_message
         else:
             print_message = self.selection_mode_std_print_message
-        import FemSelectionObserver
-        self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
+        if not self.sel_server:
+            # if we do not check, we would start a new SelectionObserver on every click on addReference button
+            # but close only one SelectionObserver on leaving the task panel
+            import FemSelectionObserver
+            self.sel_server = FemSelectionObserver.FemSelectionObserver(self.selectionParser, print_message)
 
     def selectionParser(self, selection):
         print('selection: ', selection[0].Shape.ShapeType, '  ', selection[0].Name, '  ', selection[1])
@@ -183,3 +187,18 @@ def rebuild_list_References(self):
             items.append(item_name)
         for listItemName in sorted(items):
             self.form.list_References.addItem(listItemName)
+
+    def select_clicked_reference_shape(self):
+        if self.sel_server:
+            FreeCADGui.Selection.removeObserver(self.sel_server)
+            self.sel_server = None
+        if not self.sel_server:
+            if not self.references:
+                return
+            currentItemName = str(self.form.list_References.currentItem().text())
+            for ref in self.references:
+                refname_to_compare_listentry = ref[0].Name + ':' + ref[1]
+                if refname_to_compare_listentry == currentItemName:
+                    # print( 'found: shape: ' + ref[0].Name + ' element: ' + ref[1])
+                    FreeCADGui.Selection.clearSelection()
+                    FreeCADGui.Selection.addSelection(ref[0], ref[1])