kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: selection widgets, rename and move module

Browse Source
This commit is contained in:
Bernd Hahnebach
2020-05-21 15:04:26 +02:00
parent 29b61616a8
commit 38d6201a0e
15 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Fem/CMakeLists.txt
View File

@@ -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)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintElectrostaticPotential.py
View File

@@ -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")

4
src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintFlowVelocity.py
View File

@@ -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"

4
src/Mod/Fem/femguiobjects/_ViewProviderFemConstraintTie.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemMaterial.py
View File

@@ -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

4
src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py
View File

@@ -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"]
)

4
src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py
View File

@@ -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"]
)

0
src/Mod/Fem/femguiutils/__init__.py Normal file
View File

0
src/Mod/Fem/femguiobjects/FemSelectionWidgets.py → src/Mod/Fem/femguiutils/selection_widgets.py
View File

4
src/Mod/Fem/femsolver/elmer/equations/equation.py
View File

@@ -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)