Skip to content

Commit

Permalink
FEM: gui tools, sort icons and menues
Browse files Browse the repository at this point in the history
  • Loading branch information
@berndhahnebach
berndhahnebach committed Jun 15, 2020
1 parent 2ef6f10 commit 69ad806
Showing 1 changed file with 49 additions and 32 deletions.
81 changes: 49 additions & 32 deletions src/Mod/Fem/Gui/Workbench.cpp
View file
Expand Up @@ -48,10 +48,14 @@ using namespace FemGui;
qApp->translate("Workbench", "&Electrostatic Constraints");
qApp->translate("Workbench", "Fluid Constraints");
qApp->translate("Workbench", "&Fluid Constraints");
qApp->translate("Workbench", "Geometrical Constraints");
qApp->translate("Workbench", "&Geometrical Constraints");
qApp->translate("Workbench", "Mechanical Constraints");
qApp->translate("Workbench", "&Mechanical Constraints");
qApp->translate("Workbench", "Thermal Constraints");
qApp->translate("Workbench", "&Thermal Constraints");
qApp->translate("Workbench", "Constraints without solver");
qApp->translate("Workbench", "&Constraints without solver");
//
qApp->translate("Workbench", "Mesh");
qApp->translate("Workbench", "M&esh");
Expand Down Expand Up @@ -89,6 +93,7 @@ void Workbench::setupContextMenu(const char* recipient, Gui::MenuItem* item) con
Gui::ToolBarItem* Workbench::setupToolBars() const
{
Gui::ToolBarItem* root = StdWorkbench::setupToolBars();

Gui::ToolBarItem* model = new Gui::ToolBarItem(root);
model->setCommand("Model");
*model << "FEM_Analysis"
Expand All @@ -104,14 +109,27 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "FEM_ElementGeometry2D"
<< "FEM_ElementFluid1D";

Gui::ToolBarItem* electrostat = new Gui::ToolBarItem(root);
electrostat->setCommand("Electrostatic Constraints");
*electrostat << "FEM_ConstraintElectrostaticPotential";

Gui::ToolBarItem* fluid = new Gui::ToolBarItem(root);
fluid->setCommand("Fluid Constraints");
*fluid << "FEM_ConstraintInitialFlowVelocity"
<< "Separator"
<< "FEM_ConstraintFlowVelocity";

Gui::ToolBarItem* geom = new Gui::ToolBarItem(root);
geom->setCommand("Geometrical Constraints");
*geom << "FEM_ConstraintPlaneRotation"
<< "FEM_ConstraintTransform";

Gui::ToolBarItem* mech = new Gui::ToolBarItem(root);
mech->setCommand("Mechanical Constraints");
*mech << "FEM_ConstraintFixed"
<< "FEM_ConstraintDisplacement"
<< "FEM_ConstraintPlaneRotation"
<< "FEM_ConstraintContact"
<< "FEM_ConstraintTie"
<< "FEM_ConstraintTransform"
<< "Separator"
<< "FEM_ConstraintForce"
<< "FEM_ConstraintPressure"
Expand All @@ -121,8 +139,9 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
thermal->setCommand("Thermal Constraints");
*thermal << "FEM_ConstraintInitialTemperature"
<< "Separator"
<< "FEM_ConstraintHeatflux"
<< "FEM_ConstraintTemperature"
<< "FEM_ConstraintHeatflux";
<< "FEM_ConstraintBodyHeatSource";

Gui::ToolBarItem* mesh = new Gui::ToolBarItem(root);
mesh->setCommand("Mesh");
Expand All @@ -137,17 +156,6 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
<< "Separator"
<< "FEM_FEMMesh2Mesh";

Gui::ToolBarItem* fluid = new Gui::ToolBarItem(root);
fluid->setCommand("Fluid Constraints");
*fluid << "FEM_ConstraintInitialFlowVelocity"
<< "Separator"
<< "FEM_ConstraintFluidBoundary"
<< "FEM_ConstraintFlowVelocity";

Gui::ToolBarItem* electrostat = new Gui::ToolBarItem(root);
electrostat->setCommand("Electrostatic Constraints");
*electrostat << "FEM_ConstraintElectrostaticPotential";

Gui::ToolBarItem* solve = new Gui::ToolBarItem(root);
solve->setCommand("Solve");
*solve << "FEM_SolverCalculixCxxtools"
Expand Down Expand Up @@ -205,33 +213,38 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_MaterialReinforced"
<< "FEM_MaterialEditor";

Gui::MenuItem* elec = new Gui::MenuItem;
elec->setCommand("&Electrostatic Constraints");
*elec << "FEM_ConstraintElectrostaticPotential";

Gui::MenuItem* elegeom = new Gui::MenuItem;
elegeom->setCommand("&Element Geometry");
*elegeom << "FEM_ElementGeometry1D"
<< "FEM_ElementRotation1D"
<< "FEM_ElementGeometry2D"
<< "FEM_ElementFluid1D";

Gui::MenuItem* elec = new Gui::MenuItem;
elec->setCommand("&Electrostatic Constraints");
*elec << "FEM_ConstraintElectrostaticPotential";

Gui::MenuItem* fluid = new Gui::MenuItem;
fluid->setCommand("&Fluid Constraints");
*fluid << "FEM_ConstraintInitialFlowVelocity"
<< "Separator"
<< "FEM_ConstraintFlowVelocity";

Gui::MenuItem* geom = new Gui::MenuItem;
geom->setCommand("&Geometrical Constraints");
*geom << "FEM_ConstraintPlaneRotation"
<< "FEM_ConstraintTransform";

Gui::MenuItem* mech = new Gui::MenuItem;
mech->setCommand("&Mechanical Constraints");
*mech << "FEM_ConstraintFixed"
<< "FEM_ConstraintDisplacement"
<< "FEM_ConstraintPlaneRotation"
<< "FEM_ConstraintContact"
<< "FEM_ConstraintTie"
<< "FEM_ConstraintTransform"
<< "Separator"
<< "FEM_ConstraintForce"
<< "FEM_ConstraintPressure"
<< "FEM_ConstraintSelfWeight"
<< "Separator"
<< "FEM_ConstraintBearing"
<< "FEM_ConstraintGear"
<< "FEM_ConstraintPulley";
<< "FEM_ConstraintSelfWeight";

Gui::MenuItem* thermal = new Gui::MenuItem;
thermal->setCommand("&Thermal Constraints");
Expand All @@ -241,12 +254,13 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "FEM_ConstraintTemperature"
<< "FEM_ConstraintBodyHeatSource";

Gui::MenuItem* fluid = new Gui::MenuItem;
fluid->setCommand("&Fluid Constraints");
*fluid << "FEM_ConstraintInitialFlowVelocity"
<< "Separator"
<< "FEM_ConstraintFluidBoundary"
<< "FEM_ConstraintFlowVelocity";
Gui::MenuItem* nosolver = new Gui::MenuItem;
nosolver->setCommand("&Constraints without solver");
*nosolver << "FEM_ConstraintFluidBoundary"
<< "Separator"
<< "FEM_ConstraintBearing"
<< "FEM_ConstraintGear"
<< "FEM_ConstraintPulley";

Gui::MenuItem* model = new Gui::MenuItem;
root->insertItem(item, model);
Expand All @@ -258,8 +272,11 @@ Gui::MenuItem* Workbench::setupMenuBar() const
<< "Separator"
<< elec
<< fluid
<< geom
<< mech
<< thermal;
<< thermal
<< "Separator"
<< nosolver;

Gui::MenuItem* mesh = new Gui::MenuItem;
root->insertItem(item, mesh);
Expand Down

0 comments on commit 69ad806

Please sign in to comment.