suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ remove broken command from FEM workbench

Browse Source
This commit is contained in:
wmayer 2015-04-18 22:06:55 +02:00
parent 3e82f69ca5
commit f12a26b5fb
2 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Mod/Fem/Gui/Command.cpp
View File

@ -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); DEF_STD_CMD_A(CmdFemCreateAnalysis);
@ -633,7 +605,6 @@ bool CmdFemCreateNodesSet::isActive(void)
void CreateFemCommands(void) void CreateFemCommands(void)
{ {
Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager();
rcCmdMgr.addCommand(new CmdFemCreateFromShape());
//rcCmdMgr.addCommand(new CmdFemCreateAnalysis()); //rcCmdMgr.addCommand(new CmdFemCreateAnalysis());
rcCmdMgr.addCommand(new CmdFemAddPart()); rcCmdMgr.addCommand(new CmdFemAddPart());
rcCmdMgr.addCommand(new CmdFemCreateNodesSet()); rcCmdMgr.addCommand(new CmdFemCreateNodesSet());

20
src/Mod/Fem/Gui/Workbench.cpp
View File

@ -55,15 +55,13 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* root = StdWorkbench::setupToolBars(); Gui::ToolBarItem* root = StdWorkbench::setupToolBars();
Gui::ToolBarItem* fem = new Gui::ToolBarItem(root); Gui::ToolBarItem* fem = new Gui::ToolBarItem(root);
fem->setCommand("FEM"); fem->setCommand("FEM");
*fem << "Fem_CreateFromShape" *fem << "Fem_MechanicalMaterial"
<< "Separator" << "Fem_NewMechanicalAnalysis"
<< "Fem_MechanicalMaterial" << "Fem_MechanicalJobControl"
<< "Fem_NewMechanicalAnalysis"
<< "Fem_MechanicalJobControl"
<< "Separator" << "Separator"
<< "Fem_CreateNodesSet" << "Fem_CreateNodesSet"
<< "Separator" << "Separator"
<< "Fem_ConstraintFixed" << "Fem_ConstraintFixed"
<< "Fem_ConstraintForce" << "Fem_ConstraintForce"
<< "Fem_ConstraintBearing" << "Fem_ConstraintBearing"
<< "Fem_ConstraintGear" << "Fem_ConstraintGear"
@ -80,15 +78,13 @@ Gui::MenuItem* Workbench::setupMenuBar() const
Gui::MenuItem* fem = new Gui::MenuItem; Gui::MenuItem* fem = new Gui::MenuItem;
root->insertItem(item, fem); root->insertItem(item, fem);
fem->setCommand("&FEM"); fem->setCommand("&FEM");
*fem << "Fem_CreateFromShape" *fem << "Fem_MechanicalMaterial"
<< "Separator" << "Fem_NewMechanicalAnalysis"
<< "Fem_MechanicalMaterial" << "Fem_MechanicalJobControl"
<< "Fem_NewMechanicalAnalysis"
<< "Fem_MechanicalJobControl"
<< "Separator" << "Separator"
<< "Fem_CreateNodesSet" << "Fem_CreateNodesSet"
<< "Separator" << "Separator"
<< "Fem_ConstraintFixed" << "Fem_ConstraintFixed"
<< "Fem_ConstraintForce" << "Fem_ConstraintForce"
<< "Fem_ConstraintBearing" << "Fem_ConstraintBearing"
<< "Fem_ConstraintGear" << "Fem_ConstraintGear"