From 38d6201a0ef51c6448dd12196ed55f7e0936e651 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Thu, 21 May 2020 15:04:26 +0200 Subject: [PATCH] FEM: selection widgets, rename and move module --- src/Mod/Fem/CMakeLists.txt | 14 +++++++++++--- ...wProviderFemConstraintElectrostaticPotential.py | 4 ++-- .../_ViewProviderFemConstraintFlowVelocity.py | 4 ++-- .../femguiobjects/_ViewProviderFemConstraintTie.py | 4 ++-- .../_ViewProviderFemElementFluid1D.py | 4 ++-- .../_ViewProviderFemElementGeometry1D.py | 4 ++-- .../_ViewProviderFemElementGeometry2D.py | 4 ++-- .../_ViewProviderFemElementRotation1D.py | 4 ++-- .../Fem/femguiobjects/_ViewProviderFemMaterial.py | 4 ++-- .../_ViewProviderFemMeshBoundaryLayer.py | 4 ++-- .../Fem/femguiobjects/_ViewProviderFemMeshGroup.py | 4 ++-- .../femguiobjects/_ViewProviderFemMeshRegion.py | 4 ++-- src/Mod/Fem/femguiutils/__init__.py | 0 .../selection_widgets.py} | 0 src/Mod/Fem/femsolver/elmer/equations/equation.py | 4 ++-- 15 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 src/Mod/Fem/femguiutils/__init__.py rename src/Mod/Fem/{femguiobjects/FemSelectionWidgets.py => femguiutils/selection_widgets.py} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index a4e37b798e..adf3240bbb 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -340,18 +340,26 @@ SET(FemGuiScripts_SRCS femguiobjects/_ViewProviderFemMeshResult.py femguiobjects/_ViewProviderFemResultMechanical.py femguiobjects/_ViewProviderFemSolverCalculix.py - femguiobjects/FemSelectionWidgets.py femguiobjects/ViewProviderBaseObject.py femguiobjects/ViewProviderFemConstraint.py ) +SET(FemGuiUtils_SRCS + femguiutils/selection_widgets.py +) + +SET(FemAllGuiScripts + ${FemGuiScripts_SRCS} + ${FemGuiUtils_SRCS} +) if(BUILD_GUI) ADD_CUSTOM_TARGET(FemGuiScriptsTarget ALL - SOURCES ${FemGuiScripts_SRCS} + SOURCES ${FemAllGuiScripts} ) - fc_copy_sources(FemGuiScriptsTarget "${CMAKE_BINARY_DIR}/Mod/Fem" ${FemGuiScripts_SRCS}) + fc_copy_sources(FemGuiScriptsTarget "${CMAKE_BINARY_DIR}/Mod/Fem" ${FemAllGuiScripts}) # install Python packages (for make install) INSTALL(FILES ${FemGuiScripts_SRCS} DESTINATION Mod/Fem/femguiobjects) + INSTALL(FILES ${FemGuiUtils_SRCS} DESTINATION Mod/Fem/femguiutils/) endif(BUILD_GUI) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py index 1fae33bed3..fcb7674e23 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py @@ -33,7 +33,7 @@ import FreeCAD import FreeCADGui from FreeCAD import Units -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint from femtools import femutils from femtools import membertools @@ -54,7 +54,7 @@ class _TaskPanel(object): def __init__(self, obj): self._obj = obj - self._refWidget = FemSelectionWidgets.BoundarySelector() + self._refWidget = selection_widgets.BoundarySelector() self._refWidget.setReferences(obj.References) self._paramWidget = FreeCADGui.PySideUic.loadUi( FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElectrostaticPotential.ui") diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py index 12db410ef6..603ef4f849 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py @@ -33,7 +33,7 @@ import FreeCAD import FreeCADGui from FreeCAD import Units -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint from femtools import femutils from femtools import membertools @@ -54,7 +54,7 @@ class _TaskPanel(object): def __init__(self, obj): self._obj = obj - self._refWidget = FemSelectionWidgets.BoundarySelector() + self._refWidget = selection_widgets.BoundarySelector() self._refWidget.setReferences(obj.References) self._paramWidget = FreeCADGui.PySideUic.loadUi( FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/FlowVelocity.ui" diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py index fda10c1c79..e83866bb3f 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py @@ -35,7 +35,7 @@ from PySide import QtGui import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -74,7 +74,7 @@ class _TaskPanel: self.init_parameter_widget() # geometry selection widget - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Face"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py index 3e5438c7d0..e963fec2b0 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py @@ -37,7 +37,7 @@ from PySide import QtGui import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint from femobjects import _FemElementFluid1D @@ -246,7 +246,7 @@ class _TaskPanel: self.updateParameterWidget() # geometry selection widget - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Edge"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py index b47cb19563..b08eafa487 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py @@ -34,7 +34,7 @@ from PySide import QtCore import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint from femobjects import _FemElementGeometry1D @@ -105,7 +105,7 @@ class _TaskPanel: self.updateParameterWidget() # geometry selection widget - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Edge"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py index 2ba71b54cd..167a35597c 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py @@ -34,7 +34,7 @@ from PySide import QtCore import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -73,7 +73,7 @@ class _TaskPanel: self.init_parameter_widget() # geometry selection widget - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Face"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py index a708c99e71..b3cbdfcaac 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py @@ -34,7 +34,7 @@ from PySide import QtCore import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -77,7 +77,7 @@ class _TaskPanel: self.parameterWidget.if_rotation.setText(self.rotation.UserString) # geometry selection widget - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Edge"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py index a117fa697c..0a3c51ed68 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py @@ -38,7 +38,7 @@ import FreeCAD import FreeCADGui from FreeCAD import Units -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -215,7 +215,7 @@ class _TaskPanel: self.choose_material(index) # geometry selection widget - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Solid", "Face", "Edge"], False diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py index 8eb9418166..c93fbc3644 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py @@ -34,7 +34,7 @@ from PySide import QtCore import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -85,7 +85,7 @@ class _TaskPanel: # geometry selection widget # start with Solid in list! - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Solid", "Face", "Edge", "Vertex"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py index cb744abb14..5a9ae63106 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py @@ -34,7 +34,7 @@ from PySide import QtCore import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -79,7 +79,7 @@ class _TaskPanel: # geometry selection widget # start with Solid in list! - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Solid", "Face", "Edge", "Vertex"] ) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py index 562a536ef5..4dc353893b 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py @@ -34,7 +34,7 @@ from PySide import QtCore import FreeCAD import FreeCADGui -from . import FemSelectionWidgets +from femguiutils import selection_widgets from . import ViewProviderFemConstraint @@ -74,7 +74,7 @@ class _TaskPanel: # geometry selection widget # start with Solid in list! - self.selectionWidget = FemSelectionWidgets.GeometryElementsSelection( + self.selectionWidget = selection_widgets.GeometryElementsSelection( obj.References, ["Solid", "Face", "Edge", "Vertex"] ) diff --git a/src/Mod/Fem/femguiutils/__init__.py b/src/Mod/Fem/femguiutils/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/Fem/femguiobjects/FemSelectionWidgets.py b/src/Mod/Fem/femguiutils/selection_widgets.py similarity index 100% rename from src/Mod/Fem/femguiobjects/FemSelectionWidgets.py rename to src/Mod/Fem/femguiutils/selection_widgets.py diff --git a/src/Mod/Fem/femsolver/elmer/equations/equation.py b/src/Mod/Fem/femsolver/elmer/equations/equation.py index f0e9c1b692..d69a15a09f 100644 --- a/src/Mod/Fem/femsolver/elmer/equations/equation.py +++ b/src/Mod/Fem/femsolver/elmer/equations/equation.py @@ -34,7 +34,7 @@ from femtools import membertools if App.GuiUp: import FreeCADGui as Gui - from femguiobjects import FemSelectionWidgets + from femguiutils import selection_widgets class Proxy(equationbase.BaseProxy): @@ -69,7 +69,7 @@ class _TaskPanel(object): def __init__(self, obj): self._obj = obj - self._refWidget = FemSelectionWidgets.SolidSelector() + self._refWidget = selection_widgets.SolidSelector() self._refWidget.setReferences(obj.References) propWidget = obj.ViewObject.Proxy.getTaskWidget( obj.ViewObject)