From d10d18bd4dcec26d06ae1fe5c5498035d3dfb892 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 6 Nov 2015 21:38:57 +0100 Subject: [PATCH] FEM: rename ObjectsTaskPanel into TaskPanelObjects --- src/Mod/Fem/App/CMakeLists.txt | 10 +++++----- src/Mod/Fem/CMakeLists.txt | 11 ++++++----- src/Mod/Fem/_CommandMechanicalJobControl.py | 4 ++-- src/Mod/Fem/_CommandMechanicalShowResult.py | 4 ++-- src/Mod/Fem/_CommandQuickAnalysis.py | 4 ++-- ...ectionTaskPanel.py => _TaskPanelFemBeamSection.py} | 4 ++-- ...essTaskPanel.py => _TaskPanelFemShellThickness.py} | 4 ++-- ...JobControlTaskPanel.py => _TaskPanelJobControl.py} | 2 +- ...alTaskPanel.py => _TaskPanelMechanicalMaterial.py} | 4 ++-- ...ControlTaskPanel.py => _TaskPanelResultControl.py} | 2 +- src/Mod/Fem/_ViewProviderFemAnalysis.py | 4 ++-- src/Mod/Fem/_ViewProviderFemBeamSection.py | 4 ++-- src/Mod/Fem/_ViewProviderFemShellThickness.py | 4 ++-- src/Mod/Fem/_ViewProviderMechanicalMaterial.py | 4 ++-- 14 files changed, 33 insertions(+), 32 deletions(-) rename src/Mod/Fem/{_FemBeamSectionTaskPanel.py => _TaskPanelFemBeamSection.py} (98%) rename src/Mod/Fem/{_FemShellThicknessTaskPanel.py => _TaskPanelFemShellThickness.py} (98%) rename src/Mod/Fem/{_JobControlTaskPanel.py => _TaskPanelJobControl.py} (99%) rename src/Mod/Fem/{_MechanicalMaterialTaskPanel.py => _TaskPanelMechanicalMaterial.py} (99%) rename src/Mod/Fem/{_ResultControlTaskPanel.py => _TaskPanelResultControl.py} (99%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 321a8d618822..fdc79b251efc 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -78,8 +78,8 @@ SET(FemScripts_SRCS MechanicalAnalysis.py ShowDisplacement.ui FemCommands.py - _ResultControlTaskPanel.py - _JobControlTaskPanel.py + _TaskPanelResultControl.py + _TaskPanelJobControl.py _ViewProviderFemAnalysis.py _FemAnalysis.py _CommandMechanicalShowResult.py @@ -93,21 +93,21 @@ SET(FemScripts_SRCS _ViewProviderFemBeamSection.py FemBeamSection.py _CommandFemBeamSection.py - _FemBeamSectionTaskPanel.py + _TaskPanelFemBeamSection.py FemBeamSection.ui _FemShellThickness.py _ViewProviderFemShellThickness.py FemShellThickness.py _CommandFemShellThickness.py - _FemShellThicknessTaskPanel.py + _TaskPanelFemShellThickness.py FemShellThickness.ui _MechanicalMaterial.py _ViewProviderMechanicalMaterial.py MechanicalMaterial.py _CommandMechanicalMaterial.py - _MechanicalMaterialTaskPanel.py + _TaskPanelMechanicalMaterial.py MechanicalMaterial.ui ) #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS}) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index b54001b69608..a6e264c6cbad 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -7,6 +7,7 @@ endif(BUILD_GUI) INSTALL( FILES + # changes on the file list here needs to be made in App/CMakeLists.txt as well Init.py InitGui.py convert2TetGen.py @@ -20,8 +21,8 @@ INSTALL( MechanicalAnalysis.ui ShowDisplacement.ui FemCommands.py - _ResultControlTaskPanel.py - _JobControlTaskPanel.py + _TaskPanelResultControl.py + _TaskPanelJobControl.py _ViewProviderFemAnalysis.py _FemAnalysis.py _CommandMechanicalShowResult.py @@ -35,21 +36,21 @@ INSTALL( _ViewProviderFemBeamSection.py FemBeamSection.py _CommandFemBeamSection.py - _FemBeamSectionTaskPanel.py + _TaskPanelFemBeamSection.py FemBeamSection.ui _FemShellThickness.py _ViewProviderFemShellThickness.py FemShellThickness.py _CommandFemShellThickness.py - _FemShellThicknessTaskPanel.py + _TaskPanelFemShellThickness.py FemShellThickness.ui _MechanicalMaterial.py _ViewProviderMechanicalMaterial.py MechanicalMaterial.py _CommandMechanicalMaterial.py - _MechanicalMaterialTaskPanel.py + _TaskPanelMechanicalMaterial.py MechanicalMaterial.ui DESTINATION diff --git a/src/Mod/Fem/_CommandMechanicalJobControl.py b/src/Mod/Fem/_CommandMechanicalJobControl.py index 2f41824709f0..e2de9e1a15e3 100644 --- a/src/Mod/Fem/_CommandMechanicalJobControl.py +++ b/src/Mod/Fem/_CommandMechanicalJobControl.py @@ -44,8 +44,8 @@ def __init__(self): self.is_active = 'with_analysis' def Activated(self): - import _JobControlTaskPanel - taskd = _JobControlTaskPanel._JobControlTaskPanel(FemGui.getActiveAnalysis()) + import _TaskPanelJobControl + taskd = _TaskPanelJobControl._TaskPanelJobControl(FemGui.getActiveAnalysis()) #taskd.obj = vobj.Object taskd.update() FreeCADGui.Control.showDialog(taskd) diff --git a/src/Mod/Fem/_CommandMechanicalShowResult.py b/src/Mod/Fem/_CommandMechanicalShowResult.py index 9796da7914f2..c7d0764f0618 100644 --- a/src/Mod/Fem/_CommandMechanicalShowResult.py +++ b/src/Mod/Fem/_CommandMechanicalShowResult.py @@ -49,8 +49,8 @@ def Activated(self): QtGui.QMessageBox.critical(None, "Missing prerequisite", "No result found in active Analysis") return - import _ResultControlTaskPanel - taskd = _ResultControlTaskPanel._ResultControlTaskPanel() + import _TaskPanelResultControl + taskd = _TaskPanelResultControl._TaskPanelResultControl() FreeCADGui.Control.showDialog(taskd) diff --git a/src/Mod/Fem/_CommandQuickAnalysis.py b/src/Mod/Fem/_CommandQuickAnalysis.py index 07a7938d0c55..14300ba8ba72 100644 --- a/src/Mod/Fem/_CommandQuickAnalysis.py +++ b/src/Mod/Fem/_CommandQuickAnalysis.py @@ -62,8 +62,8 @@ def load_results(ret_code): def show_results_on_mesh(self): #FIXME proprer mesh refreshing as per FreeCAD.FEM_dialog settings required # or confirmation that it's safe to call restore_result_dialog - import _ResultControlTaskPanel - tp = _ResultControlTaskPanel._ResultControlTaskPanel() + import _TaskPanelResultControl + tp = _TaskPanelResultControl._TaskPanelResultControl() tp.restore_result_dialog() diff --git a/src/Mod/Fem/_FemBeamSectionTaskPanel.py b/src/Mod/Fem/_TaskPanelFemBeamSection.py similarity index 98% rename from src/Mod/Fem/_FemBeamSectionTaskPanel.py rename to src/Mod/Fem/_TaskPanelFemBeamSection.py index 4d3c498ad479..4c62c3f79707 100644 --- a/src/Mod/Fem/_FemBeamSectionTaskPanel.py +++ b/src/Mod/Fem/_TaskPanelFemBeamSection.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -__title__ = "_FemBeamSectionTaskPanel" +__title__ = "_TaskPanelFemBeamSection" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" @@ -31,7 +31,7 @@ from PySide import QtCore -class _FemBeamSectionTaskPanel: +class _TaskPanelFemBeamSection: '''The TaskPanel for editing References property of FemBeamSection objects''' def __init__(self, obj): FreeCADGui.Selection.clearSelection() diff --git a/src/Mod/Fem/_FemShellThicknessTaskPanel.py b/src/Mod/Fem/_TaskPanelFemShellThickness.py similarity index 98% rename from src/Mod/Fem/_FemShellThicknessTaskPanel.py rename to src/Mod/Fem/_TaskPanelFemShellThickness.py index 4138026e623e..4e6a83cd16c8 100644 --- a/src/Mod/Fem/_FemShellThicknessTaskPanel.py +++ b/src/Mod/Fem/_TaskPanelFemShellThickness.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -__title__ = "_FemShellThicknessTaskPanel" +__title__ = "_TaskPanelFemShellThickness" __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" @@ -31,7 +31,7 @@ from PySide import QtCore -class _FemShellThicknessTaskPanel: +class _TaskPanelFemShellThickness: '''The TaskPanel for editing References property of FemShellThickness objects''' def __init__(self, obj): FreeCADGui.Selection.clearSelection() diff --git a/src/Mod/Fem/_JobControlTaskPanel.py b/src/Mod/Fem/_TaskPanelJobControl.py similarity index 99% rename from src/Mod/Fem/_JobControlTaskPanel.py rename to src/Mod/Fem/_TaskPanelJobControl.py index a1c9c3b6adf5..eb893863f4b1 100644 --- a/src/Mod/Fem/_JobControlTaskPanel.py +++ b/src/Mod/Fem/_TaskPanelJobControl.py @@ -38,7 +38,7 @@ from PySide.QtGui import QApplication -class _JobControlTaskPanel: +class _TaskPanelJobControl: def __init__(self, analysis_object): self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalAnalysis.ui") self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem") diff --git a/src/Mod/Fem/_MechanicalMaterialTaskPanel.py b/src/Mod/Fem/_TaskPanelMechanicalMaterial.py similarity index 99% rename from src/Mod/Fem/_MechanicalMaterialTaskPanel.py rename to src/Mod/Fem/_TaskPanelMechanicalMaterial.py index 3a128bc85b4c..7b6909fb27b3 100644 --- a/src/Mod/Fem/_MechanicalMaterialTaskPanel.py +++ b/src/Mod/Fem/_TaskPanelMechanicalMaterial.py @@ -20,7 +20,7 @@ # * * # *************************************************************************** -__title__ = "_MechanicalMaterialTaskPanel" +__title__ = "_TaskPanelMechanicalMaterial" __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" @@ -31,7 +31,7 @@ from PySide import QtCore -class _MechanicalMaterialTaskPanel: +class _TaskPanelMechanicalMaterial: '''The editmode TaskPanel for MechanicalMaterial objects''' def __init__(self, obj): FreeCADGui.Selection.clearSelection() diff --git a/src/Mod/Fem/_ResultControlTaskPanel.py b/src/Mod/Fem/_TaskPanelResultControl.py similarity index 99% rename from src/Mod/Fem/_ResultControlTaskPanel.py rename to src/Mod/Fem/_TaskPanelResultControl.py index 40a9e1d27793..eba76441dc6a 100644 --- a/src/Mod/Fem/_ResultControlTaskPanel.py +++ b/src/Mod/Fem/_TaskPanelResultControl.py @@ -36,7 +36,7 @@ from PySide.QtGui import QApplication -class _ResultControlTaskPanel: +class _TaskPanelResultControl: '''The control for the displacement post-processing''' def __init__(self): self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/ShowDisplacement.ui") diff --git a/src/Mod/Fem/_ViewProviderFemAnalysis.py b/src/Mod/Fem/_ViewProviderFemAnalysis.py index 71766c7fc700..26ffb6ab7b9a 100644 --- a/src/Mod/Fem/_ViewProviderFemAnalysis.py +++ b/src/Mod/Fem/_ViewProviderFemAnalysis.py @@ -33,8 +33,8 @@ def doubleClicked(self, vobj): FemGui.setActiveAnalysis(self.Object) return True else: - import _JobControlTaskPanel - taskd = _JobControlTaskPanel(self.Object) + import _TaskPanelJobControl + taskd = _TaskPanelJobControl(self.Object) FreeCADGui.Control.showDialog(taskd) return True diff --git a/src/Mod/Fem/_ViewProviderFemBeamSection.py b/src/Mod/Fem/_ViewProviderFemBeamSection.py index 02e425136bca..1e7b8ad02352 100644 --- a/src/Mod/Fem/_ViewProviderFemBeamSection.py +++ b/src/Mod/Fem/_ViewProviderFemBeamSection.py @@ -57,8 +57,8 @@ def onChanged(self, vobj, prop): return def setEdit(self, vobj, mode=0): - import _FemBeamSectionTaskPanel - taskd = _FemBeamSectionTaskPanel._FemBeamSectionTaskPanel(self.Object) + import _TaskPanelFemBeamSection + taskd = _TaskPanelFemBeamSection._TaskPanelFemBeamSection(self.Object) taskd.obj = vobj.Object FreeCADGui.Control.showDialog(taskd) return True diff --git a/src/Mod/Fem/_ViewProviderFemShellThickness.py b/src/Mod/Fem/_ViewProviderFemShellThickness.py index 1148d020080a..b793cc44e94a 100644 --- a/src/Mod/Fem/_ViewProviderFemShellThickness.py +++ b/src/Mod/Fem/_ViewProviderFemShellThickness.py @@ -57,8 +57,8 @@ def onChanged(self, vobj, prop): return def setEdit(self, vobj, mode=0): - import _FemShellThicknessTaskPanel - taskd = _FemShellThicknessTaskPanel._FemShellThicknessTaskPanel(self.Object) + import _TaskPanelFemShellThickness + taskd = _TaskPanelFemShellThickness._TaskPanelFemShellThickness(self.Object) taskd.obj = vobj.Object FreeCADGui.Control.showDialog(taskd) return True diff --git a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py b/src/Mod/Fem/_ViewProviderMechanicalMaterial.py index 70dab58a38ba..120a653adf54 100644 --- a/src/Mod/Fem/_ViewProviderMechanicalMaterial.py +++ b/src/Mod/Fem/_ViewProviderMechanicalMaterial.py @@ -49,8 +49,8 @@ def onChanged(self, vobj, prop): return def setEdit(self, vobj, mode): - import _MechanicalMaterialTaskPanel - taskd = _MechanicalMaterialTaskPanel._MechanicalMaterialTaskPanel(self.Object) + import _TaskPanelMechanicalMaterial + taskd = _TaskPanelMechanicalMaterial._TaskPanelMechanicalMaterial(self.Object) taskd.obj = vobj.Object FreeCADGui.Control.showDialog(taskd) return True