suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: result task panel, add Fem to module name

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-03-02 22:17:14 +01:00 committed by Yorik van Havre
parent 85bfe10485
commit 8afbd2b81e
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Fem/App/CMakeLists.txt
View File

@ -129,16 +129,17 @@ SET(FemGuiScripts_SRCS
PyGui/_CommandFemSolverZ88.py
PyGui/_TaskPanelFemBeamSection.py
PyGui/_TaskPanelFemFluidSection.py
PyGui/_TaskPanelFemMaterial.py
PyGui/_TaskPanelFemMeshGmsh.py
PyGui/_TaskPanelFemMeshGroup.py
PyGui/_TaskPanelFemMeshRegion.py
PyGui/_TaskPanelFemResultShow.py
PyGui/_TaskPanelFemShellThickness.py
PyGui/_TaskPanelFemSolverCalculix.py
PyGui/_TaskPanelFemMaterial.py
PyGui/_TaskPanelResultShow.py
PyGui/_ViewProviderFemBeamSection.py
PyGui/_ViewProviderFemConstraintSelfWeight.py
PyGui/_ViewProviderFemFluidSection.py
PyGui/_ViewProviderFemMaterial.py
PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
PyGui/_ViewProviderFemMeshGmsh.py
PyGui/_ViewProviderFemMeshGroup.py
@ -147,16 +148,15 @@ SET(FemGuiScripts_SRCS
PyGui/_ViewProviderFemShellThickness.py
PyGui/_ViewProviderFemSolverCalculix.py
PyGui/_ViewProviderFemSolverZ88.py
PyGui/_ViewProviderFemMaterial.py
PyGui/TaskPanelFemBeamSection.ui
PyGui/TaskPanelFemFluidSection.ui
PyGui/TaskPanelFemMaterial.ui
PyGui/TaskPanelFemMeshGmsh.ui
PyGui/TaskPanelFemMeshGroup.ui
PyGui/TaskPanelFemMeshRegion.ui
PyGui/TaskPanelFemResultShow.ui
PyGui/TaskPanelFemShellThickness.ui
PyGui/TaskPanelFemSolverCalculix.ui
PyGui/TaskPanelFemMaterial.ui
PyGui/TaskPanelResultShow.ui
)
SET(FemTests_SRCS

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

@ -90,16 +90,17 @@ INSTALL(
PyGui/_CommandFemSolverZ88.py
PyGui/_TaskPanelFemBeamSection.py
PyGui/_TaskPanelFemFluidSection.py
PyGui/_TaskPanelFemMaterial.py
PyGui/_TaskPanelFemMeshGmsh.py
PyGui/_TaskPanelFemMeshGroup.py
PyGui/_TaskPanelFemMeshRegion.py
PyGui/_TaskPanelFemResultShow.py
PyGui/_TaskPanelFemShellThickness.py
PyGui/_TaskPanelFemSolverCalculix.py
PyGui/_TaskPanelFemMaterial.py
PyGui/_TaskPanelResultShow.py
PyGui/_ViewProviderFemBeamSection.py
PyGui/_ViewProviderFemConstraintSelfWeight.py
PyGui/_ViewProviderFemFluidSection.py
PyGui/_ViewProviderFemMaterial.py
PyGui/_ViewProviderFemMaterialMechanicalNonlinear.py
PyGui/_ViewProviderFemMeshGmsh.py
PyGui/_ViewProviderFemMeshGroup.py
@ -108,16 +109,15 @@ INSTALL(
PyGui/_ViewProviderFemShellThickness.py
PyGui/_ViewProviderFemSolverCalculix.py
PyGui/_ViewProviderFemSolverZ88.py
PyGui/_ViewProviderFemMaterial.py
PyGui/TaskPanelFemBeamSection.ui
PyGui/TaskPanelFemFluidSection.ui
PyGui/TaskPanelFemMaterial.ui
PyGui/TaskPanelFemMeshGmsh.ui
PyGui/TaskPanelFemMeshGroup.ui
PyGui/TaskPanelFemMeshRegion.ui
PyGui/TaskPanelFemResultShow.ui
PyGui/TaskPanelFemShellThickness.ui
PyGui/TaskPanelFemSolverCalculix.ui
PyGui/TaskPanelResultShow.ui
DESTINATION
Mod/Fem/PyGui
)

0
src/Mod/Fem/PyGui/TaskPanelResultShow.ui → src/Mod/Fem/PyGui/TaskPanelFemResultShow.ui
View File

6
src/Mod/Fem/PyGui/_TaskPanelResultShow.py → src/Mod/Fem/PyGui/_TaskPanelFemResultShow.py
View File

@ -24,7 +24,7 @@ __title__ = "Result Control Task Panel"
__author__ = "Juergen Riegel, Michael Hindley"
__url__ = "http://www.freecadweb.org"
## @package TaskPanelResultShow
## @package TaskPanelFemResultShow
# \ingroup FEM
import FreeCAD
@ -37,7 +37,7 @@ from PySide.QtCore import Qt
from PySide.QtGui import QApplication
class _TaskPanelResultShow:
class _TaskPanelFemResultShow:
'''The task panel for the post-processing'''
def __init__(self, obj):
self.result_obj = obj
@ -45,7 +45,7 @@ class _TaskPanelResultShow:
# task panel should be started by use of setEdit of view provider
# in view provider checks: Mesh, active analysis and if Mesh and result are in active analysis
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/PyGui/TaskPanelResultShow.ui")
self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/PyGui/TaskPanelFemResultShow.ui")
self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem/General")
self.restore_result_settings_in_dialog = self.fem_prefs.GetBool("RestoreResultDialog", True)

4
src/Mod/Fem/PyGui/_ViewProviderFemResultMechanical.py
View File

@ -72,8 +72,8 @@ class _ViewProviderFemResultMechanical:
mem = FemGui.getActiveAnalysis().Member
if self.Object in mem:
if self.Object.Mesh in mem:
import PyGui._TaskPanelResultShow
taskd = PyGui._TaskPanelResultShow._TaskPanelResultShow(self.Object)
import PyGui._TaskPanelFemResultShow
taskd = PyGui._TaskPanelFemResultShow._TaskPanelFemResultShow(self.Object)
taskd.obj = vobj.Object
FreeCADGui.Control.showDialog(taskd)
return True