+ allow to activate an analysis object from context-menu
This commit is contained in:
parent
9257e9471f
commit
00cdea7b74
|
@ -62,6 +62,9 @@
|
|||
#include <queue>
|
||||
#include <bitset>
|
||||
|
||||
// boost
|
||||
#include <boost/bind.hpp>
|
||||
|
||||
#ifdef FC_OS_WIN32
|
||||
# include <windows.h>
|
||||
#endif
|
||||
|
|
|
@ -25,12 +25,16 @@
|
|||
|
||||
#ifndef _PreComp_
|
||||
# include <Standard_math.hxx>
|
||||
# include <boost/bind.hpp>
|
||||
# include <QAction>
|
||||
# include <QMenu>
|
||||
#endif
|
||||
|
||||
#include "ViewProviderAnalysis.h"
|
||||
#include <Gui/Command.h>
|
||||
#include <Gui/Document.h>
|
||||
#include <Gui/Control.h>
|
||||
#include <Gui/ActionFunction.h>
|
||||
|
||||
#include <Mod/Fem/App/FemAnalysis.h>
|
||||
#include <Mod/Fem/App/FemMeshObject.h>
|
||||
|
@ -43,10 +47,7 @@
|
|||
using namespace FemGui;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/* TRANSLATOR FemGui::ViewProviderFemAnalysis */
|
||||
|
||||
PROPERTY_SOURCE(FemGui::ViewProviderFemAnalysis, Gui::ViewProviderDocumentObject)
|
||||
|
||||
|
@ -85,10 +86,9 @@ std::vector<App::DocumentObject*> 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<Fem::FemAnalysis*>(this->getObject());
|
||||
|
||||
Gui::Control().showDialog(new TaskDlgAnalysis(pcAna));
|
||||
|
||||
return true;
|
||||
//Fem::FemAnalysis* pcAna = static_cast<Fem::FemAnalysis*>(this->getObject());
|
||||
//Gui::Control().showDialog(new TaskDlgAnalysis(pcAna));
|
||||
//return true;
|
||||
return false;
|
||||
}
|
||||
else {
|
||||
return Gui::ViewProviderDocumentObject::setEdit(ModNum);
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <Gui/ViewProviderGeometryObject.h>
|
||||
#include <Gui/ViewProviderBuilder.h>
|
||||
#include <Gui/ViewProviderPythonFeature.h>
|
||||
#include <QCoreApplication>
|
||||
|
||||
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:
|
||||
|
|
Loading…
Reference in New Issue
Block a user