From ede0373671b41e8cb8d1c5389be18da07111c55e Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 22 May 2018 09:08:37 +0200 Subject: [PATCH] FEM: Python obj VP, code formating --- src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py | 3 ++- .../Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py | 3 ++- .../Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py | 3 ++- .../Fem/femguiobjects/_ViewProviderFemElementRotation1D.py | 3 ++- .../Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py | 4 ++-- src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py | 3 ++- src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py index 8a929582e5..243f210ad4 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementFluid1D.py @@ -108,8 +108,9 @@ class _TaskPanelFemElementFluid1D: def __init__(self, obj): - # parameter widget self.obj = obj + + # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementFluid1D.ui") QtCore.QObject.connect(self.parameterWidget.cb_section_type, QtCore.SIGNAL("activated(int)"), self.sectiontype_changed) QtCore.QObject.connect(self.parameterWidget.cb_liquid_section_type, QtCore.SIGNAL("activated(int)"), self.liquidsectiontype_changed) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py index eedbfd1438..df55a45b69 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry1D.py @@ -105,8 +105,9 @@ class _TaskPanelFemElementGeometry1D: def __init__(self, obj): - # parameter widget self.obj = obj + + # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementGeometry1D.ui") QtCore.QObject.connect(self.parameterWidget.cb_crosssectiontype, QtCore.SIGNAL("activated(int)"), self.sectiontype_changed) QtCore.QObject.connect(self.parameterWidget.if_rec_height, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.rec_height_changed) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py index a862559898..6d8c9581e4 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementGeometry2D.py @@ -104,8 +104,9 @@ class _TaskPanelFemElementGeometry2D: def __init__(self, obj): - # parameter widget self.obj = obj + + # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementGeometry2D.ui") QtCore.QObject.connect(self.parameterWidget.if_thickness, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.thickness_changed) self.init_parameter_widget() diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py index 8209f145d9..26261d3251 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemElementRotation1D.py @@ -109,8 +109,9 @@ class _TaskPanelFemElementRotation1D: '''The TaskPanel for editing References property of FemElementRotation1D objects''' def __init__(self, obj): - # parameter widget self.obj = obj + + # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/ElementRotation1D.ui") QtCore.QObject.connect(self.parameterWidget.if_rotation, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.rotation_changed) self.rotation = self.obj.Rotation diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py index b268e93a75..56cde7d436 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshBoundaryLayer.py @@ -103,10 +103,10 @@ class _TaskPanelFemMeshBoundaryLayer: '''The TaskPanel for editing References property of FemMeshBoundaryLayer objects''' def __init__(self, obj): - FreeCADGui.Selection.clearSelection() + + self.obj = obj # parameter widget - self.obj = obj self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/MeshBoundaryLayer.ui") QtCore.QObject.connect(self.parameterWidget.bl_number_of_layers, QtCore.SIGNAL("valueChanged(int)"), self.bl_number_of_layers_changed) QtCore.QObject.connect(self.parameterWidget.bl_min_thickness, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.bl_min_thickness_changed) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py index de296930f1..d14a69ecac 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshGroup.py @@ -103,8 +103,9 @@ class _TaskPanelFemMeshGroup: def __init__(self, obj): - # parameter widget self.obj = obj + + # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/MeshGroup.ui") QtCore.QObject.connect(self.parameterWidget.rb_name, QtCore.SIGNAL("toggled(bool)"), self.choose_exportidentifier_name) QtCore.QObject.connect(self.parameterWidget.rb_label, QtCore.SIGNAL("toggled(bool)"), self.choose_exportidentifier_label) diff --git a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py index 3e54117867..7bc5a0d0d3 100644 --- a/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py +++ b/src/Mod/Fem/femguiobjects/_ViewProviderFemMeshRegion.py @@ -104,8 +104,9 @@ class _TaskPanelFemMeshRegion: def __init__(self, obj): - # parameter widget self.obj = obj + + # parameter widget self.parameterWidget = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/Resources/ui/MeshRegion.ui") QtCore.QObject.connect(self.parameterWidget.if_elelen, QtCore.SIGNAL("valueChanged(Base::Quantity)"), self.elelen_changed) self.init_parameter_widget()