X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=c80c8a7aefc0f02908614c0abc7b7857f0f1b5b6;hb=c2fe0ed8a7a43b7c9f34cd9ec89c7fb079a07045;hp=127949282264d046762516c3e67a01ff0d1b46b7;hpb=f3c113af79cf08e90316b2d27303a0a12d93fddc;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 127949282..c80c8a7ae 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -14,16 +14,23 @@ #include "XGUI_Displayer.h" #include "XGUI_OperationMgr.h" #include "XGUI_SalomeConnector.h" +#include "XGUI_SalomeViewer.h" #include "XGUI_ActionsMgr.h" +#include "XGUI_ErrorDialog.h" +#include "XGUI_ViewerProxy.h" +#include "XGUI_PropertyPanel.h" +#include #include #include #include #include #include -#include +#include #include +#include +#include #include #include @@ -46,25 +53,31 @@ #endif XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) - : QObject(), + : QObject(), + myCurrentFile(QString()), myPartSetModule(NULL), mySalomeConnector(theConnector), - myPropertyPanelDock(0), + myPropertyPanel(0), myObjectBrowser(0), myDisplayer(0) { 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. + myDisplayer = new XGUI_Displayer(this); mySelector = new XGUI_SelectionMgr(this); + connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(changeCurrentDocument())); + myOperationMgr = new XGUI_OperationMgr(this); myActionsMgr = new XGUI_ActionsMgr(this); + myErrorDlg = new XGUI_ErrorDialog(myMainWindow); + + myViewerProxy = new XGUI_ViewerProxy(this); + connect(myOperationMgr, SIGNAL(operationStarted()), this, SLOT(onOperationStarted())); connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), this, SLOT(onOperationStopped(ModuleBase_Operation*))); + connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&))); } //****************************************************** @@ -78,28 +91,20 @@ void XGUI_Workshop::startApplication() initMenu(); //Initialize event listening Events_Loop* aLoop = Events_Loop::loop(); + aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors. //TODO(sbh): Implement static method to extract event id [SEID] - Events_ID aFeatureId = aLoop->eventByName("FeatureEvent"); + Events_ID aFeatureId = aLoop->eventByName(EVENT_FEATURE_LOADED); aLoop->registerListener(this, aFeatureId); Events_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent"); aLoop->registerListener(this, aPartSetId); + Events_ID aFeatureUpdatedId = aLoop->eventByName(EVENT_FEATURE_UPDATED); + aLoop->registerListener(this, aFeatureUpdatedId); activateModule(); if (myMainWindow) { myMainWindow->show(); updateCommandStatus(); } onNew(); - // Testing of document creation - //boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); - //boost::shared_ptr aPoint1 = aMgr->rootDocument()->addFeature("Point"); - //boost::shared_ptr aPart = aMgr->rootDocument()->addFeature("Part"); - //aPart->execute(); - //aMgr->setCurrentDocument(aPart->data()->docRef("PartDocument")->value()); - //boost::shared_ptr aPoint2 = aMgr->rootDocument()->addFeature("Point"); - //aPoint2 = aMgr->rootDocument()->addFeature("Point"); - - //aPart = aMgr->rootDocument()->addFeature("Part"); - //aPart->execute(); } //****************************************************** @@ -172,69 +177,68 @@ XGUI_Workbench* XGUI_Workshop::addWorkbench(const QString& theName) //****************************************************** void XGUI_Workshop::processEvent(const Events_Message* theMessage) { - static Events_ID aFeatureId = Events_Loop::loop()->eventByName("FeatureEvent"); - if (theMessage->eventID() == aFeatureId) { - const Config_FeatureMessage* aFeatureMsg = - dynamic_cast(theMessage); + static Events_ID aFeatureLoadedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_LOADED); + if (theMessage->eventID() == aFeatureLoadedId) { + const Config_FeatureMessage* aFeatureMsg = dynamic_cast(theMessage); addFeature(aFeatureMsg); return; } - const Config_PointerMessage* aPartSetMsg = - dynamic_cast(theMessage); + static Events_ID aFeatureUpdatedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED); + if (theMessage->eventID() == aFeatureUpdatedId) + { + myPropertyPanel->updateContentWidget(); + } + const Config_PointerMessage* aPartSetMsg = dynamic_cast(theMessage); if (aPartSetMsg) { - ModuleBase_PropPanelOperation* anOperation = - (ModuleBase_PropPanelOperation*)(aPartSetMsg->pointer()); + ModuleBase_Operation* anOperation = + (ModuleBase_Operation*)(aPartSetMsg->pointer()); if (myOperationMgr->startOperation(anOperation)) { - if (anOperation->xmlRepresentation().isEmpty()) { + if (anOperation->getDescription()->xmlRepresentation().isEmpty()) { anOperation->commit(); updateCommandStatus(); } } return; } - -#ifdef _DEBUG - qDebug() << "XGUI_Workshop::ProcessEvent: " - << "Catch message, but it can not be processed."; -#endif + const Events_Error* anAppError = dynamic_cast(theMessage); + if (anAppError) { + emit errorOccurred(QString::fromLatin1(anAppError->description())); + myErrorDlg->show(); + myErrorDlg->raise(); + myErrorDlg->activateWindow(); + } } //****************************************************** void XGUI_Workshop::onOperationStarted() { - ModuleBase_PropPanelOperation* aOperation = - (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation()); + ModuleBase_Operation* aOperation = myOperationMgr->currentOperation(); - if(!aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel + if(!aOperation->getDescription()->xmlRepresentation().isEmpty()) { //!< No need for property panel connectWithOperation(aOperation); - QWidget* aPropWidget = myPropertyPanelDock->findChild(XGUI::PROP_PANEL_WDG); - qDeleteAll(aPropWidget->children()); showPropertyPanel(); ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation); - aFactory.createWidget(aPropWidget); - setPropertyPannelTitle(aOperation->description()); + aFactory.createWidget(myPropertyPanel->contentWidget()); + myPropertyPanel->setModelWidgets(aFactory.getWrappedWidgets()); + myPropertyPanel->setWindowTitle(aOperation->getDescription()->description()); } } //****************************************************** void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) { - ModuleBase_PropPanelOperation* aOperation = - (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation()); + ModuleBase_Operation* aOperation = myOperationMgr->currentOperation(); - if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel + if(aOperation->getDescription()->xmlRepresentation().isEmpty()) { //!< No need for property panel updateCommandStatus(); } else { hidePropertyPanel(); updateCommandStatus(); - - if (myMainWindow) { - myActionsMgr->restoreCommandState(); - } + myActionsMgr->restoreCommandState(); } } @@ -251,15 +255,22 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage) } //Find or create Workbench QString aWchName = QString::fromStdString(theMessage->workbenchId()); + QString aNestedFeatures = QString::fromStdString(theMessage->nestedFeatures()); + bool isUsePropPanel = theMessage->isUseInput(); if (isSalomeMode()) { + QString aId = QString::fromStdString(theMessage->id()); salomeConnector()->addFeature(aWchName, QString::fromStdString(theMessage->id()), - QString::fromStdString(theMessage->text()), + aId, QString::fromStdString(theMessage->tooltip()), QIcon(theMessage->icon().c_str()), - false, this, + isUsePropPanel, this, SLOT(onFeatureTriggered()), QKeySequence()); + myActionsMgr->addCommand(aId, salomeConnector()->command(aId)); + salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" ")); + } else { + XGUI_MainMenu* aMenuBar = myMainWindow->menuObject(); XGUI_Workbench* aPage = aMenuBar->findWorkbench(aWchName); if (!aPage) { @@ -271,13 +282,13 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage) 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); + aCommand->setUnblockableCommands(aNestedFeatures.split(" ")); myActionsMgr->addCommand(aCommand); myPartSetModule->featureCreated(aCommand); } @@ -290,25 +301,50 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage) */ void XGUI_Workshop::connectWithOperation(ModuleBase_Operation* theOperation) { - QPushButton* aOkBtn = myPropertyPanelDock->findChild(XGUI::PROP_PANEL_OK); + QPushButton* aOkBtn = myPropertyPanel->findChild(XGUI::PROP_PANEL_OK); connect(aOkBtn, SIGNAL(clicked()), theOperation, SLOT(commit())); - QPushButton* aCancelBtn = myPropertyPanelDock->findChild(XGUI::PROP_PANEL_CANCEL); + QPushButton* aCancelBtn = myPropertyPanel->findChild(XGUI::PROP_PANEL_CANCEL); connect(aCancelBtn, SIGNAL(clicked()), theOperation, SLOT(abort())); QAction* aCommand = 0; if (isSalomeMode()) { - aCommand = salomeConnector()->command(theOperation->operationId()); + aCommand = salomeConnector()->command(theOperation->getDescription()->operationId()); } else { XGUI_MainMenu* aMenu = myMainWindow->menuObject(); - aCommand = aMenu->feature(theOperation->operationId()); + aCommand = aMenu->feature(theOperation->getDescription()->operationId()); } //Abort operation on uncheck the command connect(aCommand, SIGNAL(triggered(bool)), theOperation, SLOT(setRunning(bool))); } +/* + * Saves document with given name. + */ +void XGUI_Workshop::saveDocument(QString theName) +{ + QApplication::restoreOverrideCursor(); + boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr aDoc = aMgr->rootDocument(); + aDoc->save(theName.toLatin1().constData()); + QApplication::restoreOverrideCursor(); +} + //****************************************************** void XGUI_Workshop::onExit() { + boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr aDoc = aMgr->rootDocument(); + if(aDoc->isModified()) { + int anAnswer = QMessageBox::question( + myMainWindow, tr("Save current file"), + tr("The document is modified, save before exit?"), + QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel); + if(anAnswer == QMessageBox::Save) { + onSave(); + } else if (anAnswer == QMessageBox::Cancel) { + return; + } + } qApp->exit(); } @@ -318,8 +354,9 @@ void XGUI_Workshop::onNew() QApplication::setOverrideCursor(Qt::WaitCursor); if (objectBrowser() == 0) { createDockWidgets(); - mySelector->connectObjectBrowser(objectBrowser()); + mySelector->connectViewers(); } + myViewerProxy->connectToViewer(); showObjectBrowser(); if (!isSalomeMode()) { myMainWindow->showPythonConsole(); @@ -333,21 +370,66 @@ void XGUI_Workshop::onNew() //****************************************************** void XGUI_Workshop::onOpen() { - //QString aFileName = QFileDialog::getOpenFileName(mainWindow()); + //save current file before close if modified + boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr aDoc = aMgr->rootDocument(); + if(aDoc->isModified()) { + //TODO(sbh): re-launch the app? + int anAnswer = QMessageBox::question( + myMainWindow, tr("Save current file"), + tr("The document is modified, save before opening another?"), + QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel); + if(anAnswer == QMessageBox::Save) { + onSave(); + } else if (anAnswer == QMessageBox::Cancel) { + return; + } + aDoc->close(); + myCurrentFile = ""; + } + + //show file dialog, check if readable and open + myCurrentFile = QFileDialog::getOpenFileName(mainWindow()); + if(myCurrentFile.isEmpty()) + return; + QFileInfo aFileInfo(myCurrentFile); + if(!aFileInfo.exists() || !aFileInfo.isReadable()) { + QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to open the file.")); + myCurrentFile = ""; + return; + } + QApplication::setOverrideCursor(Qt::WaitCursor); + aDoc->load(myCurrentFile.toLatin1().constData()); + QApplication::restoreOverrideCursor(); updateCommandStatus(); } //****************************************************** void XGUI_Workshop::onSave() { + if(myCurrentFile.isEmpty()) { + onSaveAs(); + return; + } + saveDocument(myCurrentFile); updateCommandStatus(); } //****************************************************** void XGUI_Workshop::onSaveAs() { - //QString aFileName = QFileDialog::getSaveFileName(mainWindow()); - updateCommandStatus(); + QString aTemp = myCurrentFile; + myCurrentFile = QFileDialog::getSaveFileName(mainWindow()); + if(myCurrentFile.isEmpty()) { + myCurrentFile = aTemp; + return; + } + QFileInfo aFileInfo(myCurrentFile); + if(aFileInfo.exists() && !aFileInfo.isWritable()) { + QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to save the file.")); + return; + } + onSave(); } //****************************************************** @@ -488,53 +570,6 @@ QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent) 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 @@ -546,30 +581,30 @@ void XGUI_Workshop::createDockWidgets() myMainWindow; QDockWidget* aObjDock = createObjectBrowser(aDesktop); aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock); - myPropertyPanelDock = createPropertyPanel(aDesktop); - aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanelDock); + myPropertyPanel = new XGUI_PropertyPanel(aDesktop); + aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel); hidePropertyPanel(); //tabifyDockWidget(aObjDock, myPropertyPanelDock); + aDesktop->tabifyDockWidget(aObjDock, myPropertyPanel); } //****************************************************** void XGUI_Workshop::showPropertyPanel() { - QAction* aViewAct = myPropertyPanelDock->toggleViewAction(); + QAction* aViewAct = myPropertyPanel->toggleViewAction(); //setEnabled(true); - myPropertyPanelDock->show(); - myPropertyPanelDock->raise(); + myPropertyPanel->show(); + myPropertyPanel->raise(); } //****************************************************** void XGUI_Workshop::hidePropertyPanel() { - QAction* aViewAct = myPropertyPanelDock->toggleViewAction(); + QAction* aViewAct = myPropertyPanel->toggleViewAction(); //setEnabled(false); - myPropertyPanelDock->hide(); + myPropertyPanel->hide(); } //****************************************************** @@ -596,15 +631,30 @@ void XGUI_Workshop::onFeatureTriggered() } //****************************************************** -XGUI_Displayer* XGUI_Workshop::displayer() const +void XGUI_Workshop::changeCurrentDocument() { - // 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()); + QFeatureList aFeatures = objectBrowser()->selectedFeatures(); + + // Set current document + if (aFeatures.size() > 0) { + FeaturePtr aFeature = aFeatures.first(); + + boost::shared_ptr aMgr = ModelAPI_PluginManager::get(); + boost::shared_ptr aDocRef = aFeature->data()->docRef("PartDocument"); + if (aDocRef) + aMgr->setCurrentDocument(aDocRef->value()); } - return myDisplayer; +} + +//****************************************************** +void XGUI_Workshop::salomeViewerSelectionChanged() +{ + emit salomeViewerSelection(); +} + + +//************************************************************** +XGUI_SalomeViewer* XGUI_Workshop::salomeViewer() const +{ + return mySalomeConnector->viewer(); }