#include "XGUI_Workbench.h"
#include "XGUI_Workshop.h"
#include "XGUI_Viewer.h"
-#include "XGUI_WidgetFactory.h"
+#include "ModuleBase_WidgetFactory.h"
#include "XGUI_SelectionMgr.h"
+#include "XGUI_ObjectsBrowser.h"
+#include "XGUI_Displayer.h"
+#include "XGUI_OperationMgr.h"
+#include "XGUI_SalomeConnector.h"
#include <ModelAPI_PluginManager.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_AttributeDocRef.h>
-#include <Event_Loop.h>
+#include <Events_Loop.h>
+#include <ModuleBase_PropPanelOperation.h>
#include <ModuleBase_Operation.h>
#include <Config_FeatureMessage.h>
#include <Config_PointerMessage.h>
#include <QMdiSubWindow>
#include <QPushButton>
#include <QDockWidget>
+#include <QLayout>
#ifdef _DEBUG
#include <QDebug>
#include <dlfcn.h>
#endif
-XGUI_Workshop::XGUI_Workshop()
+XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
: QObject(),
- myCurrentOperation(NULL),
- myPartSetModule(NULL)
+ myPartSetModule(NULL),
+ mySalomeConnector(theConnector),
+ myPropertyPanelDock(0),
+ myObjectBrowser(0),
+ myDisplayer(0)
{
- myMainWindow = new XGUI_MainWindow();
+ myMainWindow = mySalomeConnector? 0 : new XGUI_MainWindow();
+
+ // In SALOME viewer is accessible only when module is initialized
+ // and in SALOME mode myDisplayer object has to be created later
+ // So, displayer will be created on demand.
+
mySelector = new XGUI_SelectionMgr(this);
+ connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(changeCurrentDocument()));
+ myOperationMgr = new XGUI_OperationMgr(this);
+ connect(myOperationMgr, SIGNAL(operationStarted()), this, SLOT(onOperationStarted()));
+ connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
+ this, SLOT(onOperationStopped(ModuleBase_Operation*)));
}
//******************************************************
{
initMenu();
//Initialize event listening
- Event_Loop* aLoop = Event_Loop::loop();
+ Events_Loop* aLoop = Events_Loop::loop();
//TODO(sbh): Implement static method to extract event id [SEID]
- Event_ID aFeatureId = aLoop->eventByName("FeatureEvent");
+ Events_ID aFeatureId = aLoop->eventByName("FeatureEvent");
aLoop->registerListener(this, aFeatureId);
- Event_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
+ Events_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent");
aLoop->registerListener(this, aPartSetId);
activateModule();
- myMainWindow->show();
-
- updateCommandStatus();
+ if (myMainWindow) {
+ myMainWindow->show();
+ updateCommandStatus();
+ }
+ onNew();
// Testing of document creation
- //std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
- //std::shared_ptr<ModelAPI_Feature> aPoint1 = aMgr->rootDocument()->addFeature("Point");
- //std::shared_ptr<ModelAPI_Feature> aPart = aMgr->rootDocument()->addFeature("Part");
+ //boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+ //boost::shared_ptr<ModelAPI_Feature> aPoint1 = aMgr->rootDocument()->addFeature("Point");
+ //boost::shared_ptr<ModelAPI_Feature> aPart = aMgr->rootDocument()->addFeature("Part");
//aPart->execute();
//aMgr->setCurrentDocument(aPart->data()->docRef("PartDocument")->value());
- //std::shared_ptr<ModelAPI_Feature> aPoint2 = aMgr->rootDocument()->addFeature("Point");
+ //boost::shared_ptr<ModelAPI_Feature> aPoint2 = aMgr->rootDocument()->addFeature("Point");
//aPoint2 = aMgr->rootDocument()->addFeature("Point");
//aPart = aMgr->rootDocument()->addFeature("Part");
//******************************************************
void XGUI_Workshop::initMenu()
{
+ if (isSalomeMode()) {
+ // Create only Undo, Redo commands
+ salomeConnector()->addEditCommand("UNDO_CMD",
+ tr("Undo"), tr("Undo last command"),
+ QIcon(":pictures/undo.png"),
+ false, this, SLOT(onUndo()),
+ QKeySequence::Undo);
+ salomeConnector()->addEditCommand("REDO_CMD",
+ tr("Redo"), tr("Redo last command"),
+ QIcon(":pictures/redo.png"),
+ false, this, SLOT(onRedo()),
+ QKeySequence::Redo);
+ salomeConnector()->addEditMenuSeparator();
+ return;
+ }
XGUI_Workbench* aPage = myMainWindow->menuObject()->generalPage();
// File commands group
QIcon(":pictures/open.png"), QKeySequence::Open);
aCommand->connectTo(this, SLOT(onOpen()));
- aCommand = aGroup->addFeature("NEW_CMD", tr("New"), tr("Create a new document"),
- QIcon(":pictures/new.png"), QKeySequence::New);
- aCommand->connectTo(this, SLOT(onNew()));
+ //aCommand = aGroup->addFeature("NEW_CMD", tr("New"), tr("Create a new document"),
+ // QIcon(":pictures/new.png"), QKeySequence::New);
+ //aCommand->connectTo(this, SLOT(onNew()));
aCommand = aGroup->addFeature("EXIT_CMD", tr("Exit"), tr("Exit application"),
QIcon(":pictures/close.png"), QKeySequence::Close);
}
//******************************************************
-void XGUI_Workshop::processEvent(const Event_Message* theMessage)
+void XGUI_Workshop::processEvent(const Events_Message* theMessage)
{
- static Event_ID aFeatureId = Event_Loop::loop()->eventByName("FeatureEvent");
+ static Events_ID aFeatureId = Events_Loop::loop()->eventByName("FeatureEvent");
if (theMessage->eventID() == aFeatureId) {
const Config_FeatureMessage* aFeatureMsg =
dynamic_cast<const Config_FeatureMessage*>(theMessage);
const Config_PointerMessage* aPartSetMsg =
dynamic_cast<const Config_PointerMessage*>(theMessage);
if (aPartSetMsg) {
- ModuleBase_Operation* aOperation = (ModuleBase_Operation*)(aPartSetMsg->pointer());
- setCurrentOperation(aOperation);
- if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
- myCurrentOperation->start();
- myCurrentOperation->commit();
- updateCommandStatus();
- } else {
- fillPropertyPanel(aOperation);
+ ModuleBase_PropPanelOperation* anOperation =
+ (ModuleBase_PropPanelOperation*)(aPartSetMsg->pointer());
+
+ if (myOperationMgr->startOperation(anOperation)) {
+ if (anOperation->xmlRepresentation().isEmpty()) {
+ anOperation->commit();
+ updateCommandStatus();
+ }
}
return;
}
}
+//******************************************************
+void XGUI_Workshop::onOperationStarted()
+{
+ ModuleBase_PropPanelOperation* aOperation =
+ (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
+
+ if(!aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
+ connectWithOperation(aOperation);
+ QWidget* aPropWidget = myPropertyPanelDock->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
+ qDeleteAll(aPropWidget->children());
+
+ showPropertyPanel();
+
+ ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
+ aFactory.createWidget(aPropWidget);
+ setPropertyPannelTitle(aOperation->description());
+ }
+}
+
+//******************************************************
+void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation)
+{
+ ModuleBase_PropPanelOperation* aOperation =
+ (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
+
+ if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
+ updateCommandStatus();
+ } else {
+ hidePropertyPanel();
+ updateCommandStatus();
+
+ if (myMainWindow) {
+ XGUI_MainMenu* aMenu = myMainWindow->menuObject();
+ aMenu->restoreCommandState();
+ }
+ }
+}
+
/*
*
*/
return;
}
//Find or create Workbench
- XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
QString aWchName = QString::fromStdString(theMessage->workbenchId());
- XGUI_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
- if (!aPage) {
- aPage = addWorkbench(aWchName);
- }
- //Find or create Group
- QString aGroupName = QString::fromStdString(theMessage->groupId());
- XGUI_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
- if (!aGroup) {
- aGroup = aPage->addGroup(aGroupName);
- }
- //Create feature...
- QString aFeatureId = QString::fromStdString(theMessage->id());
- XGUI_Command* aCommand = aGroup->addFeature(QString::fromStdString(theMessage->id()),
- QString::fromStdString(theMessage->text()),
- QString::fromStdString(theMessage->tooltip()),
- QIcon(theMessage->icon().c_str())
- //TODO(sbh): QKeySequence
- );
- myPartSetModule->featureCreated(aCommand);
-}
-
-/*
- *
- */
-void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation)
-{
- connectToPropertyPanel(theOperation);
- QWidget* aPropWidget = myMainWindow->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
- qDeleteAll(aPropWidget->children());
- theOperation->start();
- XGUI_WidgetFactory aFactory = XGUI_WidgetFactory(theOperation);
- aFactory.fillWidget(aPropWidget);
-}
-
-void XGUI_Workshop::setCurrentOperation(ModuleBase_Operation* theOperation)
-{
- //FIXME: Ask user about aborting of current operation?
- if (myCurrentOperation) {
- //TODO get isOperation from document
- if (myCurrentOperation->isRunning())
- myCurrentOperation->abort();
-
- myCurrentOperation->deleteLater();
+ if (isSalomeMode()) {
+ salomeConnector()->addFeature(aWchName,
+ QString::fromStdString(theMessage->id()),
+ QString::fromStdString(theMessage->text()),
+ QString::fromStdString(theMessage->tooltip()),
+ QIcon(theMessage->icon().c_str()),
+ false, this,
+ SLOT(onFeatureTriggered()), QKeySequence());
+ } else {
+ XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
+ XGUI_Workbench* aPage = aMenuBar->findWorkbench(aWchName);
+ if (!aPage) {
+ aPage = addWorkbench(aWchName);
+ }
+ //Find or create Group
+ QString aGroupName = QString::fromStdString(theMessage->groupId());
+ XGUI_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName);
+ if (!aGroup) {
+ aGroup = aPage->addGroup(aGroupName);
+ }
+ bool isUsePropPanel = theMessage->isUseInput();
+ //Create feature...
+ XGUI_Command* aCommand = aGroup->addFeature(QString::fromStdString(theMessage->id()),
+ QString::fromStdString(theMessage->text()),
+ QString::fromStdString(theMessage->tooltip()),
+ QIcon(theMessage->icon().c_str()),
+ QKeySequence(), isUsePropPanel);
+
+ connect(aCommand, SIGNAL(toggled(bool)),
+ myMainWindow->menuObject(), SLOT(onFeatureChecked(bool)));
+ myPartSetModule->featureCreated(aCommand);
}
- myCurrentOperation = theOperation;
}
/*
* and given operation. The given operation becomes a
* current operation and previous operation if exists
*/
-void XGUI_Workshop::connectToPropertyPanel(ModuleBase_Operation* theOperation)
+void XGUI_Workshop::connectWithOperation(ModuleBase_Operation* theOperation)
{
- QDockWidget* aPanel = myMainWindow->findChild<QDockWidget*>(XGUI::PROP_PANEL);
- QPushButton* aOkBtn = aPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
+ QPushButton* aOkBtn = myPropertyPanelDock->findChild<QPushButton*>(XGUI::PROP_PANEL_OK);
connect(aOkBtn, SIGNAL(clicked()), theOperation, SLOT(commit()));
- QPushButton* aCancelBtn = aPanel->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
+ QPushButton* aCancelBtn = myPropertyPanelDock->findChild<QPushButton*>(XGUI::PROP_PANEL_CANCEL);
connect(aCancelBtn, SIGNAL(clicked()), theOperation, SLOT(abort()));
- connect(theOperation, SIGNAL(started()), myMainWindow, SLOT(showPropertyPanel()));
- connect(theOperation, SIGNAL(stopped()), myMainWindow, SLOT(hidePropertyPanel()));
+ QAction* aCommand = 0;
+ if (isSalomeMode()) {
+ aCommand = salomeConnector()->command(theOperation->operationId());
+ } else {
+ XGUI_MainMenu* aMenu = myMainWindow->menuObject();
+ aCommand = aMenu->feature(theOperation->operationId());
+ }
+ //Abort operation on uncheck the command
+ connect(aCommand, SIGNAL(toggled(bool)), theOperation, SLOT(setRunning(bool)));
}
//******************************************************
void XGUI_Workshop::onNew()
{
QApplication::setOverrideCursor(Qt::WaitCursor);
- if (myMainWindow->objectBrowser() == 0) {
- myMainWindow->createDockWidgets();
- mySelector->connectObjectBrowser(myMainWindow->objectBrowser());
+ if (objectBrowser() == 0) {
+ createDockWidgets();
+ mySelector->connectViewers();
+ }
+ showObjectBrowser();
+ if (!isSalomeMode()) {
+ myMainWindow->showPythonConsole();
+ QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
+ aWnd->showMaximized();
+ updateCommandStatus();
}
- myMainWindow->showObjectBrowser();
- myMainWindow->showPythonConsole();
- QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
- aWnd->showMaximized();
- updateCommandStatus();
QApplication::restoreOverrideCursor();
}
//******************************************************
void XGUI_Workshop::onUndo()
{
- std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
- std::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+ objectBrowser()->setCurrentIndex(QModelIndex());
+ boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+ boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
aDoc->undo();
updateCommandStatus();
}
//******************************************************
void XGUI_Workshop::onRedo()
{
- std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
- std::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+ objectBrowser()->setCurrentIndex(QModelIndex());
+ boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+ boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
aDoc->redo();
updateCommandStatus();
}
-
//******************************************************
XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule)
{
err = QString( "Can not load library %1. %2" ).arg( libName ).arg( dlerror() );
else
{
- crtInst = (CREATE_FUNC)dlsym( modLib, GET_MODULE_NAME );
+ crtInst = (CREATE_FUNC)dlsym( modLib, CREATE_MODULE );
if ( !crtInst )
err = QString( "Failed to find function %1. %2" ).arg( CREATE_MODULE ).arg( dlerror() );
}
//******************************************************
void XGUI_Workshop::updateCommandStatus()
{
+ if (isSalomeMode()) // TODO: update commands in SALOME
+ return;
XGUI_MainMenu* aMenuBar = myMainWindow->menuObject();
QList<XGUI_Command*> aCommands = aMenuBar->features();
QList<XGUI_Command*>::const_iterator aIt;
- std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+ boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
if (aMgr->hasRootDocument()) {
XGUI_Command* aUndoCmd;
XGUI_Command* aRedoCmd;
else // Enable all commands
(*aIt)->enable();
}
- std::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
+ boost::shared_ptr<ModelAPI_Document> aDoc = aMgr->rootDocument();
aUndoCmd->setEnabled(aDoc->canUndo());
aRedoCmd->setEnabled(aDoc->canRedo());
} else {
(*aIt)->disable();
}
}
+}
+
+//******************************************************
+QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent)
+{
+ QDockWidget* aObjDock = new QDockWidget(theParent);
+ aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+ aObjDock->setWindowTitle(tr("Object browser"));
+ myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
+ aObjDock->setWidget(myObjectBrowser);
+ return aObjDock;
+}
+
+//******************************************************
+QDockWidget* XGUI_Workshop::createPropertyPanel(QWidget* theParent)
+{
+ QDockWidget* aPropPanel = new QDockWidget(theParent);
+ aPropPanel->setWindowTitle(tr("Property Panel"));
+ QAction* aViewAct = aPropPanel->toggleViewAction();
+ aPropPanel->setObjectName(XGUI::PROP_PANEL);
+
+ QWidget* aContent = new QWidget(aPropPanel);
+ QVBoxLayout* aMainLay = new QVBoxLayout(aContent);
+ aMainLay->setContentsMargins(3, 3, 3, 3);
+ aPropPanel->setWidget(aContent);
+
+ QFrame* aFrm = new QFrame(aContent);
+ aFrm->setFrameStyle(QFrame::Sunken);
+ aFrm->setFrameShape(QFrame::Panel);
+ QHBoxLayout* aBtnLay = new QHBoxLayout(aFrm);
+ aBtnLay->setContentsMargins(0, 0, 0, 0);
+ aMainLay->addWidget(aFrm);
+
+ QPushButton* aBtn = new QPushButton(QIcon(":pictures/button_help.png"), "", aFrm);
+ aBtn->setFlat(true);
+ aBtnLay->addWidget(aBtn);
+ aBtnLay->addStretch(1);
+ aBtn = new QPushButton(QIcon(":pictures/button_ok.png"), "", aFrm);
+ aBtn->setObjectName(XGUI::PROP_PANEL_OK);
+ aBtn->setFlat(true);
+ aBtnLay->addWidget(aBtn);
+ aBtn = new QPushButton(QIcon(":pictures/button_cancel.png"), "", aFrm);
+ aBtn->setObjectName(XGUI::PROP_PANEL_CANCEL);
+ aBtn->setFlat(true);
+ aBtnLay->addWidget(aBtn);
+
+ QWidget* aCustomWidget = new QWidget(aContent);
+ aCustomWidget->setObjectName(XGUI::PROP_PANEL_WDG);
+ aMainLay->addWidget(aCustomWidget);
+ aMainLay->addStretch(1);
+
+ return aPropPanel;
+}
+
+//******************************************************
+void XGUI_Workshop::setPropertyPannelTitle(const QString& theTitle)
+{
+ myPropertyPanelDock->setWindowTitle(theTitle);
+}
+
+//******************************************************
+/*
+ * Creates dock widgets, places them in corresponding area
+ * and tabifies if necessary.
+ */
+void XGUI_Workshop::createDockWidgets()
+{
+ QMainWindow* aDesktop = isSalomeMode()? salomeConnector()->desktop() :
+ myMainWindow;
+ QDockWidget* aObjDock = createObjectBrowser(aDesktop);
+ aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock);
+ myPropertyPanelDock = createPropertyPanel(aDesktop);
+ aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanelDock);
+ hidePropertyPanel(); //<! Invisible by default
+ hideObjectBrowser();
+ aDesktop->tabifyDockWidget(aObjDock, myPropertyPanelDock);
+}
+
+//******************************************************
+void XGUI_Workshop::showPropertyPanel()
+{
+ QAction* aViewAct = myPropertyPanelDock->toggleViewAction();
+ //<! Restore ability to close panel from the window's menu
+ aViewAct->setEnabled(true);
+ myPropertyPanelDock->show();
+ myPropertyPanelDock->raise();
+}
+
+//******************************************************
+void XGUI_Workshop::hidePropertyPanel()
+{
+ QAction* aViewAct = myPropertyPanelDock->toggleViewAction();
+ //<! Do not allow to show empty property panel
+ aViewAct->setEnabled(false);
+ myPropertyPanelDock->hide();
+}
+
+//******************************************************
+void XGUI_Workshop::showObjectBrowser()
+{
+ myObjectBrowser->parentWidget()->show();
+}
+
+//******************************************************
+void XGUI_Workshop::hideObjectBrowser()
+{
+ myObjectBrowser->parentWidget()->hide();
+}
+
+//******************************************************
+void XGUI_Workshop::onFeatureTriggered()
+{
+ QAction* aCmd = dynamic_cast<QAction*>(sender());
+ if (aCmd) {
+ QString aId = salomeConnector()->commandId(aCmd);
+ if (!aId.isNull())
+ myPartSetModule->launchOperation(aId);
+ }
+}
+
+//******************************************************
+XGUI_Displayer* XGUI_Workshop::displayer() const
+{
+ // In SALOME viewer is accessible only when module is initialized
+ // and in SALOME mode myDisplayer object has to be created later (on demand)
+ if (!myDisplayer) {
+ XGUI_Workshop* that = (XGUI_Workshop*)this;
+ that->myDisplayer = isSalomeMode() ?
+ new XGUI_Displayer(salomeConnector()->AISContext()):
+ new XGUI_Displayer(myMainWindow->viewer()->AISContext());
+ }
+ return myDisplayer;
+}
+
+//******************************************************
+void XGUI_Workshop::changeCurrentDocument()
+{
+ QFeatureList aFeatures = objectBrowser()->selectedFeatures();
+
+ // Set current document
+ if (aFeatures.size() > 0) {
+ FeaturePtr aFeature = aFeatures.first();
+
+ boost::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+ boost::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = aFeature->data()->docRef("PartDocument");
+ if (aDocRef)
+ aMgr->setCurrentDocument(aDocRef->value());
+ }
+}
+
+//******************************************************
+void XGUI_Workshop::salomeViewerSelectionChanged()
+{
+ emit salomeViewerSelection();
}
\ No newline at end of file
