From f12a26b5fb84d3cdee19d8c0c10bb2982ee383f0 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 18 Apr 2015 22:06:55 +0200 Subject: [PATCH] + remove broken command from FEM workbench --- src/Mod/Fem/Gui/Command.cpp | 29 ----------------------------- src/Mod/Fem/Gui/Workbench.cpp | 20 ++++++++------------ 2 files changed, 8 insertions(+), 41 deletions(-) diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index 60813b6de..066095112 100755 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -81,34 +81,6 @@ bool getConstraintPrerequisits(Fem::FemAnalysis **Analysis) } -DEF_STD_CMD_A(CmdFemCreateFromShape); - -CmdFemCreateFromShape::CmdFemCreateFromShape() - : Command("Fem_CreateFromShape") -{ - sAppModule = "Fem"; - sGroup = QT_TR_NOOP("Fem"); - sMenuText = QT_TR_NOOP("Create FEM mesh"); - sToolTipText = QT_TR_NOOP("Create FEM mesh from shape"); - sWhatsThis = "Fem_CreateFromShape"; - sStatusTip = sToolTipText; - sPixmap = "Fem_FemMesh"; -} - -void CmdFemCreateFromShape::activated(int iMsg) -{ - FemGui::TaskHypothesis* dlg = new FemGui::TaskHypothesis(); - Gui::Control().showDialog(dlg); -} - -bool CmdFemCreateFromShape::isActive(void) -{ - if (Gui::Control().activeDialog()) - return false; - Base::Type type = Base::Type::fromName("Part::Feature"); - return Gui::Selection().countObjectsOfType(type) > 0; -} - //===================================================================================== DEF_STD_CMD_A(CmdFemCreateAnalysis); @@ -633,7 +605,6 @@ bool CmdFemCreateNodesSet::isActive(void) void CreateFemCommands(void) { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); - rcCmdMgr.addCommand(new CmdFemCreateFromShape()); //rcCmdMgr.addCommand(new CmdFemCreateAnalysis()); rcCmdMgr.addCommand(new CmdFemAddPart()); rcCmdMgr.addCommand(new CmdFemCreateNodesSet()); diff --git a/src/Mod/Fem/Gui/Workbench.cpp b/src/Mod/Fem/Gui/Workbench.cpp index 7afdd9cee..5aef123ea 100755 --- a/src/Mod/Fem/Gui/Workbench.cpp +++ b/src/Mod/Fem/Gui/Workbench.cpp @@ -55,15 +55,13 @@ Gui::ToolBarItem* Workbench::setupToolBars() const Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* fem = new Gui::ToolBarItem(root); fem->setCommand("FEM"); - *fem << "Fem_CreateFromShape" - << "Separator" - << "Fem_MechanicalMaterial" - << "Fem_NewMechanicalAnalysis" - << "Fem_MechanicalJobControl" + *fem << "Fem_MechanicalMaterial" + << "Fem_NewMechanicalAnalysis" + << "Fem_MechanicalJobControl" << "Separator" << "Fem_CreateNodesSet" << "Separator" - << "Fem_ConstraintFixed" + << "Fem_ConstraintFixed" << "Fem_ConstraintForce" << "Fem_ConstraintBearing" << "Fem_ConstraintGear" @@ -80,15 +78,13 @@ Gui::MenuItem* Workbench::setupMenuBar() const Gui::MenuItem* fem = new Gui::MenuItem; root->insertItem(item, fem); fem->setCommand("&FEM"); - *fem << "Fem_CreateFromShape" - << "Separator" - << "Fem_MechanicalMaterial" - << "Fem_NewMechanicalAnalysis" - << "Fem_MechanicalJobControl" + *fem << "Fem_MechanicalMaterial" + << "Fem_NewMechanicalAnalysis" + << "Fem_MechanicalJobControl" << "Separator" << "Fem_CreateNodesSet" << "Separator" - << "Fem_ConstraintFixed" + << "Fem_ConstraintFixed" << "Fem_ConstraintForce" << "Fem_ConstraintBearing" << "Fem_ConstraintGear"