From 74d86a456f49f2252a9572439ec6303285706868 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 8 Nov 2015 09:32:01 +0100 Subject: [PATCH] FEM: rename uis of python task panels to TaskPanelName --- src/Mod/Fem/App/CMakeLists.txt | 10 +++++----- src/Mod/Fem/CMakeLists.txt | 10 +++++----- src/Mod/Fem/Gui/CMakeLists.txt | 4 ++-- .../{FemBeamSection.ui => TaskPanelFemBeamSection.ui} | 0 ...ShellThickness.ui => TaskPanelFemShellThickness.ui} | 0 ...nicalAnalysis.ui => TaskPanelMechanicalAnalysis.ui} | 0 ...nicalMaterial.ui => TaskPanelMechanicalMaterial.ui} | 0 ...howDisplacement.ui => TaskPanelShowDisplacement.ui} | 0 src/Mod/Fem/_TaskPanelFemBeamSection.py | 2 +- src/Mod/Fem/_TaskPanelFemShellThickness.py | 2 +- src/Mod/Fem/_TaskPanelJobControl.py | 2 +- src/Mod/Fem/_TaskPanelMechanicalMaterial.py | 2 +- src/Mod/Fem/_TaskPanelResultControl.py | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) rename src/Mod/Fem/{FemBeamSection.ui => TaskPanelFemBeamSection.ui} (100%) rename src/Mod/Fem/{FemShellThickness.ui => TaskPanelFemShellThickness.ui} (100%) rename src/Mod/Fem/{MechanicalAnalysis.ui => TaskPanelMechanicalAnalysis.ui} (100%) rename src/Mod/Fem/{MechanicalMaterial.ui => TaskPanelMechanicalMaterial.ui} (100%) rename src/Mod/Fem/{ShowDisplacement.ui => TaskPanelShowDisplacement.ui} (100%) diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 1968b9c53c..e60d831b1e 100755 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -105,11 +105,11 @@ SET(FemScripts_SRCS MechanicalMaterial.py TestFem.py - FemBeamSection.ui - FemShellThickness.ui - MechanicalAnalysis.ui - MechanicalMaterial.ui - ShowDisplacement.ui + TaskPanelFemBeamSection.ui + TaskPanelFemShellThickness.ui + TaskPanelMechanicalAnalysis.ui + TaskPanelMechanicalMaterial.ui + TaskPanelShowDisplacement.ui ) #SOURCE_GROUP("Scripts" FILES ${FemScripts_SRCS}) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 74acffce92..de3db24555 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -28,7 +28,7 @@ INSTALL( _CommandMechanicalShowResult.py _TaskPanelResultControl.py - ShowDisplacement.ui + TaskPanelShowDisplacement.ui _FemAnalysis.py _ViewProviderFemAnalysis.py @@ -38,28 +38,28 @@ INSTALL( _CommandMechanicalJobControl.py _TaskPanelJobControl.py - MechanicalAnalysis.ui + TaskPanelMechanicalAnalysis.ui FemBeamSection.py _FemBeamSection.py _ViewProviderFemBeamSection.py _CommandFemBeamSection.py _TaskPanelFemBeamSection.py - FemBeamSection.ui + TaskPanelFemBeamSection.ui FemShellThickness.py _FemShellThickness.py _ViewProviderFemShellThickness.py _CommandFemShellThickness.py _TaskPanelFemShellThickness.py - FemShellThickness.ui + TaskPanelFemShellThickness.ui MechanicalMaterial.py _MechanicalMaterial.py _ViewProviderMechanicalMaterial.py _CommandMechanicalMaterial.py _TaskPanelMechanicalMaterial.py - MechanicalMaterial.ui + TaskPanelMechanicalMaterial.ui DESTINATION Mod/Fem diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index f1b286c8a6..157e7e5b3c 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -209,8 +209,8 @@ fc_target_copy_resource(FemGui ${CMAKE_SOURCE_DIR}/src/Mod/Fem ${CMAKE_BINARY_DIR}/Mod/Fem InitGui.py - MechanicalMaterial.ui - MechanicalAnalysis.ui + TaskPanelMechanicalMaterial.ui + TaskPanelMechanicalAnalysis.ui ) SET(FemGuiIcon_SVG diff --git a/src/Mod/Fem/FemBeamSection.ui b/src/Mod/Fem/TaskPanelFemBeamSection.ui similarity index 100% rename from src/Mod/Fem/FemBeamSection.ui rename to src/Mod/Fem/TaskPanelFemBeamSection.ui diff --git a/src/Mod/Fem/FemShellThickness.ui b/src/Mod/Fem/TaskPanelFemShellThickness.ui similarity index 100% rename from src/Mod/Fem/FemShellThickness.ui rename to src/Mod/Fem/TaskPanelFemShellThickness.ui diff --git a/src/Mod/Fem/MechanicalAnalysis.ui b/src/Mod/Fem/TaskPanelMechanicalAnalysis.ui similarity index 100% rename from src/Mod/Fem/MechanicalAnalysis.ui rename to src/Mod/Fem/TaskPanelMechanicalAnalysis.ui diff --git a/src/Mod/Fem/MechanicalMaterial.ui b/src/Mod/Fem/TaskPanelMechanicalMaterial.ui similarity index 100% rename from src/Mod/Fem/MechanicalMaterial.ui rename to src/Mod/Fem/TaskPanelMechanicalMaterial.ui diff --git a/src/Mod/Fem/ShowDisplacement.ui b/src/Mod/Fem/TaskPanelShowDisplacement.ui similarity index 100% rename from src/Mod/Fem/ShowDisplacement.ui rename to src/Mod/Fem/TaskPanelShowDisplacement.ui diff --git a/src/Mod/Fem/_TaskPanelFemBeamSection.py b/src/Mod/Fem/_TaskPanelFemBeamSection.py index 4c62c3f797..b8ed855803 100644 --- a/src/Mod/Fem/_TaskPanelFemBeamSection.py +++ b/src/Mod/Fem/_TaskPanelFemBeamSection.py @@ -39,7 +39,7 @@ class _TaskPanelFemBeamSection: self.obj = obj self.references = self.obj.References - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/FemBeamSection.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemBeamSection.ui") QtCore.QObject.connect(self.form.pushButton_Reference, QtCore.SIGNAL("clicked()"), self.add_references) self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked) diff --git a/src/Mod/Fem/_TaskPanelFemShellThickness.py b/src/Mod/Fem/_TaskPanelFemShellThickness.py index 4e6a83cd16..36f1e1d2c4 100644 --- a/src/Mod/Fem/_TaskPanelFemShellThickness.py +++ b/src/Mod/Fem/_TaskPanelFemShellThickness.py @@ -39,7 +39,7 @@ class _TaskPanelFemShellThickness: self.obj = obj self.references = self.obj.References - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/FemShellThickness.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelFemShellThickness.ui") QtCore.QObject.connect(self.form.pushButton_Reference, QtCore.SIGNAL("clicked()"), self.add_references) self.form.list_References.setContextMenuPolicy(QtCore.Qt.CustomContextMenu) self.form.list_References.connect(self.form.list_References, QtCore.SIGNAL("customContextMenuRequested(QPoint)"), self.references_list_right_clicked) diff --git a/src/Mod/Fem/_TaskPanelJobControl.py b/src/Mod/Fem/_TaskPanelJobControl.py index eb893863f4..8566501834 100644 --- a/src/Mod/Fem/_TaskPanelJobControl.py +++ b/src/Mod/Fem/_TaskPanelJobControl.py @@ -40,7 +40,7 @@ if FreeCAD.GuiUp: class _TaskPanelJobControl: def __init__(self, analysis_object): - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalAnalysis.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelMechanicalAnalysis.ui") self.fem_prefs = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Fem") ccx_binary = self.fem_prefs.GetString("ccxBinaryPath", "") if ccx_binary: diff --git a/src/Mod/Fem/_TaskPanelMechanicalMaterial.py b/src/Mod/Fem/_TaskPanelMechanicalMaterial.py index 7b6909fb27..acc5574832 100644 --- a/src/Mod/Fem/_TaskPanelMechanicalMaterial.py +++ b/src/Mod/Fem/_TaskPanelMechanicalMaterial.py @@ -41,7 +41,7 @@ class _TaskPanelMechanicalMaterial: self.references = self.obj.References self.references_shape_type = None - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/MechanicalMaterial.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelMechanicalMaterial.ui") QtCore.QObject.connect(self.form.pushButton_MatWeb, QtCore.SIGNAL("clicked()"), self.goMatWeb) QtCore.QObject.connect(self.form.cb_materials, QtCore.SIGNAL("activated(int)"), self.choose_material) QtCore.QObject.connect(self.form.input_fd_young_modulus, QtCore.SIGNAL("valueChanged(double)"), self.ym_changed) diff --git a/src/Mod/Fem/_TaskPanelResultControl.py b/src/Mod/Fem/_TaskPanelResultControl.py index eba76441dc..515da84058 100644 --- a/src/Mod/Fem/_TaskPanelResultControl.py +++ b/src/Mod/Fem/_TaskPanelResultControl.py @@ -39,7 +39,7 @@ if FreeCAD.GuiUp: class _TaskPanelResultControl: '''The control for the displacement post-processing''' def __init__(self): - self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/ShowDisplacement.ui") + self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Fem/TaskPanelShowDisplacement.ui") #Connect Signals and Slots QtCore.QObject.connect(self.form.rb_none, QtCore.SIGNAL("toggled(bool)"), self.none_selected)