From 1a195cd94f34ba4ce9acc4a38097cf72162cb4ff Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 1 Dec 2017 19:44:09 +0100 Subject: [PATCH] FEM: new commands, remove add in command names the wiki pages retrive the names from the command names, thus they have to us the same name system --- src/Mod/Fem/Gui/Workbench.cpp | 30 +++++++++---------- .../_CommandFemConstraintBodyHeatSource.py | 2 +- .../_CommandFemConstraintFlowVelocity.py | 2 +- ...CommandFemConstraintInitialFlowVelocity.py | 2 +- src/Mod/Fem/PyGui/_CommandFemEquation.py | 8 ++--- src/Mod/Fem/PyGui/_CommandFemSolverElmer.py | 2 +- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 158575b9d9..800b2187cb 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -104,20 +104,20 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* fluid = new Gui::ToolBarItem(root); fluid->setCommand("Fluid Constraints"); - *fluid << "FEM_AddConstraintInitialFlowVelocity" + *fluid << "FEM_ConstraintInitialFlowVelocity" << "Separator" << "FEM_ConstraintFluidBoundary" - << "FEM_AddConstraintFlowVelocity"; + << "FEM_ConstraintFlowVelocity"; Gui::ToolBarItem* solve = new Gui::ToolBarItem(root); solve->setCommand("Solve"); *solve << "FEM_SolverCalculix" - << "FEM_AddSolverElmer" + << "FEM_SolverElmer" << "Separator" - << "FEM_AddEquationHeat" - << "FEM_AddEquationElasticity" - << "FEM_AddEquationElectrostatic" - << "FEM_AddEquationFlow" + << "FEM_EquationHeat" + << "FEM_EquationElasticity" + << "FEM_EquationElectrostatic" + << "FEM_EquationFlow" << "Separator" << "FEM_SolverControl" << "FEM_SolverRun"; @@ -172,14 +172,14 @@ Gui::MenuItem* Workbench::setupMenuBar() const << "Separator" << "FEM_ConstraintHeatflux" << "FEM_ConstraintTemperature" - << "FEM_AddConstraintBodyHeatSource"; + << "FEM_ConstraintBodyHeatSource"; Gui::MenuItem* fluid = new Gui::MenuItem; fluid->setCommand("&Fluid Constraints"); - *fluid << "FEM_AddConstraintInitialFlowVelocity" + *fluid << "FEM_ConstraintInitialFlowVelocity" << "Separator" << "FEM_ConstraintFluidBoundary" - << "FEM_AddConstraintFlowVelocity"; + << "FEM_ConstraintFlowVelocity"; Gui::MenuItem* model = new Gui::MenuItem; root->insertItem(item, model); @@ -215,12 +215,12 @@ Gui::MenuItem* Workbench::setupMenuBar() const solve->setCommand("&Solve"); *solve << "FEM_SolverCalculix" << "FEM_SolverZ88" - << "FEM_AddSolverElmer" + << "FEM_SolverElmer" << "Separator" - << "FEM_AddEquationHeat" - << "FEM_AddEquationElasticity" - << "FEM_AddEquationElectrostatic" - << "FEM_AddEquationFlow" + << "FEM_EquationHeat" + << "FEM_EquationElasticity" + << "FEM_EquationElectrostatic" + << "FEM_EquationFlow" << "Separator" << "FEM_SolverControl" << "FEM_SolverRun"; diff --git a/src/Mod/Fem/PyGui/_CommandFemConstraintBodyHeatSource.py b/src/Mod/Fem/PyGui/_CommandFemConstraintBodyHeatSource.py index f1486689c9..139b701c26 100644 --- a/src/Mod/Fem/PyGui/_CommandFemConstraintBodyHeatSource.py +++ b/src/Mod/Fem/PyGui/_CommandFemConstraintBodyHeatSource.py @@ -56,4 +56,4 @@ class Command(FemCommands.FemCommands): "[ObjectsFem.makeConstraintBodyHeatSource()]") -Gui.addCommand('FEM_AddConstraintBodyHeatSource', Command()) +Gui.addCommand('FEM_ConstraintBodyHeatSource', Command()) diff --git a/src/Mod/Fem/PyGui/_CommandFemConstraintFlowVelocity.py b/src/Mod/Fem/PyGui/_CommandFemConstraintFlowVelocity.py index 65212cb915..f22d809fc8 100644 --- a/src/Mod/Fem/PyGui/_CommandFemConstraintFlowVelocity.py +++ b/src/Mod/Fem/PyGui/_CommandFemConstraintFlowVelocity.py @@ -56,4 +56,4 @@ class Command(FemCommands.FemCommands): "[ObjectsFem.makeConstraintFlowVelocity()]") -Gui.addCommand('FEM_AddConstraintFlowVelocity', Command()) +Gui.addCommand('FEM_ConstraintFlowVelocity', Command()) diff --git a/src/Mod/Fem/PyGui/_CommandFemConstraintInitialFlowVelocity.py b/src/Mod/Fem/PyGui/_CommandFemConstraintInitialFlowVelocity.py index 4a83057b40..3999869cef 100644 --- a/src/Mod/Fem/PyGui/_CommandFemConstraintInitialFlowVelocity.py +++ b/src/Mod/Fem/PyGui/_CommandFemConstraintInitialFlowVelocity.py @@ -56,4 +56,4 @@ class Command(FemCommands.FemCommands): "[ObjectsFem.makeConstraintInitialFlowVelocity()]") -Gui.addCommand('FEM_AddConstraintInitialFlowVelocity', Command()) +Gui.addCommand('FEM_ConstraintInitialFlowVelocity', Command()) diff --git a/src/Mod/Fem/PyGui/_CommandFemEquation.py b/src/Mod/Fem/PyGui/_CommandFemEquation.py index 3451853e09..f0fe7753ea 100644 --- a/src/Mod/Fem/PyGui/_CommandFemEquation.py +++ b/src/Mod/Fem/PyGui/_CommandFemEquation.py @@ -110,7 +110,7 @@ class Flow(_Base): } -Gui.addCommand('FEM_AddEquationHeat', Heat()) -Gui.addCommand('FEM_AddEquationElasticity', Elasticity()) -Gui.addCommand('FEM_AddEquationElectrostatic', Electrostatic()) -Gui.addCommand('FEM_AddEquationFlow', Flow()) +Gui.addCommand('FEM_EquationHeat', Heat()) +Gui.addCommand('FEM_EquationElasticity', Elasticity()) +Gui.addCommand('FEM_EquationElectrostatic', Electrostatic()) +Gui.addCommand('FEM_EquationFlow', Flow()) diff --git a/src/Mod/Fem/PyGui/_CommandFemSolverElmer.py b/src/Mod/Fem/PyGui/_CommandFemSolverElmer.py index 38f274550d..43d3f9d3c7 100644 --- a/src/Mod/Fem/PyGui/_CommandFemSolverElmer.py +++ b/src/Mod/Fem/PyGui/_CommandFemSolverElmer.py @@ -60,4 +60,4 @@ class Command(QtCore.QObject): and analysis.Document == App.ActiveDocument) -Gui.addCommand('FEM_AddSolverElmer', Command()) +Gui.addCommand('FEM_SolverElmer', Command())