diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 42757e5efd48..2025ba837648 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -106,27 +106,27 @@ SET(FemObjectsScripts_SRCS SET(FemGuiScripts_SRCS PyGui/FemCommands.py PyGui/__init__.py - PyGui/_CommandAnalysis.py - PyGui/_CommandBeamSection.py - PyGui/_CommandConstraintSelfWeight.py - PyGui/_CommandFEMMesh2Mesh.py - PyGui/_CommandFluidSection.py - PyGui/_CommandMaterialMechanicalNonlinear.py - PyGui/_CommandMaterialSolid.py - PyGui/_CommandMaterialFluid.py - PyGui/_CommandMeshGmshFromShape.py - PyGui/_CommandMeshNetgenFromShape.py - PyGui/_CommandMeshClear.py - PyGui/_CommandMeshGroup.py - PyGui/_CommandMeshPrintInfo.py - PyGui/_CommandMeshRegion.py - PyGui/_CommandResultShow.py - PyGui/_CommandResultsPurge.py - PyGui/_CommandShellThickness.py - PyGui/_CommandSolverCalculix.py - PyGui/_CommandSolverControl.py - PyGui/_CommandSolverRun.py - PyGui/_CommandSolverZ88.py + PyGui/_CommandFemAnalysis.py + PyGui/_CommandFemBeamSection.py + PyGui/_CommandFemConstraintSelfWeight.py + PyGui/_CommandFemFluidSection.py + PyGui/_CommandFemMaterialMechanicalNonlinear.py + PyGui/_CommandFemMaterialSolid.py + PyGui/_CommandFemMaterialFluid.py + PyGui/_CommandFemMesh2Mesh.py + PyGui/_CommandFemMeshGmshFromShape.py + PyGui/_CommandFemMeshNetgenFromShape.py + PyGui/_CommandFemMeshClear.py + PyGui/_CommandFemMeshGroup.py + PyGui/_CommandFemMeshPrintInfo.py + PyGui/_CommandFemMeshRegion.py + PyGui/_CommandFemResultShow.py + PyGui/_CommandFemResultsPurge.py + PyGui/_CommandFemShellThickness.py + PyGui/_CommandFemSolverCalculix.py + PyGui/_CommandFemSolverControl.py + PyGui/_CommandFemSolverRun.py + PyGui/_CommandFemSolverZ88.py PyGui/_TaskPanelFemBeamSection.py PyGui/_TaskPanelFemFluidSection.py PyGui/_TaskPanelFemMeshGmsh.py diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index dbf8619519a1..e9499b0995c7 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -67,27 +67,27 @@ INSTALL( FILES PyGui/FemCommands.py PyGui/__init__.py - PyGui/_CommandAnalysis.py - PyGui/_CommandBeamSection.py - PyGui/_CommandConstraintSelfWeight.py - PyGui/_CommandFEMMesh2Mesh.py - PyGui/_CommandFluidSection.py - PyGui/_CommandMaterialMechanicalNonlinear.py - PyGui/_CommandMaterialSolid.py - PyGui/_CommandMaterialFluid.py - PyGui/_CommandMeshClear.py - PyGui/_CommandMeshGmshFromShape.py - PyGui/_CommandMeshGroup.py - PyGui/_CommandMeshNetgenFromShape.py - PyGui/_CommandMeshPrintInfo.py - PyGui/_CommandMeshRegion.py - PyGui/_CommandResultShow.py - PyGui/_CommandResultsPurge.py - PyGui/_CommandShellThickness.py - PyGui/_CommandSolverCalculix.py - PyGui/_CommandSolverControl.py - PyGui/_CommandSolverRun.py - PyGui/_CommandSolverZ88.py + PyGui/_CommandFemAnalysis.py + PyGui/_CommandFemBeamSection.py + PyGui/_CommandFemConstraintSelfWeight.py + PyGui/_CommandFemFluidSection.py + PyGui/_CommandFemMaterialMechanicalNonlinear.py + PyGui/_CommandFemMaterialSolid.py + PyGui/_CommandFemMaterialFluid.py + PyGui/_CommandFemMesh2Mesh.py + PyGui/_CommandFemMeshClear.py + PyGui/_CommandFemMeshGmshFromShape.py + PyGui/_CommandFemMeshGroup.py + PyGui/_CommandFemMeshNetgenFromShape.py + PyGui/_CommandFemMeshPrintInfo.py + PyGui/_CommandFemMeshRegion.py + PyGui/_CommandFemResultShow.py + PyGui/_CommandFemResultsPurge.py + PyGui/_CommandFemShellThickness.py + PyGui/_CommandFemSolverCalculix.py + PyGui/_CommandFemSolverControl.py + PyGui/_CommandFemSolverRun.py + PyGui/_CommandFemSolverZ88.py PyGui/_TaskPanelFemBeamSection.py PyGui/_TaskPanelFemFluidSection.py PyGui/_TaskPanelFemMeshGmsh.py diff --git a/src/Mod/Fem/InitGui.py b/src/Mod/Fem/InitGui.py index 88f8b5f6229e..b8c3381da93b 100644 --- a/src/Mod/Fem/InitGui.py +++ b/src/Mod/Fem/InitGui.py @@ -45,27 +45,28 @@ def Initialize(self): import Fem import FemGui - import PyGui._CommandFEMMesh2Mesh - import PyGui._CommandAnalysis - import PyGui._CommandShellThickness - import PyGui._CommandBeamSection - import PyGui._CommandFluidSection - import PyGui._CommandMaterialSolid - import PyGui._CommandMaterialFluid - import PyGui._CommandMaterialMechanicalNonlinear - import PyGui._CommandMeshClear - import PyGui._CommandMeshGmshFromShape - import PyGui._CommandMeshGroup - import PyGui._CommandMeshNetgenFromShape - import PyGui._CommandMeshPrintInfo - import PyGui._CommandMeshRegion - import PyGui._CommandResultShow - import PyGui._CommandResultsPurge - import PyGui._CommandSolverCalculix - import PyGui._CommandSolverControl - import PyGui._CommandSolverRun - import PyGui._CommandSolverZ88 - import PyGui._CommandConstraintSelfWeight + import PyGui._CommandFemAnalysis + import PyGui._CommandFemConstraintSelfWeight + import PyGui._CommandFemMaterialSolid + import PyGui._CommandFemMaterialFluid + import PyGui._CommandFemMaterialMechanicalNonlinear + import PyGui._CommandFemMesh2Mesh + import PyGui._CommandFemMeshClear + import PyGui._CommandFemMeshGmshFromShape + import PyGui._CommandFemMeshGroup + import PyGui._CommandFemMeshNetgenFromShape + import PyGui._CommandFemMeshPrintInfo + import PyGui._CommandFemMeshRegion + import PyGui._CommandFemResultShow + import PyGui._CommandFemResultsPurge + import PyGui._CommandFemSolverCalculix + import PyGui._CommandFemSolverControl + import PyGui._CommandFemSolverRun + import PyGui._CommandFemSolverZ88 + + import PyGui._CommandFemShellThickness + import PyGui._CommandFemBeamSection + import PyGui._CommandFemFluidSection def GetClassName(self): return "FemGui::Workbench" diff --git a/src/Mod/Fem/PyGui/_CommandAnalysis.py b/src/Mod/Fem/PyGui/_CommandFemAnalysis.py similarity index 94% rename from src/Mod/Fem/PyGui/_CommandAnalysis.py rename to src/Mod/Fem/PyGui/_CommandFemAnalysis.py index 2066e9792cd1..be4cfec45dd3 100644 --- a/src/Mod/Fem/PyGui/_CommandAnalysis.py +++ b/src/Mod/Fem/PyGui/_CommandFemAnalysis.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandAnalysis +## @package CommandFemAnalysis # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandAnalysis(FemCommands): +class _CommandFemAnalysis(FemCommands): "the FEM_Analysis command definition" def __init__(self): - super(_CommandAnalysis, self).__init__() + super(_CommandFemAnalysis, self).__init__() self.resources = {'Pixmap': 'fem-analysis', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_Analysis", "Analysis container"), 'Accel': "N, A", @@ -57,4 +57,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [App.activeDocument()." + sel[0].Name + "]") FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_Analysis', _CommandAnalysis()) +FreeCADGui.addCommand('FEM_Analysis', _CommandFemAnalysis()) diff --git a/src/Mod/Fem/PyGui/_CommandBeamSection.py b/src/Mod/Fem/PyGui/_CommandFemBeamSection.py similarity index 92% rename from src/Mod/Fem/PyGui/_CommandBeamSection.py rename to src/Mod/Fem/PyGui/_CommandFemBeamSection.py index 5be7f7da0083..42ceccb8755a 100644 --- a/src/Mod/Fem/PyGui/_CommandBeamSection.py +++ b/src/Mod/Fem/PyGui/_CommandFemBeamSection.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandBeamSection +## @package CommandFemBeamSection # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandBeamSection(FemCommands): +class _CommandFemBeamSection(FemCommands): "The FEM_BeamSection command definition" def __init__(self): - super(_CommandBeamSection, self).__init__() + super(_CommandFemBeamSection, self).__init__() self.resources = {'Pixmap': 'fem-beam-section', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_BeamSection", "Beam cross section"), 'Accel': "C, B", @@ -49,4 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeBeamSection()]") -FreeCADGui.addCommand('FEM_BeamSection', _CommandBeamSection()) +FreeCADGui.addCommand('FEM_BeamSection', _CommandFemBeamSection()) diff --git a/src/Mod/Fem/PyGui/_CommandConstraintSelfWeight.py b/src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py similarity index 91% rename from src/Mod/Fem/PyGui/_CommandConstraintSelfWeight.py rename to src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py index 44d97fd43fda..03e5fe06d6dc 100644 --- a/src/Mod/Fem/PyGui/_CommandConstraintSelfWeight.py +++ b/src/Mod/Fem/PyGui/_CommandFemConstraintSelfWeight.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandConstraintSelfWeight +## @package CommandFemConstraintSelfWeight # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandConstraintSelfWeight(FemCommands): +class _CommandFemConstraintSelfWeight(FemCommands): "The FEM_ConstraintSelfWeight command definition" def __init__(self): - super(_CommandConstraintSelfWeight, self).__init__() + super(_CommandFemConstraintSelfWeight, self).__init__() self.resources = {'Pixmap': 'fem-constraint-selfweight', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ConstraintSelfWeight", "Constraint self weigt"), 'Accel': "C, W", @@ -49,4 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeConstraintSelfWeight()]") -FreeCADGui.addCommand('FEM_ConstraintSelfWeight', _CommandConstraintSelfWeight()) +FreeCADGui.addCommand('FEM_ConstraintSelfWeight', _CommandFemConstraintSelfWeight()) diff --git a/src/Mod/Fem/PyGui/_CommandFluidSection.py b/src/Mod/Fem/PyGui/_CommandFemFluidSection.py similarity index 92% rename from src/Mod/Fem/PyGui/_CommandFluidSection.py rename to src/Mod/Fem/PyGui/_CommandFemFluidSection.py index 2d85aa68da61..c205a7692bf2 100644 --- a/src/Mod/Fem/PyGui/_CommandFluidSection.py +++ b/src/Mod/Fem/PyGui/_CommandFemFluidSection.py @@ -25,7 +25,7 @@ __author__ = "Ofentse Kgoa" __url__ = "http://www.freecadweb.org" -## @package CommandFluidSection +## @package CommandFemFluidSection # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandFluidSection(FemCommands): +class _CommandFemFluidSection(FemCommands): "The FEM_FluidSection command definition" def __init__(self): - super(_CommandFluidSection, self).__init__() + super(_CommandFemFluidSection, self).__init__() self.resources = {'Pixmap': 'fem-fluid-section', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_FluidSection", "Fluid section for 1D flow"), 'Accel': "C, B", @@ -50,4 +50,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeFemFluidSection()]") -FreeCADGui.addCommand('FEM_FluidSection', _CommandFluidSection()) +FreeCADGui.addCommand('FEM_FluidSection', _CommandFemFluidSection()) diff --git a/src/Mod/Fem/PyGui/_CommandMaterialFluid.py b/src/Mod/Fem/PyGui/_CommandFemMaterialFluid.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMaterialFluid.py rename to src/Mod/Fem/PyGui/_CommandFemMaterialFluid.py index 080e804985ed..7e68b55d79b2 100644 --- a/src/Mod/Fem/PyGui/_CommandMaterialFluid.py +++ b/src/Mod/Fem/PyGui/_CommandFemMaterialFluid.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMaterial +## @package CommandFemMaterialFluid # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandMaterialFluid(FemCommands): +class _CommandFemMaterialFluid(FemCommands): "the FEM_MaterialFluid command definition" def __init__(self): - super(_CommandMaterialFluid, self).__init__() + super(_CommandFemMaterialFluid, self).__init__() self.resources = {'Pixmap': 'fem-material-fluid', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MaterialFluid", "FEM material for Fluid"), 'Accel': "M, M", @@ -55,4 +55,4 @@ def Activated(self): FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") -FreeCADGui.addCommand('FEM_MaterialFluid', _CommandMaterialFluid()) +FreeCADGui.addCommand('FEM_MaterialFluid', _CommandFemMaterialFluid()) diff --git a/src/Mod/Fem/PyGui/_CommandMaterialMechanicalNonlinear.py b/src/Mod/Fem/PyGui/_CommandFemMaterialMechanicalNonlinear.py similarity index 95% rename from src/Mod/Fem/PyGui/_CommandMaterialMechanicalNonlinear.py rename to src/Mod/Fem/PyGui/_CommandFemMaterialMechanicalNonlinear.py index 78c25afab607..a8da86cc5cac 100644 --- a/src/Mod/Fem/PyGui/_CommandMaterialMechanicalNonlinear.py +++ b/src/Mod/Fem/PyGui/_CommandFemMaterialMechanicalNonlinear.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMaterialMechanicalNonLinear +## @package CommandFemMaterialMechanicalNonLinear # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandMaterialMechanicalNonlinear(FemCommands): +class _CommandFemMaterialMechanicalNonlinear(FemCommands): "The FEM_MaterialMechanicalNonlinear command definition" def __init__(self): - super(_CommandMaterialMechanicalNonlinear, self).__init__() + super(_CommandFemMaterialMechanicalNonlinear, self).__init__() self.resources = {'Pixmap': 'fem-material-nonlinear', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MaterialMechanicalNonlinear", "Nonlinear mechanical material"), 'Accel': "C, W", @@ -74,4 +74,4 @@ def Activated(self): if solver_object and solver_object.SolverType == 'FemSolverCalculix': solver_object.MaterialNonlinearity = "nonlinear" -FreeCADGui.addCommand('FEM_MaterialMechanicalNonlinear', _CommandMaterialMechanicalNonlinear()) +FreeCADGui.addCommand('FEM_MaterialMechanicalNonlinear', _CommandFemMaterialMechanicalNonlinear()) diff --git a/src/Mod/Fem/PyGui/_CommandMaterialSolid.py b/src/Mod/Fem/PyGui/_CommandFemMaterialSolid.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMaterialSolid.py rename to src/Mod/Fem/PyGui/_CommandFemMaterialSolid.py index 870f077eb8de..08a8c849b0a9 100644 --- a/src/Mod/Fem/PyGui/_CommandMaterialSolid.py +++ b/src/Mod/Fem/PyGui/_CommandFemMaterialSolid.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMaterial +## @package CommandFemMaterialSolid # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandMaterialSolid(FemCommands): +class _CommandFemMaterialSolid(FemCommands): "the FEM_MaterialSolid command definition" def __init__(self): - super(_CommandMaterialSolid, self).__init__() + super(_CommandFemMaterialSolid, self).__init__() self.resources = {'Pixmap': 'fem-material', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MaterialSolid", "FEM material for solid"), 'Accel': "M, M", @@ -55,4 +55,4 @@ def Activated(self): FreeCADGui.doCommand("Gui.activeDocument().setEdit(App.ActiveDocument.ActiveObject.Name)") -FreeCADGui.addCommand('FEM_MaterialSolid', _CommandMaterialSolid()) +FreeCADGui.addCommand('FEM_MaterialSolid', _CommandFemMaterialSolid()) diff --git a/src/Mod/Fem/PyGui/_CommandFEMMesh2Mesh.py b/src/Mod/Fem/PyGui/_CommandFemMesh2Mesh.py similarity index 100% rename from src/Mod/Fem/PyGui/_CommandFEMMesh2Mesh.py rename to src/Mod/Fem/PyGui/_CommandFemMesh2Mesh.py diff --git a/src/Mod/Fem/PyGui/_CommandMeshClear.py b/src/Mod/Fem/PyGui/_CommandFemMeshClear.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMeshClear.py rename to src/Mod/Fem/PyGui/_CommandFemMeshClear.py index cbe5ebb2f319..c0e09c016563 100644 --- a/src/Mod/Fem/PyGui/_CommandMeshClear.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshClear.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMeshClear +## @package CommandFemMeshClear # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandMeshClear(FemCommands): +class _CommandFemMeshClear(FemCommands): "the FEM_MeshClear command definition" def __init__(self): - super(_CommandMeshClear, self).__init__() + super(_CommandFemMeshClear, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-clear-mesh', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshClear", "Clear FEM mesh"), # 'Accel': "Z, Z", @@ -53,4 +53,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_MeshClear', _CommandMeshClear()) +FreeCADGui.addCommand('FEM_MeshClear', _CommandFemMeshClear()) diff --git a/src/Mod/Fem/PyGui/_CommandMeshGmshFromShape.py b/src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMeshGmshFromShape.py rename to src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py index ef5116899b67..d57e6e13251b 100644 --- a/src/Mod/Fem/PyGui/_CommandMeshGmshFromShape.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshGmshFromShape.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMeshGmshFromShape +## @package CommandFemMeshGmshFromShape # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandMeshGmshFromShape(FemCommands): +class _CommandFemMeshGmshFromShape(FemCommands): # the FEM_MeshGmshFromShape command definition def __init__(self): - super(_CommandMeshGmshFromShape, self).__init__() + super(_CommandFemMeshGmshFromShape, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-gmsh-from-shape', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshGmshFromShape", "FEM mesh from shape by GMSH"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_MeshGmshFromShape", "Create a FEM mesh from a shape by GMSH mesher")} @@ -61,4 +61,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_MeshGmshFromShape', _CommandMeshGmshFromShape()) +FreeCADGui.addCommand('FEM_MeshGmshFromShape', _CommandFemMeshGmshFromShape()) diff --git a/src/Mod/Fem/PyGui/_CommandMeshGroup.py b/src/Mod/Fem/PyGui/_CommandFemMeshGroup.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMeshGroup.py rename to src/Mod/Fem/PyGui/_CommandFemMeshGroup.py index dec827b1f6ad..a9ea77b29a8b 100644 --- a/src/Mod/Fem/PyGui/_CommandMeshGroup.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshGroup.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMeshGroup +## @package CommandFemMeshGroup # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandMeshGroup(FemCommands): +class _CommandFemMeshGroup(FemCommands): "The FEM_MeshGroup command definition" def __init__(self): - super(_CommandMeshGroup, self).__init__() + super(_CommandFemMeshGroup, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-from-shape', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshGroup", "FEM mesh group"), 'Accel': "M, G", @@ -54,4 +54,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_MeshGroup', _CommandMeshGroup()) +FreeCADGui.addCommand('FEM_MeshGroup', _CommandFemMeshGroup()) diff --git a/src/Mod/Fem/PyGui/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMeshNetgenFromShape.py rename to src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py index 23d0dbb5cbe8..abfcdfe49678 100644 --- a/src/Mod/Fem/PyGui/_CommandMeshNetgenFromShape.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshNetgenFromShape.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandMeshNetgenFromShape +## @package CommandFemMeshNetgenFromShape # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandMeshNetgenFromShape(FemCommands): +class _CommandFemMeshNetgenFromShape(FemCommands): # the FEM_MeshNetgenFromShape command definition def __init__(self): - super(_CommandMeshNetgenFromShape, self).__init__() + super(_CommandFemMeshNetgenFromShape, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-netgen-from-shape', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshFromShape", "FEM mesh from shape by Netgen"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("FEM_MeshFromShape", "Create a FEM volume mesh from a solid or face shape by Netgen internal mesher")} @@ -59,4 +59,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_MeshNetgenFromShape', _CommandMeshNetgenFromShape()) +FreeCADGui.addCommand('FEM_MeshNetgenFromShape', _CommandFemMeshNetgenFromShape()) diff --git a/src/Mod/Fem/PyGui/_CommandMeshPrintInfo.py b/src/Mod/Fem/PyGui/_CommandFemMeshPrintInfo.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMeshPrintInfo.py rename to src/Mod/Fem/PyGui/_CommandFemMeshPrintInfo.py index 060de1be36e2..7cfd6b446365 100644 --- a/src/Mod/Fem/PyGui/_CommandMeshPrintInfo.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshPrintInfo.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMeshPrintInfo +## @package CommandFemMeshPrintInfo # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandMeshPrintInfo(FemCommands): +class _CommandFemMeshPrintInfo(FemCommands): "the FEM_MeshPrintInfo command definition" def __init__(self): - super(_CommandMeshPrintInfo, self).__init__() + super(_CommandFemMeshPrintInfo, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-print-info', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshPrintInfo", "Print FEM mesh info"), # 'Accel': "Z, Z", @@ -55,4 +55,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_MeshPrintInfo', _CommandMeshPrintInfo()) +FreeCADGui.addCommand('FEM_MeshPrintInfo', _CommandFemMeshPrintInfo()) diff --git a/src/Mod/Fem/PyGui/_CommandMeshRegion.py b/src/Mod/Fem/PyGui/_CommandFemMeshRegion.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandMeshRegion.py rename to src/Mod/Fem/PyGui/_CommandFemMeshRegion.py index f5fffcdec3a9..17475a997485 100644 --- a/src/Mod/Fem/PyGui/_CommandMeshRegion.py +++ b/src/Mod/Fem/PyGui/_CommandFemMeshRegion.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandMeshRegion +## @package CommandFemMeshRegion # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandMeshRegion(FemCommands): +class _CommandFemMeshRegion(FemCommands): "The FEM_MeshRegion command definition" def __init__(self): - super(_CommandMeshRegion, self).__init__() + super(_CommandFemMeshRegion, self).__init__() self.resources = {'Pixmap': 'fem-femmesh-region', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_MeshRegion", "FEM mesh region"), 'Accel': "M, R", @@ -54,4 +54,4 @@ def Activated(self): FreeCADGui.Selection.clearSelection() -FreeCADGui.addCommand('FEM_MeshRegion', _CommandMeshRegion()) +FreeCADGui.addCommand('FEM_MeshRegion', _CommandFemMeshRegion()) diff --git a/src/Mod/Fem/PyGui/_CommandResultShow.py b/src/Mod/Fem/PyGui/_CommandFemResultShow.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandResultShow.py rename to src/Mod/Fem/PyGui/_CommandFemResultShow.py index 1de3c3ab5534..7bf6dfcbeb66 100644 --- a/src/Mod/Fem/PyGui/_CommandResultShow.py +++ b/src/Mod/Fem/PyGui/_CommandFemResultShow.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel, Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandResultShow +## @package CommandFemResultShow # \ingroup FEM # \brief FreeCAD Command show results for FEM workbench @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandResultShow(FemCommands): +class _CommandFemResultShow(FemCommands): "the FEM_ResultShow command definition" def __init__(self): - super(_CommandResultShow, self).__init__() + super(_CommandFemResultShow, self).__init__() self.resources = {'Pixmap': 'fem-result', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ResultShow", "Show result"), 'Accel': "S, R", @@ -51,4 +51,4 @@ def Activated(self): result_object.ViewObject.startEditing() -FreeCADGui.addCommand('FEM_ResultShow', _CommandResultShow()) +FreeCADGui.addCommand('FEM_ResultShow', _CommandFemResultShow()) diff --git a/src/Mod/Fem/PyGui/_CommandResultsPurge.py b/src/Mod/Fem/PyGui/_CommandFemResultsPurge.py similarity index 92% rename from src/Mod/Fem/PyGui/_CommandResultsPurge.py rename to src/Mod/Fem/PyGui/_CommandFemResultsPurge.py index c1889509d949..6b7fa8a784cb 100644 --- a/src/Mod/Fem/PyGui/_CommandResultsPurge.py +++ b/src/Mod/Fem/PyGui/_CommandFemResultsPurge.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandResultsPurge +## @package CommandFemResultsPurge # \ingroup FEM from FemCommands import FemCommands @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandResultsPurge(FemCommands): +class _CommandFemResultsPurge(FemCommands): # the FEM_ResultsPurge command definition def __init__(self): - super(_CommandResultsPurge, self).__init__() + super(_CommandFemResultsPurge, self).__init__() self.resources = {'Pixmap': 'fem-purge-results', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ResultsPurge", "Purge results"), 'Accel': "S, S", @@ -49,4 +49,4 @@ def Activated(self): self.hide_meshes_show_parts_constraints() -FreeCADGui.addCommand('FEM_ResultsPurge', _CommandResultsPurge()) +FreeCADGui.addCommand('FEM_ResultsPurge', _CommandFemResultsPurge()) diff --git a/src/Mod/Fem/PyGui/_CommandShellThickness.py b/src/Mod/Fem/PyGui/_CommandFemShellThickness.py similarity index 92% rename from src/Mod/Fem/PyGui/_CommandShellThickness.py rename to src/Mod/Fem/PyGui/_CommandFemShellThickness.py index 481aa8f474e2..716e87d3b16e 100644 --- a/src/Mod/Fem/PyGui/_CommandShellThickness.py +++ b/src/Mod/Fem/PyGui/_CommandFemShellThickness.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandShellThickness +## @package CommandFemShellThickness # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandShellThickness(FemCommands): +class _CommandFemShellThickness(FemCommands): "The FEM_ShellThickness command definition" def __init__(self): - super(_CommandShellThickness, self).__init__() + super(_CommandFemShellThickness, self).__init__() self.resources = {'Pixmap': 'fem-shell-thickness', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_ShellThickness", "Shell plate thickness"), 'Accel': "C, S", @@ -49,4 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeShellThickness()]") -FreeCADGui.addCommand('FEM_ShellThickness', _CommandShellThickness()) +FreeCADGui.addCommand('FEM_ShellThickness', _CommandFemShellThickness()) diff --git a/src/Mod/Fem/PyGui/_CommandSolverCalculix.py b/src/Mod/Fem/PyGui/_CommandFemSolverCalculix.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandSolverCalculix.py rename to src/Mod/Fem/PyGui/_CommandFemSolverCalculix.py index a41fb7d5f394..67c2e1075fbe 100644 --- a/src/Mod/Fem/PyGui/_CommandSolverCalculix.py +++ b/src/Mod/Fem/PyGui/_CommandFemSolverCalculix.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandSolverCalculix +## @package CommandFemSolverCalculix # \ingroup FEM import FreeCAD @@ -34,10 +34,10 @@ from PySide import QtCore -class _CommandSolverCalculix(FemCommands): +class _CommandFemSolverCalculix(FemCommands): "The FEM_SolverCalculix command definition" def __init__(self): - super(_CommandSolverCalculix, self).__init__() + super(_CommandFemSolverCalculix, self).__init__() self.resources = {'Pixmap': 'fem-solver', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverCalculix", "Solver CalculiX"), 'Accel': "S, C", @@ -59,4 +59,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeSolverCalculix()]") -FreeCADGui.addCommand('FEM_SolverCalculix', _CommandSolverCalculix()) +FreeCADGui.addCommand('FEM_SolverCalculix', _CommandFemSolverCalculix()) diff --git a/src/Mod/Fem/PyGui/_CommandSolverControl.py b/src/Mod/Fem/PyGui/_CommandFemSolverControl.py similarity index 92% rename from src/Mod/Fem/PyGui/_CommandSolverControl.py rename to src/Mod/Fem/PyGui/_CommandFemSolverControl.py index d052608e3c25..eefff1aacc0a 100644 --- a/src/Mod/Fem/PyGui/_CommandSolverControl.py +++ b/src/Mod/Fem/PyGui/_CommandFemSolverControl.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandSolverControl +## @package CommandFemSolverControl # \ingroup FEM from FemCommands import FemCommands @@ -32,10 +32,10 @@ from PySide import QtCore -class _CommandSolverControl(FemCommands): +class _CommandFemSolverControl(FemCommands): "the FEM_SolverControl command definition" def __init__(self): - super(_CommandSolverControl, self).__init__() + super(_CommandFemSolverControl, self).__init__() self.resources = {'Pixmap': 'fem-control-solver', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverControl", "Solver job control"), 'Accel': "S, C", @@ -47,4 +47,4 @@ def Activated(self): FreeCADGui.ActiveDocument.setEdit(solver_obj, 0) -FreeCADGui.addCommand('FEM_SolverControl', _CommandSolverControl()) +FreeCADGui.addCommand('FEM_SolverControl', _CommandFemSolverControl()) diff --git a/src/Mod/Fem/PyGui/_CommandSolverRun.py b/src/Mod/Fem/PyGui/_CommandFemSolverRun.py similarity index 95% rename from src/Mod/Fem/PyGui/_CommandSolverRun.py rename to src/Mod/Fem/PyGui/_CommandFemSolverRun.py index 5f6690844c12..f97dd78da79a 100644 --- a/src/Mod/Fem/PyGui/_CommandSolverRun.py +++ b/src/Mod/Fem/PyGui/_CommandFemSolverRun.py @@ -24,7 +24,7 @@ __author__ = "Juergen Riegel" __url__ = "http://www.freecadweb.org" -## @package CommandSolverRun +## @package CommandFemSolverRun # \ingroup FEM from FemCommands import FemCommands @@ -32,10 +32,10 @@ from PySide import QtCore, QtGui -class _CommandSolverRun(FemCommands): +class _CommandFemSolverRun(FemCommands): # the FEM_SolverRun command definition def __init__(self): - super(_CommandSolverRun, self).__init__() + super(_CommandFemSolverRun, self).__init__() self.resources = {'Pixmap': 'fem-run-solver', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverRun", "Run solver calculations"), 'Accel': "R, C", @@ -77,4 +77,4 @@ def load_results(ret_code): QtGui.QMessageBox.critical(None, "Not known solver type", message) -FreeCADGui.addCommand('FEM_SolverRun', _CommandSolverRun)) +FreeCADGui.addCommand('FEM_SolverRun', _CommandFemSolverRun()) diff --git a/src/Mod/Fem/PyGui/_CommandSolverZ88.py b/src/Mod/Fem/PyGui/_CommandFemSolverZ88.py similarity index 93% rename from src/Mod/Fem/PyGui/_CommandSolverZ88.py rename to src/Mod/Fem/PyGui/_CommandFemSolverZ88.py index a0ee100eed9c..775d7b09d84f 100644 --- a/src/Mod/Fem/PyGui/_CommandSolverZ88.py +++ b/src/Mod/Fem/PyGui/_CommandFemSolverZ88.py @@ -24,7 +24,7 @@ __author__ = "Bernd Hahnebach" __url__ = "http://www.freecadweb.org" -## @package CommandSolverZ88 +## @package CommandFemSolverZ88 # \ingroup FEM import FreeCAD @@ -33,10 +33,10 @@ from PySide import QtCore -class _CommandSolverZ88(FemCommands): +class _CommandFemSolverZ88(FemCommands): "The FEM_SolverZ88 command definition" def __init__(self): - super(_CommandSolverZ88, self).__init__() + super(_CommandFemSolverZ88, self).__init__() self.resources = {'Pixmap': 'fem-solver', 'MenuText': QtCore.QT_TRANSLATE_NOOP("FEM_SolverZ88", "Solver Z88"), 'Accel': "S, Z", @@ -49,4 +49,4 @@ def Activated(self): FreeCADGui.doCommand("FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeSolverZ88()]") -FreeCADGui.addCommand('FEM_SolverZ88', _CommandSolverZ88()) +FreeCADGui.addCommand('FEM_SolverZ88', _CommandFemSolverZ88())