diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py index fee368653f..61dbcc4985 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py @@ -107,7 +107,7 @@ class _TaskPanelFemElementFluid1D: self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementFluid1D.ui") QtCore.QObject.connect(self.form.btn_add, QtCore.SIGNAL("clicked()"), self.add_references) - QtCore.QObject.connect(self.form.btn_remove, QtCore.SIGNAL("clicked()"), self.remove_reference) + QtCore.QObject.connect(self.form.btn_remove, QtCore.SIGNAL("clicked()"), self.remove_selected_reference) QtCore.QObject.connect(self.form.cb_section_type, QtCore.SIGNAL("activated(int)"), self.sectiontype_changed) QtCore.QObject.connect(self.form.cb_liquid_section_type, QtCore.SIGNAL("activated(int)"), self.liquidsectiontype_changed) QtCore.QObject.connect(self.form.if_manning_area, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.manning_area_changed) @@ -398,15 +398,18 @@ class _TaskPanelFemElementFluid1D: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -416,6 +419,10 @@ class _TaskPanelFemElementFluid1D: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py index 37b2cc1359..3190aaf346 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py @@ -197,15 +197,18 @@ class _TaskPanelFemElementGeometry1D: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -215,6 +218,10 @@ class _TaskPanelFemElementGeometry1D: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py index 7136b6b48a..504f1d180f 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py @@ -155,15 +155,18 @@ class _TaskPanelFemElementGeometry2D: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -173,6 +176,10 @@ class _TaskPanelFemElementGeometry2D: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py index 71df523486..d7c81446dd 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py @@ -156,15 +156,18 @@ class _TaskPanelFemElementRotation1D: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -174,6 +177,10 @@ class _TaskPanelFemElementRotation1D: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py index c9430bb4e7..68602669e0 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py @@ -595,27 +595,31 @@ class _TaskPanelFemMaterial: ###################geometry reference selection ################# def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) for ref in self.references: - if ref[1]: - refname_to_compare_listentry = ref[0].Name + ':' + ref[1] - else: - refname_to_compare_listentry = ref[0].Name + refname_to_compare_listentry = ref[0].Name + ':' + ref[1] if refname_to_compare_listentry == currentItemName: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py index 39ea2be95e..7d41b55bfe 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py @@ -185,15 +185,18 @@ class _TaskPanelFemMeshBoundaryLayer: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -203,6 +206,10 @@ class _TaskPanelFemMeshBoundaryLayer: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py index 5cc7fd30b2..3b2fcbf4ff 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py @@ -175,15 +175,18 @@ class _TaskPanelFemMeshGroup: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -193,6 +196,10 @@ class _TaskPanelFemMeshGroup: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py index 9ed9bb6f85..d376de345e 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py @@ -171,15 +171,18 @@ class _TaskPanelFemMeshRegion: def references_list_right_clicked(self, QPos): self.form.contextMenu = QtGui.QMenu() - menu_item = self.form.contextMenu.addAction("Remove Reference") + menu_item_remove_selected = self.form.contextMenu.addAction("Remove selected reference") + menu_item_remove_all = self.form.contextMenu.addAction("Remove all references") if not self.references: - menu_item.setDisabled(True) - self.form.connect(menu_item, QtCore.SIGNAL("triggered()"), self.remove_reference) + menu_item_remove_selected.setDisabled(True) + menu_item_remove_all.setDisabled(True) + self.form.connect(menu_item_remove_selected, QtCore.SIGNAL("triggered()"), self.remove_selected_reference) + self.form.connect(menu_item_remove_all, QtCore.SIGNAL("triggered()"), self.remove_all_references) parentPosition = self.form.list_References.mapToGlobal(QtCore.QPoint(0, 0)) self.form.contextMenu.move(parentPosition + QPos) self.form.contextMenu.show() - def remove_reference(self): + def remove_selected_reference(self): if not self.references: return currentItemName = str(self.form.list_References.currentItem().text()) @@ -189,6 +192,10 @@ class _TaskPanelFemMeshRegion: self.references.remove(ref) self.rebuild_list_References() + def remove_all_references(self): + self.references = [] + self.rebuild_list_References() + def add_references(self): '''Called if Button add_reference is triggered''' # in constraints EditTaskPanel the selection is active as soon as the taskpanel is open