From acf3d67390288af901570e6a7a280b9b40982093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= Date: Sun, 15 Nov 2015 13:31:04 +0100 Subject: [PATCH] FEM Post: Add icons for fem post processing --- src/Mod/Fem/Gui/Command.cpp | 22 ++- src/Mod/Fem/Gui/Command.cpp.orig | 148 ++++++++------- src/Mod/Fem/Gui/Resources/Fem.qrc | 10 + src/Mod/Fem/Gui/Resources/Fem.qrc.orig | 123 +++++++++++++ src/Mod/Fem/Gui/Resources/icons/fem-box.svg | 172 ++++++++++++++++++ .../Fem/Gui/Resources/icons/fem-cylinder.svg | 133 ++++++++++++++ src/Mod/Fem/Gui/Resources/icons/fem-plane.svg | 128 +++++++++++++ .../Fem/Gui/Resources/icons/fem-sphere.svg | 128 +++++++++++++ src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp | 4 + .../Fem/Gui/ViewProviderFemPostFunction.cpp | 4 + .../Fem/Gui/ViewProviderFemPostPipeline.cpp | 1 + 11 files changed, 786 insertions(+), 87 deletions(-) create mode 100755 src/Mod/Fem/Gui/Resources/Fem.qrc.orig create mode 100644 src/Mod/Fem/Gui/Resources/icons/fem-box.svg create mode 100644 src/Mod/Fem/Gui/Resources/icons/fem-cylinder.svg create mode 100644 src/Mod/Fem/Gui/Resources/icons/fem-plane.svg create mode 100644 src/Mod/Fem/Gui/Resources/icons/fem-sphere.svg diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp index e2e2b2f3b..137fc6278 100644 --- a/src/Mod/Fem/Gui/Command.cpp +++ b/src/Mod/Fem/Gui/Command.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -805,7 +806,7 @@ CmdFemPostCreateClipFilter::CmdFemPostCreateClipFilter() sToolTipText = QT_TR_NOOP("Define/create a clip filter which uses functions to define the cliped region"); sWhatsThis = "Fem_PostCreateClipFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-clip"; } void CmdFemPostCreateClipFilter::activated(int iMsg) @@ -829,7 +830,7 @@ CmdFemPostCreateScalarClipFilter::CmdFemPostCreateScalarClipFilter() sToolTipText = QT_TR_NOOP("Define/create a clip filter which clips a field with a scalar value"); sWhatsThis = "Fem_PostCreateScalarClipFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-clip-scalar"; } void CmdFemPostCreateScalarClipFilter::activated(int iMsg) @@ -855,7 +856,7 @@ CmdFemPostWarpVectorFilter::CmdFemPostWarpVectorFilter() sToolTipText = QT_TR_NOOP("Warp the geometry along a vector field by a certain factor"); sWhatsThis = "Fem_PostCreateWarpVectorFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-warp"; } void CmdFemPostWarpVectorFilter::activated(int iMsg) @@ -879,7 +880,7 @@ CmdFemPostCutFilter::CmdFemPostCutFilter() sToolTipText = QT_TR_NOOP("Cut the data along an implicit function"); sWhatsThis = "Fem_PostCreateCutFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-cut"; } void CmdFemPostCutFilter::activated(int iMsg) @@ -973,12 +974,15 @@ Gui::Action * CmdFemPostFunctions::createAction(void) applyCommandData(this->className(), pcAction); QAction* cmd0 = pcAction->addAction(QString()); - pcAction->addAction(QString()); + cmd0->setIcon(Gui::BitmapFactory().pixmap("fem-plane")); + + QAction* cmd1 = pcAction->addAction(QString()); + cmd1->setIcon(Gui::BitmapFactory().pixmap("fem-sphere")); _pcAction = pcAction; languageChange(); - pcAction->setIcon(cmd0->icon()); + pcAction->setIcon(cmd1->icon()); int defaultId = 0; pcAction->setProperty("defaultAction", QVariant(defaultId)); @@ -1058,9 +1062,6 @@ Gui::Action * CmdFemPostApllyChanges::createAction(void) return pcAction; } -#endif - - DEF_STD_CMD_A(CmdFemPostPipelineFromResult); @@ -1073,7 +1074,7 @@ CmdFemPostPipelineFromResult::CmdFemPostPipelineFromResult() sToolTipText = QT_TR_NOOP("Creates a post processing pipeline from a result object"); sWhatsThis = "Fem_PostPipelineFromResult"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-data"; } void CmdFemPostPipelineFromResult::activated(int iMsg) @@ -1106,6 +1107,7 @@ bool CmdFemPostPipelineFromResult::isActive(void) return hasActiveDocument(); } +#endif //-------------------------------------------------------------------------------------- diff --git a/src/Mod/Fem/Gui/Command.cpp.orig b/src/Mod/Fem/Gui/Command.cpp.orig index 21f14994e..6e78d04fd 100644 --- a/src/Mod/Fem/Gui/Command.cpp.orig +++ b/src/Mod/Fem/Gui/Command.cpp.orig @@ -1,4 +1,4 @@ -<<<<<<< 559b38429c3ec5bcad9eced553e5d7ca544cb55e +<<<<<<< f24874396c47b854461779051d98df0c6567b0a2 /*************************************************************************** * Copyright (c) 2008 Jürgen Riegel (juergen.riegel@web.de) * * * @@ -768,6 +768,32 @@ bool CmdFemCreateNodesSet::isActive(void) #ifdef FC_USE_VTK +void setupFilter(Gui::Command* cmd, std::string Name) { + + std::vector pipelines = App::GetApplication().getActiveDocument()->getObjectsOfType(); + if (!pipelines.empty()) { + Fem::FemPostPipeline *pipeline = pipelines.front(); + + std::string FeatName = cmd->getUniqueObjectName(Name.c_str()); + + cmd->openCommand("Create filter"); + cmd->doCommand(Gui::Command::Doc,"App.activeDocument().addObject('Fem::FemPost%sFilter','%s')", Name.c_str(), FeatName.c_str()); + cmd->doCommand(Gui::Command::Doc,"__list__ = App.ActiveDocument.%s.Filter", pipeline->getNameInDocument()); + cmd->doCommand(Gui::Command::Doc,"__list__.append(App.ActiveDocument.%s)", FeatName.c_str()); + cmd->doCommand(Gui::Command::Doc,"App.ActiveDocument.%s.Filter = __list__", pipeline->getNameInDocument()); + cmd->doCommand(Gui::Command::Doc,"del __list__"); + + cmd->updateActive(); + cmd->doCommand(Gui::Command::Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); + + } + else { + QMessageBox::warning(Gui::getMainWindow(), + qApp->translate("CmdFemPostCreateClipFilter", "Wrong selection"), + qApp->translate("CmdFemPostCreateClipFilter", "Select a pipeline, please.")); + } + +}; DEF_STD_CMD_A(CmdFemPostCreateClipFilter); @@ -785,28 +811,7 @@ CmdFemPostCreateClipFilter::CmdFemPostCreateClipFilter() void CmdFemPostCreateClipFilter::activated(int iMsg) { - std::vector pipelines = App::GetApplication().getActiveDocument()->getObjectsOfType(); - if (!pipelines.empty()) { - Fem::FemPostPipeline *pipeline = pipelines.front(); - - std::string FeatName = getUniqueObjectName("Clip"); - - openCommand("Create clip filter"); - doCommand(Doc,"App.activeDocument().addObject('Fem::FemPostClipFilter','%s')",FeatName.c_str()); - doCommand(Doc,"__list__ = App.ActiveDocument.%s.Filter", pipeline->getNameInDocument()); - doCommand(Doc,"__list__.append(App.ActiveDocument.%s)", FeatName.c_str()); - doCommand(Doc,"App.ActiveDocument.%s.Filter = __list__", pipeline->getNameInDocument()); - doCommand(Doc,"del __list__"); - - this->updateActive(); - doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); - - } - else { - QMessageBox::warning(Gui::getMainWindow(), - qApp->translate("CmdFemPostCreateClipFilter", "Wrong selection"), - qApp->translate("CmdFemPostCreateClipFilter", "Select a pipeline, please.")); - } + setupFilter(this, "Clip"); } bool CmdFemPostCreateClipFilter::isActive(void) @@ -830,27 +835,7 @@ CmdFemPostCreateScalarClipFilter::CmdFemPostCreateScalarClipFilter() void CmdFemPostCreateScalarClipFilter::activated(int iMsg) { - std::vector pipelines = App::GetApplication().getActiveDocument()->getObjectsOfType(); - if (!pipelines.empty()) { - Fem::FemPostPipeline *pipeline = pipelines.front(); - - std::string FeatName = getUniqueObjectName("ScalarClip"); - - openCommand("Create scalar clip filter"); - doCommand(Doc,"App.activeDocument().addObject('Fem::FemPostScalarClipFilter','%s')",FeatName.c_str()); - doCommand(Doc,"__list__ = App.ActiveDocument.%s.Filter", pipeline->getNameInDocument()); - doCommand(Doc,"__list__.append(App.ActiveDocument.%s)", FeatName.c_str()); - doCommand(Doc,"App.ActiveDocument.%s.Filter = __list__", pipeline->getNameInDocument()); - doCommand(Doc,"del __list__"); - - this->updateActive(); - doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); - } - else { - QMessageBox::warning(Gui::getMainWindow(), - qApp->translate("CmdFemPostCreateScalarClipFilter", "Wrong selection"), - qApp->translate("CmdFemPostCreateScalarClipFilter", "Select a pipeline, please.")); - } + setupFilter(this, "ScalarClip"); } bool CmdFemPostCreateScalarClipFilter::isActive(void) @@ -876,27 +861,7 @@ CmdFemPostWarpVectorFilter::CmdFemPostWarpVectorFilter() void CmdFemPostWarpVectorFilter::activated(int iMsg) { - std::vector pipelines = App::GetApplication().getActiveDocument()->getObjectsOfType(); - if (!pipelines.empty()) { - Fem::FemPostPipeline *pipeline = pipelines.front(); - - std::string FeatName = getUniqueObjectName("WarpVector"); - - openCommand("Create warp vector filter"); - doCommand(Doc,"App.activeDocument().addObject('Fem::FemPostWarpVectorFilter','%s')",FeatName.c_str()); - doCommand(Doc,"__list__ = App.ActiveDocument.%s.Filter", pipeline->getNameInDocument()); - doCommand(Doc,"__list__.append(App.ActiveDocument.%s)", FeatName.c_str()); - doCommand(Doc,"App.ActiveDocument.%s.Filter = __list__", pipeline->getNameInDocument()); - doCommand(Doc,"del __list__"); - - this->updateActive(); - doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); - } - else { - QMessageBox::warning(Gui::getMainWindow(), - qApp->translate("CmdFemPostCreateWarpVectorFilter", "Wrong selection"), - qApp->translate("CmdFemPostCreateWarpVectorFilter", "Select a pipeline, please.")); - } + setupFilter(this, "WarpVector"); } bool CmdFemPostWarpVectorFilter::isActive(void) @@ -904,6 +869,30 @@ bool CmdFemPostWarpVectorFilter::isActive(void) return hasActiveDocument(); } +DEF_STD_CMD_A(CmdFemPostCutFilter); + +CmdFemPostCutFilter::CmdFemPostCutFilter() + : Command("Fem_PostCreateCutFilter") +{ + sAppModule = "Fem"; + sGroup = QT_TR_NOOP("Fem"); + sMenuText = QT_TR_NOOP("Cut the data along an implicit function"); + sToolTipText = QT_TR_NOOP("Cut the data along an implicit function"); + sWhatsThis = "Fem_PostCreateCutFilter"; + sStatusTip = sToolTipText; + sPixmap = "fem-fem-mesh-create-node-by-poly"; +} + +void CmdFemPostCutFilter::activated(int iMsg) +{ + setupFilter(this, "Cut"); +} + +bool CmdFemPostCutFilter::isActive(void) +{ + return hasActiveDocument(); +} + // ##################################################################################################### @@ -959,7 +948,9 @@ void CmdFemPostFunctions::activated(int iMsg) doCommand(Doc,"del __list__"); this->updateActive(); - doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); + //most of the times functions are added inside of a filter, make sure this still works + if(Gui::Application::Instance->activeDocument()->getInEdit() == NULL) + doCommand(Gui,"Gui.activeDocument().setEdit('%s')",FeatName.c_str()); } else { QMessageBox::warning(Gui::getMainWindow(), @@ -1143,6 +1134,7 @@ void CreateFemCommands(void) rcCmdMgr.addCommand(new CmdFemPostFunctions); rcCmdMgr.addCommand(new CmdFemPostApllyChanges); rcCmdMgr.addCommand(new CmdFemPostPipelineFromResult); + rcCmdMgr.addCommand(new CmdFemPostCutFilter); #endif } ======= @@ -1197,6 +1189,7 @@ void CreateFemCommands(void) #include #include #include +#include #include #include @@ -1953,7 +1946,7 @@ CmdFemPostCreateClipFilter::CmdFemPostCreateClipFilter() sToolTipText = QT_TR_NOOP("Define/create a clip filter which uses functions to define the cliped region"); sWhatsThis = "Fem_PostCreateClipFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-clip"; } void CmdFemPostCreateClipFilter::activated(int iMsg) @@ -1977,7 +1970,7 @@ CmdFemPostCreateScalarClipFilter::CmdFemPostCreateScalarClipFilter() sToolTipText = QT_TR_NOOP("Define/create a clip filter which clips a field with a scalar value"); sWhatsThis = "Fem_PostCreateScalarClipFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-clip-scalar"; } void CmdFemPostCreateScalarClipFilter::activated(int iMsg) @@ -2003,7 +1996,7 @@ CmdFemPostWarpVectorFilter::CmdFemPostWarpVectorFilter() sToolTipText = QT_TR_NOOP("Warp the geometry along a vector field by a certain factor"); sWhatsThis = "Fem_PostCreateWarpVectorFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-warp"; } void CmdFemPostWarpVectorFilter::activated(int iMsg) @@ -2027,7 +2020,7 @@ CmdFemPostCutFilter::CmdFemPostCutFilter() sToolTipText = QT_TR_NOOP("Cut the data along an implicit function"); sWhatsThis = "Fem_PostCreateCutFilter"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-cut"; } void CmdFemPostCutFilter::activated(int iMsg) @@ -2121,12 +2114,15 @@ Gui::Action * CmdFemPostFunctions::createAction(void) applyCommandData(this->className(), pcAction); QAction* cmd0 = pcAction->addAction(QString()); - pcAction->addAction(QString()); + cmd0->setIcon(Gui::BitmapFactory().pixmap("fem-plane")); + + QAction* cmd1 = pcAction->addAction(QString()); + cmd1->setIcon(Gui::BitmapFactory().pixmap("fem-sphere")); _pcAction = pcAction; languageChange(); - pcAction->setIcon(cmd0->icon()); + pcAction->setIcon(cmd1->icon()); int defaultId = 0; pcAction->setProperty("defaultAction", QVariant(defaultId)); @@ -2206,9 +2202,6 @@ Gui::Action * CmdFemPostApllyChanges::createAction(void) return pcAction; } -#endif - - DEF_STD_CMD_A(CmdFemPostPipelineFromResult); @@ -2221,7 +2214,7 @@ CmdFemPostPipelineFromResult::CmdFemPostPipelineFromResult() sToolTipText = QT_TR_NOOP("Creates a post processing pipeline from a result object"); sWhatsThis = "Fem_PostPipelineFromResult"; sStatusTip = sToolTipText; - sPixmap = "fem-fem-mesh-create-node-by-poly"; + sPixmap = "fem-data"; } void CmdFemPostPipelineFromResult::activated(int iMsg) @@ -2254,6 +2247,7 @@ bool CmdFemPostPipelineFromResult::isActive(void) return hasActiveDocument(); } +#endif //-------------------------------------------------------------------------------------- @@ -2284,4 +2278,4 @@ void CreateFemCommands(void) rcCmdMgr.addCommand(new CmdFemPostCutFilter); #endif } ->>>>>>> Add cut filter +>>>>>>> Add icons for fem post processing diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc index 99b5be543..6784493ab 100755 --- a/src/Mod/Fem/Gui/Resources/Fem.qrc +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc @@ -25,6 +25,16 @@ icons/fem-beam-section.svg icons/preferences-fem.svg icons/FemWorkbench.svg + icons/fem-clip.png + icons/fem-clip-scalar.png + icons/fem-cut.png + icons/fem-isosurface.png + icons/fem-warp.png + icons/fem-data.png + icons/fem-plane.svg + icons/fem-box.svg + icons/fem-sphere.svg + icons/fem-cylinder.svg translations/Fem_af.qm translations/Fem_de.qm translations/Fem_fi.qm diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc.orig b/src/Mod/Fem/Gui/Resources/Fem.qrc.orig new file mode 100755 index 000000000..5f0e1540e --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/Fem.qrc.orig @@ -0,0 +1,123 @@ +<<<<<<< f24874396c47b854461779051d98df0c6567b0a2 + + + icons/fem-fem-mesh-from-shape.svg + icons/fem-fem-mesh-create-node-by-poly.svg + icons/fem-analysis.svg + icons/fem-solver.svg + icons/fem-constraint-displacement.svg + icons/fem-constraint-force.svg + icons/fem-constraint-fixed.svg + icons/fem-constraint-pressure.svg + icons/fem-constraint-bearing.svg + icons/fem-constraint-gear.svg + icons/fem-constraint-pulley.svg + icons/fem-add-fem-mesh.svg + icons/fem-add-material.svg + icons/fem-add-part.svg + icons/fem-inp-editor.svg + icons/fem-material.svg + icons/fem-new-analysis.svg + icons/fem-purge-results.svg + icons/fem-quick-analysis.svg + icons/fem-frequency-analysis.svg + icons/fem-result.svg + icons/fem-shell-thickness.svg + icons/fem-beam-section.svg + icons/preferences-fem.svg + icons/FemWorkbench.svg + translations/Fem_af.qm + translations/Fem_de.qm + translations/Fem_fi.qm + translations/Fem_fr.qm + translations/Fem_hr.qm + translations/Fem_it.qm + translations/Fem_nl.qm + translations/Fem_no.qm + translations/Fem_pl.qm + translations/Fem_ru.qm + translations/Fem_uk.qm + translations/Fem_tr.qm + translations/Fem_sv-SE.qm + translations/Fem_zh-TW.qm + translations/Fem_pt-BR.qm + translations/Fem_cs.qm + translations/Fem_sk.qm + translations/Fem_es-ES.qm + translations/Fem_zh-CN.qm + translations/Fem_ja.qm + translations/Fem_ro.qm + translations/Fem_hu.qm + translations/Fem_pt-PT.qm + translations/Fem_sr.qm + translations/Fem_el.qm + translations/Fem_sl.qm + + +======= + + + icons/fem-fem-mesh-from-shape.svg + icons/fem-fem-mesh-create-node-by-poly.svg + icons/fem-analysis.svg + icons/fem-solver.svg + icons/fem-constraint-displacement.svg + icons/fem-constraint-force.svg + icons/fem-constraint-fixed.svg + icons/fem-constraint-pressure.svg + icons/fem-constraint-bearing.svg + icons/fem-constraint-gear.svg + icons/fem-constraint-pulley.svg + icons/fem-add-fem-mesh.svg + icons/fem-add-material.svg + icons/fem-add-part.svg + icons/fem-inp-editor.svg + icons/fem-material.svg + icons/fem-new-analysis.svg + icons/fem-purge-results.svg + icons/fem-quick-analysis.svg + icons/fem-frequency-analysis.svg + icons/fem-result.svg + icons/fem-shell-thickness.svg + icons/fem-beam-section.svg + icons/preferences-fem.svg + icons/FemWorkbench.svg + icons/fem-clip.png + icons/fem-clip-scalar.png + icons/fem-cut.png + icons/fem-isosurface.png + icons/fem-warp.png + icons/fem-data.png + icons/fem-plane.svg + icons/fem-box.svg + icons/fem-sphere.svg + icons/fem-cylinder.svg + translations/Fem_af.qm + translations/Fem_de.qm + translations/Fem_fi.qm + translations/Fem_fr.qm + translations/Fem_hr.qm + translations/Fem_it.qm + translations/Fem_nl.qm + translations/Fem_no.qm + translations/Fem_pl.qm + translations/Fem_ru.qm + translations/Fem_uk.qm + translations/Fem_tr.qm + translations/Fem_sv-SE.qm + translations/Fem_zh-TW.qm + translations/Fem_pt-BR.qm + translations/Fem_cs.qm + translations/Fem_sk.qm + translations/Fem_es-ES.qm + translations/Fem_zh-CN.qm + translations/Fem_ja.qm + translations/Fem_ro.qm + translations/Fem_hu.qm + translations/Fem_pt-PT.qm + translations/Fem_sr.qm + translations/Fem_el.qm + translations/Fem_sl.qm + + +>>>>>>> Add icons for fem post processing diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-box.svg b/src/Mod/Fem/Gui/Resources/icons/fem-box.svg new file mode 100644 index 000000000..805e94eaa --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-box.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-cylinder.svg b/src/Mod/Fem/Gui/Resources/icons/fem-cylinder.svg new file mode 100644 index 000000000..6118d44d1 --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-cylinder.svg @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-plane.svg b/src/Mod/Fem/Gui/Resources/icons/fem-plane.svg new file mode 100644 index 000000000..4e9515a31 --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-plane.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-sphere.svg b/src/Mod/Fem/Gui/Resources/icons/fem-sphere.svg new file mode 100644 index 000000000..88081ce51 --- /dev/null +++ b/src/Mod/Fem/Gui/Resources/icons/fem-sphere.svg @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp index e12cead4e..376d742b0 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFilter.cpp @@ -34,6 +34,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostClip, FemGui::ViewProviderFemPostObje ViewProviderFemPostClip::ViewProviderFemPostClip() { + sPixmap = "fem-clip"; } ViewProviderFemPostClip::~ViewProviderFemPostClip() { @@ -55,6 +56,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostScalarClip, FemGui::ViewProviderFemPo ViewProviderFemPostScalarClip::ViewProviderFemPostScalarClip() { + sPixmap = "fem-clip-scalar"; } ViewProviderFemPostScalarClip::~ViewProviderFemPostScalarClip() { @@ -74,6 +76,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostWarpVector, FemGui::ViewProviderFemPo ViewProviderFemPostWarpVector::ViewProviderFemPostWarpVector() { + sPixmap = "fem-warp"; } ViewProviderFemPostWarpVector::~ViewProviderFemPostWarpVector() { @@ -94,6 +97,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostCut, FemGui::ViewProviderFemPostObjec ViewProviderFemPostCut::ViewProviderFemPostCut() { + sPixmap = "fem-cut"; } ViewProviderFemPostCut::~ViewProviderFemPostCut() { diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 59d9629ec..22188ca99 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -278,6 +278,8 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostPlaneFunction, FemGui::ViewProviderFe ViewProviderFemPostPlaneFunction::ViewProviderFemPostPlaneFunction() { + sPixmap = "fem-plane"; + setAutoScale(true); //setup the visualisation geometry @@ -409,6 +411,8 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostSphereFunction, FemGui::ViewProviderF ViewProviderFemPostSphereFunction::ViewProviderFemPostSphereFunction() { + sPixmap = "fem-sphere"; + setAutoScale(true); //setup the visualisation geometry diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp index b60684c3b..db1f21d40 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp @@ -33,6 +33,7 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostPipeline, FemGui::ViewProviderFemPost ViewProviderFemPostPipeline::ViewProviderFemPostPipeline() { + sPixmap = "fem-data"; } ViewProviderFemPostPipeline::~ViewProviderFemPostPipeline()