diff --git a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h index 28fd50da9..3fc41062f 100644 --- a/src/Mod/Fem/Gui/PreCompiled.h +++ b/src/Mod/Fem/Gui/PreCompiled.h @@ -62,6 +62,9 @@ #include #include +// boost +#include + #ifdef FC_OS_WIN32 # include #endif diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index 1ad1ab02e..ade63097a 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -25,12 +25,16 @@ #ifndef _PreComp_ # include +# include +# include +# include #endif #include "ViewProviderAnalysis.h" #include #include #include +#include #include #include @@ -43,10 +47,7 @@ using namespace FemGui; - - - - +/* TRANSLATOR FemGui::ViewProviderFemAnalysis */ PROPERTY_SOURCE(FemGui::ViewProviderFemAnalysis, Gui::ViewProviderDocumentObject) @@ -85,10 +86,9 @@ std::vector ViewProviderFemAnalysis::claimChildren(void)co void ViewProviderFemAnalysis::setupContextMenu(QMenu* menu, QObject* receiver, const char* member) { - //QAction* act; - //act = menu->addAction(QObject::tr("Edit pad"), receiver, member); - //act->setData(QVariant((int)ViewProvider::Default)); - //PartGui::ViewProviderPart::setupContextMenu(menu, receiver, member); + Gui::ActionFunction* func = new Gui::ActionFunction(menu); + QAction* act = menu->addAction(tr("Activate analysis")); + func->trigger(act, boost::bind(&ViewProviderFemAnalysis::doubleClicked, this)); } bool ViewProviderFemAnalysis::setEdit(int ModNum) @@ -119,11 +119,10 @@ bool ViewProviderFemAnalysis::setEdit(int ModNum) // Gui::Control().showDialog(padDlg); // else - Fem::FemAnalysis* pcAna = static_cast(this->getObject()); - - Gui::Control().showDialog(new TaskDlgAnalysis(pcAna)); - - return true; + //Fem::FemAnalysis* pcAna = static_cast(this->getObject()); + //Gui::Control().showDialog(new TaskDlgAnalysis(pcAna)); + //return true; + return false; } else { return Gui::ViewProviderDocumentObject::setEdit(ModNum); diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index 76efc3379..bb8ba4759 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -27,6 +27,7 @@ #include #include #include +#include class SoCoordinate3; class SoDrawStyle; @@ -42,6 +43,7 @@ namespace FemGui class FemGuiExport ViewProviderFemAnalysis : public Gui::ViewProviderDocumentObject { + Q_DECLARE_TR_FUNCTIONS(FemGui::ViewProviderFemAnalysis) PROPERTY_HEADER(FemGui::ViewProviderAnalysis); public: