X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=e484aa493de16a73dc4cbc66eeeaea2d7af76aa0;hb=cee771b5b59162bd91aa69a3a737a79b1905d866;hp=989d7148c599b7c6286d4f0e26d1ee2e62dc1201;hpb=13d3f0d8b46a06931cbe8620b8563049eff4a9f6;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 989d7148c..e484aa493 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -23,6 +23,7 @@ #include #include +#ifndef HAVE_SALOME #include #include #include @@ -30,6 +31,7 @@ #include #include #include +#endif #include #include @@ -78,6 +80,7 @@ #include #include #include +#include #include #include #include @@ -112,16 +115,16 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myObjectBrowser(0), myDisplayer(0) { - myMainWindow = mySalomeConnector ? 0 : new AppElements_MainWindow(); - - if (myMainWindow) { - SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr(); - bool aCloc = aResMgr->booleanValue("language", "locale", true); - if (aCloc) - QLocale::setDefault( QLocale::c() ); - else - QLocale::setDefault( QLocale::system() ); - } +#ifndef HAVE_SALOME + myMainWindow = new AppElements_MainWindow(); + + SUIT_ResourceMgr* aResMgr = ModuleBase_Preferences::resourceMgr(); + bool aCloc = aResMgr->booleanValue("language", "locale", true); + if (aCloc) + QLocale::setDefault( QLocale::c() ); + else + QLocale::setDefault( QLocale::system() ); +#endif myDisplayer = new XGUI_Displayer(this); @@ -131,7 +134,6 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myOperationMgr = new XGUI_OperationMgr(this, 0); myActionsMgr = new XGUI_ActionsMgr(this); myErrorDlg = new XGUI_ErrorDialog(QApplication::desktop()); - myErrorMgr = new XGUI_ErrorMgr(this); myContextMenuMgr = new XGUI_ContextMenuMgr(this); connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this, SLOT(onContextMenuCommand(const QString&, bool))); @@ -145,6 +147,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) ModuleBase_IWorkshop* aWorkshop = moduleConnector(); myOperationMgr->setWorkshop(aWorkshop); + myErrorMgr = new XGUI_ErrorMgr(this, aWorkshop); myEventsListener = new XGUI_WorkshopListener(aWorkshop); connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), @@ -160,8 +163,10 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), // myErrorMgr, SLOT(onValidationStateChanged())); - if (myMainWindow) - connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit())); +#ifndef HAVE_SALOME + connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit())); +#endif + connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&))); connect(myEventsListener, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&))); @@ -202,10 +207,11 @@ void XGUI_Workshop::startApplication() // by Config_PropManger to restore user-defined path to plugins ModuleBase_Preferences::loadCustomProps(); createModule(); - if (myMainWindow) { - myMainWindow->show(); - updateCommandStatus(); - } + +#ifndef HAVE_SALOME + myMainWindow->show(); + updateCommandStatus(); +#endif onNew(); @@ -253,48 +259,47 @@ void XGUI_Workshop::initMenu() { myContextMenuMgr->createActions(); - if (isSalomeMode()) { - // Create only Undo, Redo commands - QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"), - tr("Undo last command"), - QIcon(":pictures/undo.png"), - QKeySequence::Undo, false, "MEN_DESK_EDIT"); - QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" ); - salomeConnector()->addActionInToolbar( aAction,aToolBarTitle ); - - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onUndo())); - addHistoryMenu(aAction, SIGNAL(updateUndoHistory(const QList&)), SLOT(onUndo(int))); - - aAction = salomeConnector()->addDesktopCommand("REDO_CMD", tr("Redo"), tr("Redo last command"), - QIcon(":pictures/redo.png"), QKeySequence::Redo, - false, "MEN_DESK_EDIT"); - salomeConnector()->addActionInToolbar( aAction, aToolBarTitle ); - - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo())); - addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList&)), SLOT(onRedo(int))); - - salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT"); - aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"), - QIcon(":pictures/rebuild.png"), QKeySequence(), - false, "MEN_DESK_EDIT"); - salomeConnector()->addActionInToolbar( aAction, aToolBarTitle ); - - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild())); - salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT"); - - aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export NewGeom..."), tr("Export the current document into a NewGeom file"), - QIcon(), QKeySequence(), - false, "MEN_DESK_FILE"); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs())); - - aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import NewGeom..."), tr("Import a NewGeom file"), - QIcon(), QKeySequence(), - false, "MEN_DESK_FILE"); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen())); - salomeConnector()->addDesktopMenuSeparator("MEN_DESK_FILE"); +#ifdef HAVE_SALOME + // Create only Undo, Redo commands + QAction* aAction = salomeConnector()->addDesktopCommand("UNDO_CMD", tr("Undo"), + tr("Undo last command"), + QIcon(":pictures/undo.png"), + QKeySequence::Undo, false, "MEN_DESK_EDIT"); + QString aToolBarTitle = tr( "INF_DESK_TOOLBAR_STANDARD" ); + salomeConnector()->addActionInToolbar( aAction,aToolBarTitle ); + + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onUndo())); + addHistoryMenu(aAction, SIGNAL(updateUndoHistory(const QList&)), SLOT(onUndo(int))); + + aAction = salomeConnector()->addDesktopCommand("REDO_CMD", tr("Redo"), tr("Redo last command"), + QIcon(":pictures/redo.png"), QKeySequence::Redo, + false, "MEN_DESK_EDIT"); + salomeConnector()->addActionInToolbar( aAction, aToolBarTitle ); + + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRedo())); + addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList&)), SLOT(onRedo(int))); + + salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT"); + aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"), + QIcon(":pictures/rebuild.png"), QKeySequence(), + false, "MEN_DESK_EDIT"); + salomeConnector()->addActionInToolbar( aAction, aToolBarTitle ); + + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild())); + salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT"); + + aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export NewGeom..."), tr("Export the current document into a NewGeom file"), + QIcon(), QKeySequence(), + false, "MEN_DESK_FILE"); + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs())); + + aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import NewGeom..."), tr("Import a NewGeom file"), + QIcon(), QKeySequence(), + false, "MEN_DESK_FILE"); + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onOpen())); + salomeConnector()->addDesktopMenuSeparator("MEN_DESK_FILE"); - return; - } +#else // File commands group AppElements_MenuGroupPanel* aGroup = myMainWindow->menuObject()->generalPage(); @@ -336,10 +341,6 @@ void XGUI_Workshop::initMenu() 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("PREF_CMD", tr("Preferences"), tr("Edit preferences"), QIcon(":pictures/preferences.png"), QKeySequence::Preferences); aCommand->connectTo(this, SLOT(onPreferences())); @@ -347,25 +348,25 @@ void XGUI_Workshop::initMenu() aCommand = aGroup->addFeature("EXIT_CMD", tr("Exit"), tr("Exit application"), QIcon(":pictures/close.png"), QKeySequence::Close); aCommand->connectTo(this, SLOT(onExit())); - //FIXME: SBH's test action. Can be used for some GUI tests. -// #ifdef _DEBUG -// aCommand = aGroup->addFeature("TEST_CMD", "Test!", "Private debug button", -// QIcon(":pictures/close.png"), QKeySequence(), true); -// aCommand->connectTo(myMainWindow, SLOT(dockPythonConsole())); -// #endif +#endif } -//****************************************************** +#ifndef HAVE_SALOME AppElements_Workbench* XGUI_Workshop::addWorkbench(const QString& theName) { AppElements_MainMenu* aMenuBar = myMainWindow->menuObject(); return aMenuBar->addWorkbench(theName); } +#endif //****************************************************** QMainWindow* XGUI_Workshop::desktop() const { - return isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; +#ifdef HAVE_SALOME + return salomeConnector()->desktop(); +#else + return myMainWindow; +#endif } //****************************************************** @@ -392,7 +393,7 @@ void XGUI_Workshop::onAcceptActionClicked() } //****************************************************** -void XGUI_Workshop::onValidationStateChanged(bool theEnabled) +/*void XGUI_Workshop::onValidationStateChanged(bool theEnabled) { XGUI_OperationMgr* anOperationMgr = operationMgr(); if (anOperationMgr) { @@ -403,7 +404,7 @@ void XGUI_Workshop::onValidationStateChanged(bool theEnabled) myErrorMgr->updateActionState(anAction, aFOperation->feature(), theEnabled); } } -} +}*/ //****************************************************** @@ -418,6 +419,24 @@ void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const boo } } +//****************************************************** +bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature) +{ + bool aHasNested = false; + std::string aFeatureKind = theFeature->getKind(); +#ifdef HAVE_SALOME + XGUI_SalomeConnector* aSalomeConnector = salomeConnector(); + if (aSalomeConnector->isFeatureOfNested(actionsMgr()->action(aFeatureKind.c_str()))) + aHasNested = true; +#else + AppElements_MainMenu* aMenuBar = mainWindow()->menuObject(); + AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str()); + if (aCommand && aCommand->button()->additionalButtonWidget()) + aHasNested = true; +#endif + return aHasNested; +} + //****************************************************** void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation) { @@ -441,7 +460,7 @@ void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation) } updateCommandStatus(); - myModule->onOperationStarted(aFOperation); + myModule->operationStarted(aFOperation); // the objects of the current operation should be deactivated QObjectPtrList anObjects; @@ -469,7 +488,7 @@ void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation) } updateCommandStatus(); - myModule->onOperationResumed(theOperation); + myModule->operationResumed(theOperation); } @@ -489,7 +508,7 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) hidePropertyPanel(); myPropertyPanel->cleanContent(); - myModule->onOperationStopped(aFOperation); + myModule->operationStopped(aFOperation); // the deactivated objects of the current operation should be activated back. // They were deactivated on operation start or an object redisplay @@ -515,12 +534,12 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation) { - myModule->onOperationCommitted(theOperation); + myModule->operationCommitted(theOperation); } void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation) { - myModule->onOperationAborted(theOperation); + myModule->operationAborted(theOperation); } void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) @@ -535,6 +554,10 @@ void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) else aGrantedIds = myActionsMgr->nestedCommands(theOperation->id()); + ModuleBase_IModule* aModule = module(); + if (aModule) + aModule->grantedOperationIds(theOperation, aGrantedIds); + aFOperation->setGrantedOperationIds(aGrantedIds); } @@ -546,13 +569,26 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) showPropertyPanel(); QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); - ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(), - myModuleConnector); + ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector); myPropertyPanel->cleanContent(); aFactory.createWidget(myPropertyPanel->contentWidget()); QList aWidgets = aFactory.getModelWidgets(); + + // check compatibility of feature and widgets + FeaturePtr aFeature = aFOperation->feature(); + foreach (ModuleBase_ModelWidget* aWidget, aWidgets) { + if (!aWidget->attributeID().empty() && !aFeature->attribute(aWidget->attributeID()).get()) { + std::string anErrorMsg = "The feature '" + aFeature->getKind() + "' has no attribute '" + + aWidget->attributeID() + "' used by widget '" + + aWidget->metaObject()->className() + "'."; + Events_Error::send(anErrorMsg); + myPropertyPanel->cleanContent(); + return; + } + } + foreach (ModuleBase_ModelWidget* aWidget, aWidgets) { bool isStoreValue = !aFOperation->isEditOperation() && !aWidget->getDefaultValue().empty() && @@ -560,7 +596,7 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) aWidget->setFeature(aFOperation->feature(), isStoreValue); aWidget->enableFocusProcessing(); } - + myPropertyPanel->setModelWidgets(aWidgets); aFOperation->setPropertyPanel(myPropertyPanel); @@ -588,23 +624,42 @@ bool XGUI_Workshop::abortAllOperations() } //****************************************************** -void XGUI_Workshop::onExit() +void XGUI_Workshop::onOpen() { - SessionPtr aMgr = ModelAPI_Session::get(); - if (aMgr->isModified()) { + if(!abortAllOperations()) + return; + //save current file before close if modified + SessionPtr aSession = ModelAPI_Session::get(); + if (aSession->isModified()) { + //TODO(sbh): re-launch the app? int anAnswer = QMessageBox::question( - myMainWindow, tr("Save current file"), tr("The document is modified, save before exit?"), + desktop(), 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) { - bool saved = onSave(); - if (!saved) { - return; - } + onSave(); } else if (anAnswer == QMessageBox::Cancel) { return; } + myCurrentDir = ""; } - qApp->exit(); + + //show file dialog, check if readable and open + myCurrentDir = QFileDialog::getExistingDirectory(desktop(), tr("Select directory")); + if (myCurrentDir.isEmpty()) + return; + QFileInfo aFileInfo(myCurrentDir); + if (!aFileInfo.exists() || !aFileInfo.isReadable()) { + QMessageBox::critical(desktop(), tr("Warning"), tr("Unable to open the file.")); + myCurrentDir = ""; + return; + } + QApplication::setOverrideCursor(Qt::WaitCursor); + aSession->closeAll(); + aSession->load(myCurrentDir.toLatin1().constData()); + myObjectBrowser->rebuildDataTree(); + updateCommandStatus(); + QApplication::restoreOverrideCursor(); } //****************************************************** @@ -617,54 +672,57 @@ void XGUI_Workshop::onNew() } myViewerProxy->connectToViewer(); showObjectBrowser(); - if (!isSalomeMode()) { - myMainWindow->showPythonConsole(); - QMdiSubWindow* aWnd = myMainWindow->viewer()->createView(); - aWnd->showMaximized(); - updateCommandStatus(); - } +#ifndef HAVE_SALOME + myMainWindow->showPythonConsole(); + QMdiSubWindow* aWnd = myMainWindow->viewer()->createView(); + aWnd->showMaximized(); + updateCommandStatus(); +#endif myContextMenuMgr->connectViewer(); QApplication::restoreOverrideCursor(); } +#ifndef HAVE_SALOME //****************************************************** -void XGUI_Workshop::onOpen() +void XGUI_Workshop::onExit() { - if(!abortAllOperations()) - return; - //save current file before close if modified - SessionPtr aSession = ModelAPI_Session::get(); - if (aSession->isModified()) { - //TODO(sbh): re-launch the app? + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->isModified()) { int anAnswer = QMessageBox::question( - myMainWindow, tr("Save current file"), - tr("The document is modified, save before opening another?"), + 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(); + bool saved = onSave(); + if (!saved) { + return; + } } else if (anAnswer == QMessageBox::Cancel) { return; } - myCurrentDir = ""; } + qApp->exit(); +} - //show file dialog, check if readable and open - myCurrentDir = QFileDialog::getExistingDirectory(mainWindow(), tr("Select directory")); - if (myCurrentDir.isEmpty()) - return; - QFileInfo aFileInfo(myCurrentDir); - if (!aFileInfo.exists() || !aFileInfo.isReadable()) { - QMessageBox::critical(myMainWindow, tr("Warning"), tr("Unable to open the file.")); - myCurrentDir = ""; - return; +//****************************************************** +void XGUI_Workshop::onPreferences() +{ + ModuleBase_Prefs aModif; + ModuleBase_Preferences::editPreferences(aModif); + if (aModif.size() > 0) { + QString aSection; + foreach (ModuleBase_Pref aPref, aModif) + { + aSection = aPref.first; + if (aSection == ModuleBase_Preferences::VIEWER_SECTION) { + myMainWindow->viewer()->updateFromResources(); + } else if (aSection == ModuleBase_Preferences::MENU_SECTION) { + myMainWindow->menuObject()->updateFromResources(); + } + } + displayer()->redisplayObjects(); } - QApplication::setOverrideCursor(Qt::WaitCursor); - aSession->closeAll(); - aSession->load(myCurrentDir.toLatin1().constData()); - myObjectBrowser->rebuildDataTree(); - updateCommandStatus(); - QApplication::restoreOverrideCursor(); } +#endif //****************************************************** bool XGUI_Workshop::onSave() @@ -677,8 +735,9 @@ bool XGUI_Workshop::onSave() std::list aFiles; saveDocument(myCurrentDir, aFiles); updateCommandStatus(); - if (!isSalomeMode()) +#ifndef HAVE_SALOME myMainWindow->setModifiedState(false); +#endif return true; } @@ -687,7 +746,7 @@ bool XGUI_Workshop::onSaveAs() { if(!abortAllOperations()) return false; - QFileDialog dialog(mainWindow()); + QFileDialog dialog(desktop()); dialog.setWindowTitle(tr("Select directory to save files...")); dialog.setFileMode(QFileDialog::Directory); dialog.setFilter(tr("Directories (*)")); @@ -702,7 +761,7 @@ bool XGUI_Workshop::onSaveAs() QDir aDir(aTempDir); if (aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) { int answer = QMessageBox::question( - myMainWindow, + desktop(), //: Title of the dialog which asks user if he wants to save study in existing non-empty folder tr("Save"), tr("The directory already contains some files, save anyway?"), @@ -712,10 +771,10 @@ bool XGUI_Workshop::onSaveAs() } } myCurrentDir = aTempDir; - if (!isSalomeMode()) { +#ifndef HAVE_SALOME myMainWindow->setCurrentDir(myCurrentDir, false); myMainWindow->setModifiedState(false); - } +#endif return onSave(); } @@ -725,8 +784,8 @@ void XGUI_Workshop::onUndo(int theTimes) objectBrowser()->treeView()->setCurrentIndex(QModelIndex()); SessionPtr aMgr = ModelAPI_Session::get(); if (aMgr->isOperation()) { - /// this is important for nested operrations - /// when sketch opeation is active, this condition is false and + /// this is important for nested operations + /// when sketch operation is active, this condition is false and /// the sketch operation is not aborted operationMgr()->onAbortOperation(); } @@ -750,8 +809,8 @@ void XGUI_Workshop::onRedo(int theTimes) objectBrowser()->treeView()->setCurrentIndex(QModelIndex()); SessionPtr aMgr = ModelAPI_Session::get(); if (aMgr->isOperation()) { - /// this is important for nested operrations - /// when sketch opeation is active, this condition is false and + /// this is important for nested operations + /// when sketch operation is active, this condition is false and /// the sketch operation is not aborted operationMgr()->onAbortOperation(); } @@ -783,28 +842,6 @@ void XGUI_Workshop::onRebuild() updateCommandStatus(); } -//****************************************************** -void XGUI_Workshop::onPreferences() -{ - ModuleBase_Prefs aModif; - ModuleBase_Preferences::editPreferences(aModif); - if (aModif.size() > 0) { - QString aSection; - foreach (ModuleBase_Pref aPref, aModif) - { - aSection = aPref.first; - if (aSection == ModuleBase_Preferences::VIEWER_SECTION) { - if (!isSalomeMode()) - myMainWindow->viewer()->updateFromResources(); - } else if (aSection == ModuleBase_Preferences::MENU_SECTION) { - if (!isSalomeMode()) - myMainWindow->menuObject()->updateFromResources(); - } - } - displayer()->redisplayObjects(); - } -} - //****************************************************** ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule) { @@ -855,7 +892,7 @@ ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule) ModuleBase_IModule* aModule = crtInst ? crtInst(myModuleConnector) : 0; if (!err.isEmpty()) { - if (mainWindow()) { + if (desktop()) { Events_Error::send(err.toStdString()); } else { qWarning(qPrintable(err)); @@ -887,13 +924,13 @@ bool XGUI_Workshop::createModule() void XGUI_Workshop::updateCommandStatus() { QList aCommands; - if (isSalomeMode()) { // update commands in SALOME mode +#ifdef HAVE_SALOME aCommands = salomeConnector()->commandList(); - } else { +#else AppElements_MainMenu* aMenuBar = myMainWindow->menuObject(); foreach (AppElements_Command* aCmd, aMenuBar->features()) aCommands.append(aCmd); - } +#endif SessionPtr aMgr = ModelAPI_Session::get(); if (aMgr->hasModuleDocument()) { foreach(QAction* aCmd, aCommands) { @@ -942,9 +979,6 @@ QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent) aObjDock->setStyleSheet( "::title { position: relative; padding-left: 5px; text-align: left center }"); myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock); -#ifdef ModuleDataModel - myObjectBrowser->setDataModel(myModule->dataModel()); -#endif myModule->customizeObjectBrowser(myObjectBrowser); aObjDock->setWidget(myObjectBrowser); @@ -959,10 +993,10 @@ QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent) */ void XGUI_Workshop::createDockWidgets() { - QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; + QMainWindow* aDesktop = desktop(); QDockWidget* aObjDock = createObjectBrowser(aDesktop); aDesktop->addDockWidget(Qt::LeftDockWidgetArea, aObjDock); - myPropertyPanel = new XGUI_PropertyPanel(aDesktop); + myPropertyPanel = new XGUI_PropertyPanel(aDesktop, myOperationMgr); myPropertyPanel->setupActions(myActionsMgr); myPropertyPanel->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea | Qt::BottomDockWidgetArea); aDesktop->addDockWidget(Qt::LeftDockWidgetArea, myPropertyPanel); @@ -979,8 +1013,8 @@ void XGUI_Workshop::createDockWidgets() connect(myPropertyPanel, SIGNAL(noMoreWidgets()), myModule, SLOT(onNoMoreWidgets())); connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)), myOperationMgr, SLOT(onKeyReleased(QKeyEvent*))); - connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), - this, SLOT(onValidationStateChanged(bool))); + //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), + // this, SLOT(onValidationStateChanged(bool))); } //****************************************************** @@ -991,6 +1025,13 @@ void XGUI_Workshop::showPropertyPanel() aViewAct->setEnabled(true); myPropertyPanel->show(); myPropertyPanel->raise(); + + // The next code is necessary to made the property panel the active window + // in order to operation manager could process key events of the panel. + // otherwise they are ignored. It happens only if the same(activateWindow) is + // not happened by property panel activation(e.g. resume operation of Sketch) + myPropertyPanel->activateWindow(); + myPropertyPanel->setFocus(); } //****************************************************** @@ -1000,6 +1041,17 @@ void XGUI_Workshop::hidePropertyPanel() ///setEnabled(false); myPropertyPanel->hide(); + + // the property panel is active window of the desktop, when it is + // hidden, it is undefined which window becomes active. By this reason + // it is defined to perform the desktop as the active window. + // in SALOME mode, workstack made the PyConsole the active window, + // set the focus on it. As a result, shortcuts of the application, like + // are processed by this console. For example Undo actions. + // It is possible that this code is to be moved to NewGeom package + QMainWindow* aDesktop = desktop(); + aDesktop->activateWindow(); + aDesktop->setFocus(); } //****************************************************** @@ -1066,14 +1118,14 @@ void XGUI_Workshop::deleteObjects() return; } + QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); if (!abortAllOperations()) return; - QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); // It is necessary to clear selection in order to avoid selection changed event during - // deleteion and negative consequences connected with processing of already deleted items + // deletion and negative consequences connected with processing of already deleted items mySelector->clearSelection(); // check whether the object can be deleted. There should not be parts which are not loaded - if (!XGUI_Tools::canRemoveOrRename(myMainWindow, anObjects)) + if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects)) return; bool hasResult = false; @@ -1098,9 +1150,8 @@ void XGUI_Workshop::deleteObjects() operationMgr()->startOperation(anOpAction); // 3. delete objects - QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; std::set anIgnoredFeatures; - if (deleteFeatures(anObjects, anIgnoredFeatures, aDesktop, true)) { + if (deleteFeatures(anObjects, anIgnoredFeatures, desktop(), true)) { operationMgr()->commitOperation(); } else { @@ -1121,8 +1172,14 @@ void XGUI_Workshop::moveObjects() aMgr->startOperation(aDescription.toStdString()); QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); - DocumentPtr anActiveDocument = aMgr->activeDocument(); + // It is necessary to clear selection in order to avoid selection changed event during + // moving and negative consequences connected with processing of already moved items + mySelector->clearSelection(); + // check whether the object can be moved. There should not be parts which are not loaded + if (!XGUI_Tools::canRemoveOrRename(desktop(), anObjects)) + return; + DocumentPtr anActiveDocument = aMgr->activeDocument(); FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true); foreach (ObjectPtr aObject, anObjects) { if (!myModule->canApplyAction(aObject, anActionId)) @@ -1156,57 +1213,92 @@ bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList, // 1. find all referenced features std::set aDirectRefFeatures, aIndirectRefFeatures; foreach (ObjectPtr aDeletedObj, theList) { - XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, aDirectRefFeatures, aIndirectRefFeatures); + std::set alreadyProcessed; + XGUI_Tools::refsToFeatureInAllDocuments( + aDeletedObj, aDeletedObj, aDirectRefFeatures, aIndirectRefFeatures, alreadyProcessed); std::set aDifference; std::set_difference(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end(), aDirectRefFeatures.begin(), aDirectRefFeatures.end(), std::inserter(aDifference, aDifference.begin())); aIndirectRefFeatures = aDifference; } + + bool doDeleteReferences = true; + // 2. warn about the references remove, break the delete operation if the user chose it if (theAskAboutDeleteReferences && !aDirectRefFeatures.empty()) { QStringList aDirectRefNames; - foreach(const FeaturePtr& aFeature, aDirectRefFeatures) + foreach (const FeaturePtr& aFeature, aDirectRefFeatures) aDirectRefNames.append(aFeature->name().c_str()); QString aDirectNames = aDirectRefNames.join(", "); QStringList aIndirectRefNames; - foreach(const FeaturePtr& aFeature, aIndirectRefFeatures) + foreach (const FeaturePtr& aFeature, aIndirectRefFeatures) aIndirectRefNames.append(aFeature->name().c_str()); QString aIndirectNames = aIndirectRefNames.join(", "); - QMessageBox::StandardButton aRes = QMessageBox::warning( - theParent, tr("Delete features"), - QString(tr("Selected features are used in the following features: %1.\ - These features will be deleted.\n%2Would you like to continue?")).arg(aDirectNames) - .arg(aIndirectNames.isEmpty() ? QString() : QString("Also these features will be deleted: %1.\n").arg(aIndirectNames)), - QMessageBox::No | QMessageBox::Yes, QMessageBox::No); - if (aRes != QMessageBox::Yes) + bool canReplaceParameters = true; + foreach (ObjectPtr aObj, theList) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); + if (!std::dynamic_pointer_cast(aFeature->firstResult()).get()) { // the feature is not a parameter + canReplaceParameters = false; + break; + } + } + + QMessageBox aMessageBox(theParent); + aMessageBox.setWindowTitle(tr("Delete features")); + aMessageBox.setIcon(QMessageBox::Warning); + aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes); + aMessageBox.setDefaultButton(QMessageBox::No); + + QString aText; + if (canReplaceParameters) { + aText = QString(tr("Selected parameters are used in the following features: %1.\nThese features will be deleted.\n%2Or parameters could be replaced by their values.\nWould you like to continue?")) + .arg(aDirectNames).arg(aIndirectNames.isEmpty() ? QString() : QString(tr("(Also these features will be deleted: %1)\n")).arg(aIndirectNames)); + QPushButton *aReplaceButton = aMessageBox.addButton(tr("Replace"), QMessageBox::ActionRole); + } else { + aText = QString(tr("Selected features are used in the following features: %1.\nThese features will be deleted.\n%2Would you like to continue?")) + .arg(aDirectNames).arg(aIndirectNames.isEmpty() ? QString() : QString(tr("Also these features will be deleted: %1.\n")).arg(aIndirectNames)); + } + aMessageBox.setText(aText); + aMessageBox.exec(); + QMessageBox::ButtonRole aButtonRole = aMessageBox.buttonRole(aMessageBox.clickedButton()); + + if (aButtonRole == QMessageBox::NoRole) return false; + + if (aButtonRole == QMessageBox::ActionRole) { + foreach (ObjectPtr aObj, theList) + ModelAPI_ReplaceParameterMessage::send(aObj, this); + doDeleteReferences = false; + } } // 3. remove referenced features - std::set aFeaturesToDelete = aDirectRefFeatures; - aFeaturesToDelete.insert(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end()); - std::set::const_iterator anIt = aFeaturesToDelete.begin(), - aLast = aFeaturesToDelete.end(); + if (doDeleteReferences) { + std::set aFeaturesToDelete = aDirectRefFeatures; + aFeaturesToDelete.insert(aIndirectRefFeatures.begin(), aIndirectRefFeatures.end()); + std::set::const_iterator anIt = aFeaturesToDelete.begin(), + aLast = aFeaturesToDelete.end(); #ifdef DEBUG_DELETE - QStringList anInfo; + QStringList anInfo; #endif - for (; anIt != aLast; anIt++) { - FeaturePtr aFeature = (*anIt); - DocumentPtr aDoc = aFeature->document(); - if (theIgnoredFeatures.find(aFeature) == theIgnoredFeatures.end()) { - aDoc->removeFeature(aFeature); + for (; anIt != aLast; anIt++) { + FeaturePtr aFeature = (*anIt); + DocumentPtr aDoc = aFeature->document(); + if (theIgnoredFeatures.find(aFeature) == theIgnoredFeatures.end()) { + aDoc->removeFeature(aFeature); #ifdef DEBUG_DELETE - anInfo.append(ModuleBase_Tools::objectInfo(aFeature).toStdString().c_str()); + anInfo.append(ModuleBase_Tools::objectInfo(aFeature).toStdString().c_str()); #endif + } } - } #ifdef DEBUG_DELETE - qDebug(QString("remove references:%1").arg(anInfo.join("; ")).toStdString().c_str()); - anInfo.clear(); + qDebug(QString("remove references:%1").arg(anInfo.join("; ")).toStdString().c_str()); + anInfo.clear(); #endif + } QString anActionId = "DELETE_CMD"; QString anId = QString::fromStdString(anActionId.toStdString().c_str()); @@ -1262,6 +1354,32 @@ bool hasResults(QObjectPtrList theObjects, const std::set& theTypes return isFoundResultType; } +//************************************************************** +// Returns the list of all features for theDocument and all features of +// all nested parts. +std::list allFeatures(const DocumentPtr& theDocument) +{ + std::list aResultList; + std::list anAllFeatures = theDocument->allFeatures(); + foreach (const FeaturePtr& aFeature, anAllFeatures) { + // The order of appending features of the part and the part itself is important + + // Append features from a part feature + foreach (const ResultPtr& aResult, aFeature->results()) { + ResultPartPtr aResultPart = + std::dynamic_pointer_cast(aResult); + if (aResultPart.get() && aResultPart->partDoc().get()) { + // Recursion + std::list anAllFeatures = allFeatures(aResultPart->partDoc()); + aResultList.insert(aResultList.end(), anAllFeatures.begin(), anAllFeatures.end()); + } + } + + aResultList.push_back(aFeature); + } + return aResultList; +} + //************************************************************** // Returns the list of features placed between theObject and the current feature // in the same document. Excludes theObject, includes the current feature. @@ -1269,14 +1387,14 @@ std::list toCurrentFeatures(const ObjectPtr& theObject) { std::list aResult; DocumentPtr aDocument = theObject->document(); - std::list anAllFeatures = aDocument->allFeatures(); + std::list anAllFeatures = allFeatures(aDocument); // find the object iterator std::list::iterator aObjectIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject); - if (aObjectIt == anAllFeatures.end()) + if (aObjectIt == anAllFeatures.end()) return aResult; // find the current feature iterator std::list::iterator aCurrentIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true)); - if (aCurrentIt == anAllFeatures.end()) + if (aCurrentIt == anAllFeatures.end()) return aResult; // check the right order if (std::distance(aObjectIt, anAllFeatures.end()) <= std::distance(aCurrentIt, anAllFeatures.end())) @@ -1329,7 +1447,7 @@ bool XGUI_Workshop::canMoveFeature() std::set_intersection(aRefFeatures.begin(), aRefFeatures.end(), aPlacedFeatures.begin(), aPlacedFeatures.end(), std::inserter(aIntersectionFeatures, aIntersectionFeatures.begin())); - // 4. Return false if any reference feature is placed before curent feature + // 4. Return false if any reference feature is placed before current feature if (!aIntersectionFeatures.empty()) aCanMove = false; } @@ -1367,7 +1485,7 @@ bool XGUI_Workshop::canChangeColor() const return hasResults(aObjects, aTypes); } -void setColor(ResultPtr theResult, std::vector& theColor) +void setColor(ResultPtr theResult, const std::vector& theColor) { if (!theResult.get()) return; @@ -1386,6 +1504,7 @@ void setColor(ResultPtr theResult, std::vector& theColor) //************************************************************** void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) { + AttributeIntArrayPtr aColorAttr; // 1. find the current color of the object. This is a color of AIS presentation // The objects are iterated until a first valid color is found @@ -1412,8 +1531,10 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) if (aColor.size() != 3) return; + if (!abortAllOperations()) + return; // 2. show the dialog to change the value - XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(mainWindow()); + XGUI_ColorDialog* aDlg = new XGUI_ColorDialog(desktop()); aDlg->setColor(aColor); aDlg->move(QCursor::pos()); bool isDone = aDlg->exec() == QDialog::Accepted; @@ -1424,11 +1545,8 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) // 3. abort the previous operation and start a new one SessionPtr aMgr = ModelAPI_Session::get(); - bool aWasOperation = aMgr->isOperation(); // keep this value - if (!aWasOperation) { - QString aDescription = contextMenuMgr()->action("COLOR_CMD")->text(); - aMgr->startOperation(aDescription.toStdString()); - } + QString aDescription = contextMenuMgr()->action("COLOR_CMD")->text(); + aMgr->startOperation(aDescription.toStdString()); // 4. set the value to all results std::vector aColorResult = aDlg->getColor(); @@ -1437,14 +1555,14 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) if (aResult.get() != NULL) { ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(aResult); if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids - for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) - setColor(aCompsolidResult->subResult(i), aColorResult); + for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { + setColor(aCompsolidResult->subResult(i), !isRandomColor ? aColorResult : aDlg->getRandomColor()); + } } - setColor(aResult, aColorResult); + setColor(aResult, !isRandomColor ? aColorResult : aDlg->getRandomColor()); } } - if (!aWasOperation) - aMgr->finishOperation(); + aMgr->finishOperation(); updateCommandStatus(); } @@ -1601,3 +1719,29 @@ QList XGUI_Workshop::processHistoryList(const std::list } return aResult; } + +void XGUI_Workshop::synchronizeViewer() +{ + SessionPtr aMgr = ModelAPI_Session::get(); + DocumentPtr aDoc = aMgr->activeDocument(); + + synchronizeGroupInViewer(aDoc, ModelAPI_ResultConstruction::group(), false); + synchronizeGroupInViewer(aDoc, ModelAPI_ResultBody::group(), false); + synchronizeGroupInViewer(aDoc, ModelAPI_ResultPart::group(), false); + synchronizeGroupInViewer(aDoc, ModelAPI_ResultGroup::group(), false); +} + +void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc, + const std::string& theGroup, + bool theUpdateViewer) +{ + ObjectPtr aObj; + int aSize = theDoc->size(theGroup); + for (int i = 0; i < aSize; i++) { + aObj = theDoc->object(theGroup, i); + if (aObj->isDisplayed()) + myDisplayer->display(aObj, false); + } + if (theUpdateViewer) + myDisplayer->updateViewer(); +}