From 164ee520a9ff423223113e267ba1f28ea6a6ea60 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 26 Aug 2018 14:04:13 +0200 Subject: [PATCH] FEM: cpp commands sort constraints, move force --- src/Mod/Fem/Gui/Command.cpp | 88 ++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index ff8b8acbc2..9d9bb17ea5 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -498,6 +498,50 @@ bool CmdFemConstraintFluidBoundary::isActive(void) } +//================================================================================================ +DEF_STD_CMD_A(CmdFemConstraintForce); + +CmdFemConstraintForce::CmdFemConstraintForce() + : Command("FEM_ConstraintForce") +{ + sAppModule = "Fem"; + sGroup = QT_TR_NOOP("Fem"); + sMenuText = QT_TR_NOOP("Constraint force"); + sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a force acting on a geometric entity"); + sWhatsThis = "FEM_ConstraintForce"; + sStatusTip = sToolTipText; + sPixmap = "fem-constraint-force"; +} + +void CmdFemConstraintForce::activated(int) +{ + Fem::FemAnalysis *Analysis; + + if(getConstraintPrerequisits(&Analysis)) + return; + + std::string FeatName = getUniqueObjectName("FemConstraintForce"); + + openCommand("Make FEM constraint force on geometry"); + doCommand(Doc,"App.activeDocument().addObject(\"Fem::ConstraintForce\",\"%s\")",FeatName.c_str()); + doCommand(Doc,"App.activeDocument().%s.Force = 1.0",FeatName.c_str()); //OvG: set default not equal to 0 + doCommand(Doc,"App.activeDocument().%s.Reversed = False",FeatName.c_str()); //OvG: set default to False + doCommand(Doc,"App.activeDocument().%s.Scale = 1",FeatName.c_str()); //OvG: set initial scale to 1 + doCommand(Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)",Analysis->getNameInDocument(),FeatName.c_str()); + + doCommand(Doc,"%s",gethideMeshShowPartStr(FeatName).c_str()); //OvG: Hide meshes and show parts + + updateActive(); + + doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); +} + +bool CmdFemConstraintForce::isActive(void) +{ + return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); +} + + //================================================================================================ DEF_STD_CMD_A(CmdFemConstraintPlaneRotation); @@ -631,50 +675,6 @@ bool CmdFemConstraintHeatflux::isActive(void) } -//================================================================================================ -DEF_STD_CMD_A(CmdFemConstraintForce); - -CmdFemConstraintForce::CmdFemConstraintForce() - : Command("FEM_ConstraintForce") -{ - sAppModule = "Fem"; - sGroup = QT_TR_NOOP("Fem"); - sMenuText = QT_TR_NOOP("Constraint force"); - sToolTipText = QT_TR_NOOP("Creates a FEM constraint for a force acting on a geometric entity"); - sWhatsThis = "FEM_ConstraintForce"; - sStatusTip = sToolTipText; - sPixmap = "fem-constraint-force"; -} - -void CmdFemConstraintForce::activated(int) -{ - Fem::FemAnalysis *Analysis; - - if(getConstraintPrerequisits(&Analysis)) - return; - - std::string FeatName = getUniqueObjectName("FemConstraintForce"); - - openCommand("Make FEM constraint force on geometry"); - doCommand(Doc,"App.activeDocument().addObject(\"Fem::ConstraintForce\",\"%s\")",FeatName.c_str()); - doCommand(Doc,"App.activeDocument().%s.Force = 1.0",FeatName.c_str()); //OvG: set default not equal to 0 - doCommand(Doc,"App.activeDocument().%s.Reversed = False",FeatName.c_str()); //OvG: set default to False - doCommand(Doc,"App.activeDocument().%s.Scale = 1",FeatName.c_str()); //OvG: set initial scale to 1 - doCommand(Doc,"App.activeDocument().%s.addObject(App.activeDocument().%s)",Analysis->getNameInDocument(),FeatName.c_str()); - - doCommand(Doc,"%s",gethideMeshShowPartStr(FeatName).c_str()); //OvG: Hide meshes and show parts - - updateActive(); - - doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); -} - -bool CmdFemConstraintForce::isActive(void) -{ - return FemGui::ActiveAnalysisObserver::instance()->hasActiveObject(); -} - - //================================================================================================ DEF_STD_CMD_A(CmdFemConstraintPressure);