X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=fd3b111b61e1cc307b3822606074d6982a90db17;hb=ded1e8998ec9d6d57f5a5a122c4abced86874273;hp=b46d8d692014f50bb90da6a88b9a3786b254389c;hpb=73e052569fd3a86675d4d7e7b9c87c6896af4a05;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp old mode 100644 new mode 100755 index b46d8d692..fd3b111b6 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -4,6 +4,7 @@ #include "XGUI_Workshop.h" #include "XGUI_ActionsMgr.h" +#include "XGUI_MenuMgr.h" #include "XGUI_ColorDialog.h" #include "XGUI_ContextMenuMgr.h" #include "XGUI_Displayer.h" @@ -23,6 +24,7 @@ #include #include +#ifndef HAVE_SALOME #include #include #include @@ -30,6 +32,7 @@ #include #include #include +#endif #include #include @@ -49,7 +52,7 @@ //#include #include -#include +#include #include #include @@ -64,6 +67,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -71,6 +78,8 @@ #include #include #include +#include +#include #include @@ -78,6 +87,7 @@ #include #include #include +#include #include #include #include @@ -101,7 +111,11 @@ #include #endif +QString XGUI_Workshop::MOVE_TO_END_COMMAND = QObject::tr("Move to the end"); + //#define DEBUG_DELETE +//#define DEBUG_FEATURE_NAME +//#define DEBUG_CLEAN_HISTORY XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) : QObject(), @@ -111,44 +125,58 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myPropertyPanel(0), myObjectBrowser(0), myDisplayer(0) + //myViewerSelMode(TopAbs_FACE) { - myMainWindow = mySalomeConnector ? 0 : new AppElements_MainWindow(); + mySelector = new XGUI_SelectionMgr(this); + myModuleConnector = new XGUI_ModuleConnector(this); + myOperationMgr = new XGUI_OperationMgr(this, 0); + ModuleBase_IWorkshop* aWorkshop = moduleConnector(); + // Has to be defined first in order to get errors and messages from other components + myEventsListener = new XGUI_WorkshopListener(aWorkshop); - 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 + QString aPath = Config_XMLReader::pluginConfigFile().c_str(); + QDir aDir(aPath); + + // Load translations + QStringList aFilters; + aFilters << "*_en.ts"; + QStringList aTsFiles = aDir.entryList(aFilters, QDir::Files); + foreach(QString aFileName, aTsFiles) { + Config_Translator::load(aFileName.toStdString()); } + myDataModelXMLReader = new Config_DataModelReader(); + //myDataModelXMLReader->readAll(); + myDisplayer = new XGUI_Displayer(this); - mySelector = new XGUI_SelectionMgr(this); - //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands())); + connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateCommandStatus())); - myOperationMgr = new XGUI_OperationMgr(this, 0); myActionsMgr = new XGUI_ActionsMgr(this); + myMenuMgr = new XGUI_MenuMgr(this); myErrorDlg = new XGUI_ErrorDialog(QApplication::desktop()); myContextMenuMgr = new XGUI_ContextMenuMgr(this); connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this, SLOT(onContextMenuCommand(const QString&, bool))); myViewerProxy = new XGUI_ViewerProxy(this); - connect(myViewerProxy, SIGNAL(selectionChanged()), - myActionsMgr, SLOT(updateOnViewSelection())); - - myModuleConnector = new XGUI_ModuleConnector(this); + //connect(myViewerProxy, SIGNAL(selectionChanged()), + // myActionsMgr, SLOT(updateOnViewSelection())); - ModuleBase_IWorkshop* aWorkshop = moduleConnector(); myOperationMgr->setWorkshop(aWorkshop); myErrorMgr = new XGUI_ErrorMgr(this, aWorkshop); - myEventsListener = new XGUI_WorkshopListener(aWorkshop); - connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), - SLOT(onOperationStarted(ModuleBase_Operation*))); connect(myOperationMgr, SIGNAL(operationResumed(ModuleBase_Operation*)), SLOT(onOperationResumed(ModuleBase_Operation*))); connect(myOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)), @@ -157,19 +185,19 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) SLOT(onOperationCommitted(ModuleBase_Operation*))); connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)), SLOT(onOperationAborted(ModuleBase_Operation*))); - //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), - // myErrorMgr, SLOT(onValidationStateChanged())); - if (myMainWindow) - connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit())); - connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&))); - connect(myEventsListener, SIGNAL(errorOccurred(const QString&)), - myErrorDlg, SLOT(addError(const QString&))); +#ifndef HAVE_SALOME + connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit())); + onTrihedronVisibilityChanged(true); +#endif + + connect(myEventsListener, SIGNAL(errorOccurred(std::shared_ptr)), + myErrorDlg, SLOT(addError(std::shared_ptr))); //Config_PropManager::registerProp("Visualization", "object_default_color", "Object color", // Config_Prop::Color, "225,225,225"); - Config_PropManager::registerProp("Visualization", "result_body_color", "Body color", + Config_PropManager::registerProp("Visualization", "result_body_color", "Result color", Config_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR()); Config_PropManager::registerProp("Visualization", "result_group_color", "Group color", Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR()); @@ -177,24 +205,44 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) Config_Prop::Color, ModelAPI_ResultConstruction::DEFAULT_COLOR()); Config_PropManager::registerProp("Visualization", "result_part_color", "Part color", Config_Prop::Color, ModelAPI_ResultPart::DEFAULT_COLOR()); + + if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "face-selection", true)) + myViewerSelMode.append(TopAbs_FACE); + if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "edge-selection", true)) + myViewerSelMode.append(TopAbs_EDGE); + if (ModuleBase_Preferences::resourceMgr()->booleanValue("Viewer", "vertex-selection", true)) + myViewerSelMode.append(TopAbs_VERTEX); + //IMP: an attempt to use result selection with other selection modes + myViewerSelMode.append(ModuleBase_ResultPrs::Sel_Result);//TopAbs_VERTEX); + myViewerSelMode.append(TopAbs_COMPSOLID); } //****************************************************** XGUI_Workshop::~XGUI_Workshop(void) { +#ifdef _DEBUG +#ifdef MISSED_TRANSLATION + // Save Missed translations + Config_Translator::saveMissedTranslations(); +#endif +#endif + delete myDisplayer; + delete myDataModelXMLReader; } //****************************************************** void XGUI_Workshop::startApplication() { + //Initialize event listening + myEventsListener->initializeEventListening(); + + myDataModelXMLReader->readAll(); initMenu(); Config_PropManager::registerProp("Plugins", "default_path", "Default Path", Config_Prop::Directory, ""); - //Initialize event listening - myEventsListener->initializeEventListening(); registerValidators(); @@ -202,13 +250,18 @@ 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(); + myViewerProxy->connectViewProxy(); + connect(myViewerProxy, SIGNAL(trihedronVisibilityChanged(bool)), + SLOT(onTrihedronVisibilityChanged(bool))); + emit applicationStarted(); } @@ -221,14 +274,13 @@ void XGUI_Workshop::activateModule() connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)), myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); - myActionsMgr->update(); + updateCommandStatus(); + + // TODO: get default selection mode // activate visualized objects in the viewer - XGUI_Displayer* aDisplayer = displayer(); - QObjectPtrList aDisplayed = aDisplayer->displayedObjects(); - QIntList aModes; - module()->activeSelectionModes(aModes); - aDisplayer->activateObjects(aModes, aDisplayed); + activateObjectsSelection(displayer()->displayedObjects()); + myOperationMgr->activate(); } void XGUI_Workshop::deactivateModule() @@ -246,6 +298,8 @@ void XGUI_Workshop::deactivateModule() XGUI_Displayer* aDisplayer = displayer(); QObjectPtrList aDisplayed = aDisplayer->displayedObjects(); aDisplayer->deactivateObjects(aDisplayed, true); + + myOperationMgr->deactivate(); } //****************************************************** @@ -253,48 +307,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 native..."), tr("Export the current document into a native file"), + QIcon(), QKeySequence(), + false, "MEN_DESK_FILE"); + connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSaveAs())); + + aAction = salomeConnector()->addDesktopCommand("OPEN_CMD", tr("Import native..."), tr("Import native 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(); @@ -305,6 +358,10 @@ void XGUI_Workshop::initMenu() aCommand->connectTo(this, SLOT(onSave())); //aCommand->disable(); + aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"), + QIcon(":pictures/save.png"), QKeySequence()); + aCommand->connectTo(this, SLOT(onSaveAs())); + QString aUndoId = "UNDO_CMD"; aCommand = aGroup->addFeature(aUndoId, tr("Undo"), tr("Undo last command"), QIcon(":pictures/undo.png"), QKeySequence::Undo); @@ -323,23 +380,16 @@ void XGUI_Workshop::initMenu() SIGNAL(updateRedoHistory(const QList&)), SLOT(onRedo(int))); - aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"), - QIcon(":pictures/rebuild.png"), QKeySequence()); - aCommand->connectTo(this, SLOT(onRebuild())); + //aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"), + // QIcon(":pictures/rebuild.png"), QKeySequence()); + //aCommand->connectTo(this, SLOT(onRebuild())); - aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"), - QIcon(":pictures/save.png"), QKeySequence()); - aCommand->connectTo(this, SLOT(onSaveAs())); //aCommand->disable(); aCommand = aGroup->addFeature("OPEN_CMD", tr("Open..."), tr("Open a new document"), 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 +397,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 } //****************************************************** @@ -385,26 +435,26 @@ void XGUI_Workshop::onAcceptActionClicked() ModuleBase_OperationFeature* aFOperation = dynamic_cast (anOperationMgr->currentOperation()); if (aFOperation) { - if (errorMgr()->canProcessClick(anAction, aFOperation->feature())) - myOperationMgr->onCommitOperation(); + //if (errorMgr()->canProcessClick(anAction, aFOperation->feature())) + myOperationMgr->onCommitOperation(); } } } //****************************************************** -/*void XGUI_Workshop::onValidationStateChanged(bool theEnabled) +void XGUI_Workshop::onPreviewActionClicked() { - XGUI_OperationMgr* anOperationMgr = operationMgr(); - if (anOperationMgr) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast - (anOperationMgr->currentOperation()); - if (aFOperation) { - QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept); - myErrorMgr->updateActionState(anAction, aFOperation->feature(), theEnabled); + ModuleBase_IPropertyPanel* aPanel = propertyPanel(); + if (aPanel) { + ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget(); + if (anActiveWidget && anActiveWidget->getValueState() == ModuleBase_ModelWidget::ModifiedInPP) { + anActiveWidget->storeValue(); } } -}*/ - + std::shared_ptr aMsg = std::shared_ptr( + new Events_Message(Events_Loop::eventByName(EVENT_PREVIEW_REQUESTED))); + Events_Loop::loop()->send(aMsg); +} //****************************************************** void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer) @@ -423,58 +473,112 @@ bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature) { bool aHasNested = false; std::string aFeatureKind = theFeature->getKind(); - if (isSalomeMode()) { +#ifdef HAVE_SALOME XGUI_SalomeConnector* aSalomeConnector = salomeConnector(); if (aSalomeConnector->isFeatureOfNested(actionsMgr()->action(aFeatureKind.c_str()))) aHasNested = true; - } else { +#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) +void XGUI_Workshop::fillPropertyPanel(ModuleBase_Operation* theOperation) { - setGrantedFeatures(theOperation); - - ModuleBase_OperationFeature* aFOperation = dynamic_cast - (theOperation); + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); if (!aFOperation) return; - if (aFOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel - setPropertyPanel(aFOperation); - // filling the operation values by the current selection - // if the operation can be committed after the controls filling, the method perform should - // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch) - if (!aFOperation->isEditOperation()) { - aFOperation->activateByPreselection(); - if (operationMgr()->currentOperation() != aFOperation) - return; + showPropertyPanel(); + myPropertyPanel->cleanContent(); + + QList aWidgets; + if (!module()->createWidgets(theOperation, aWidgets)) { + QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); + ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), myModuleConnector); + aFactory.createWidget(myPropertyPanel->contentWidget()); + aWidgets = aFactory.getModelWidgets(); + } + + // check compatibility of feature and widgets + FeaturePtr aFeature = aFOperation->feature(); + std::string aFeatureKind = aFeature->getKind(); + foreach (ModuleBase_ModelWidget* aWidget, aWidgets) { + if (!aWidget->attributeID().empty() && !aFeature->attribute(aWidget->attributeID()).get()) { + std::string anErrorMsg = "The feature '%1' has no attribute '%2' used by widget '%3'."; + Events_InfoMessage("XGUI_Workshop", anErrorMsg) + .arg(aFeatureKind).arg(aWidget->attributeID()).arg(aWidget->metaObject()->className()).send(); + myPropertyPanel->cleanContent(); + return; } } - updateCommandStatus(); + // for performance purpose, flush should be done after all controls are filled + bool isUpdateFlushed = false; + foreach (ModuleBase_ModelWidget* aWidget, aWidgets) { + bool isStoreValue = !aFOperation->isEditOperation() && + !aWidget->getDefaultValue().empty() && + !aWidget->isComputedDefault(); + aWidget->setFeature(aFeature, isStoreValue, isUpdateFlushed); + if (!isStoreValue) + aWidget->restoreValue(); + aWidget->enableFocusProcessing(); + } + ModuleBase_Tools::flushUpdated(aFeature); - myModule->onOperationStarted(aFOperation); + // update visible state of Preview button +#ifdef HAVE_SALOME + bool anIsAutoPreview = mySalomeConnector->featureInfo(aFeatureKind.c_str())->isAutoPreview(); +#else + AppElements_MainMenu* aMenuBar = mainWindow()->menuObject(); + AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str()); + bool anIsAutoPreview = aCommand && aCommand->featureMessage()->isAutoPreview(); +#endif + if (!anIsAutoPreview) { + myPropertyPanel->findButton(PROP_PANEL_PREVIEW)->setVisible(true); + // send signal about preview should not be computed automatically, click on preview + // button should initiate it + std::shared_ptr aMsg = std::shared_ptr( + new Events_Message(Events_Loop::eventByName(EVENT_PREVIEW_BLOCKED))); + Events_Loop::loop()->send(aMsg); + } + myPropertyPanel->setModelWidgets(aWidgets); + aFOperation->setPropertyPanel(myPropertyPanel); - // the objects of the current operation should be deactivated - QObjectPtrList anObjects; - FeaturePtr aFeature = aFOperation->feature(); - anObjects.append(aFeature); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - anObjects.append(*aIt); - } - QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); - for (; anIt != aLast; anIt++) - deactivateActiveObject(*anIt, false); - if (anObjects.size() > 0) - myDisplayer->updateViewer(); + myModule->propertyPanelDefined(theOperation); + +#ifndef DEBUG_FEATURE_NAME + myPropertyPanel->setWindowTitle(theOperation->getDescription()->description()); +#else + std::string aFeatureName = aFeature->name(); + myPropertyPanel->setWindowTitle(QString("%1: %2").arg(theOperation->getDescription()->description()) + .arg(aFeatureName.c_str())); +#endif + + myErrorMgr->setPropertyPanel(myPropertyPanel); +} + +void XGUI_Workshop::connectToPropertyPanel(const bool isToConnect) +{ + XGUI_PropertyPanel* aPropertyPanel = propertyPanel(); + if (aPropertyPanel) { + const QList& aWidgets = aPropertyPanel->modelWidgets(); + foreach (ModuleBase_ModelWidget* aWidget, aWidgets) { + myModule->connectToPropertyPanel(aWidget, isToConnect); + if (isToConnect) { + connect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int))); + connect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged())); + connect(aWidget, SIGNAL(objectUpdated()), this, SLOT(onWidgetObjectUpdated())); + } + else { + disconnect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int))); + disconnect(aWidget, SIGNAL(valuesChanged()), this, SLOT(onValuesChanged())); + disconnect(aWidget, SIGNAL(objectUpdated()), this, SLOT(onWidgetObjectUpdated())); + } + } + } } //****************************************************** @@ -483,11 +587,12 @@ void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation) setGrantedFeatures(theOperation); if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel - setPropertyPanel(theOperation); + fillPropertyPanel(theOperation); + connectToPropertyPanel(true); } updateCommandStatus(); - myModule->onOperationResumed(theOperation); + myModule->operationResumed(theOperation); } @@ -507,7 +612,8 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) hidePropertyPanel(); myPropertyPanel->cleanContent(); - myModule->onOperationStopped(aFOperation); + connectToPropertyPanel(false); + myModule->operationStopped(aFOperation); // the deactivated objects of the current operation should be activated back. // They were deactivated on operation start or an object redisplay @@ -516,7 +622,8 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) if (aFeature.get()) { // feature may be not created (plugin load fail) if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature)) anObjects.append(aFeature); - std::list aResults = aFeature->results(); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list::const_iterator aIt; for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { ResultPtr anObject = *aIt; @@ -525,20 +632,18 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) } } } - QIntList aModes; - module()->activeSelectionModes(aModes); - myDisplayer->activateObjects(aModes, anObjects); + activateObjectsSelection(anObjects); } 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) @@ -548,8 +653,13 @@ void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) return; QStringList aGrantedIds; - if (isSalomeMode()) - aGrantedIds = mySalomeConnector->nestedActions(theOperation->id()); + if (isSalomeMode()) { + const std::shared_ptr& anInfo = + mySalomeConnector->featureInfo(theOperation->id()); + if (anInfo.get()) + aGrantedIds = QString::fromStdString(anInfo->nestedFeatures()) + .split(" ", QString::SkipEmptyParts); + } else aGrantedIds = myActionsMgr->nestedCommands(theOperation->id()); @@ -560,55 +670,7 @@ void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) aFOperation->setGrantedOperationIds(aGrantedIds); } -void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) -{ - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); - if (!aFOperation) - return; - - showPropertyPanel(); - QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); - 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() && - !aWidget->isComputedDefault(); - aWidget->setFeature(aFOperation->feature(), isStoreValue); - aWidget->enableFocusProcessing(); - } - - myPropertyPanel->setModelWidgets(aWidgets); - aFOperation->setPropertyPanel(myPropertyPanel); - - myModule->propertyPanelDefined(theOperation); - - myPropertyPanel->setWindowTitle(theOperation->getDescription()->description()); - - myErrorMgr->setPropertyPanel(myPropertyPanel); -} - -/* - * Saves document with given name. - */ +//****************************************************** void XGUI_Workshop::saveDocument(const QString& theName, std::list& theFileNames) { QApplication::restoreOverrideCursor(); @@ -617,49 +679,22 @@ void XGUI_Workshop::saveDocument(const QString& theName, std::list& QApplication::restoreOverrideCursor(); } +//****************************************************** bool XGUI_Workshop::abortAllOperations() { return myOperationMgr->abortAllOperations(); } //****************************************************** -void XGUI_Workshop::onExit() +void XGUI_Workshop::operationStarted(ModuleBase_Operation* theOperation) { - SessionPtr aMgr = ModelAPI_Session::get(); - if (aMgr->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) { - bool saved = onSave(); - if (!saved) { - return; - } - } else if (anAnswer == QMessageBox::Cancel) { - return; - } - } - qApp->exit(); -} - -//****************************************************** -void XGUI_Workshop::onNew() -{ - QApplication::setOverrideCursor(Qt::WaitCursor); - if (objectBrowser() == 0) { - createDockWidgets(); - mySelector->connectViewers(); - } - myViewerProxy->connectToViewer(); - showObjectBrowser(); - if (!isSalomeMode()) { - myMainWindow->showPythonConsole(); - QMdiSubWindow* aWnd = myMainWindow->viewer()->createView(); - aWnd->showMaximized(); + setGrantedFeatures(theOperation); + if (!theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel updateCommandStatus(); } - myContextMenuMgr->connectViewer(); - QApplication::restoreOverrideCursor(); + else { + myModule->operationStarted(theOperation); + } } //****************************************************** @@ -672,7 +707,7 @@ void XGUI_Workshop::onOpen() if (aSession->isModified()) { //TODO(sbh): re-launch the app? int anAnswer = QMessageBox::question( - myMainWindow, tr("Save current file"), + 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) { @@ -684,12 +719,12 @@ void XGUI_Workshop::onOpen() } //show file dialog, check if readable and open - myCurrentDir = QFileDialog::getExistingDirectory(mainWindow(), tr("Select directory")); + myCurrentDir = QFileDialog::getExistingDirectory(desktop(), 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.")); + QMessageBox::critical(desktop(), tr("Warning"), tr("Unable to open the file.")); myCurrentDir = ""; return; } @@ -701,6 +736,76 @@ void XGUI_Workshop::onOpen() QApplication::restoreOverrideCursor(); } +//****************************************************** +void XGUI_Workshop::onNew() +{ + QApplication::setOverrideCursor(Qt::WaitCursor); + if (objectBrowser() == 0) { + createDockWidgets(); + mySelector->connectViewers(); + } + myViewerProxy->connectToViewer(); + showObjectBrowser(); +#ifndef HAVE_SALOME + myMainWindow->showPythonConsole(); + QMdiSubWindow* aWnd = myMainWindow->viewer()->createView(); + aWnd->showMaximized(); + updateCommandStatus(); +#endif + myContextMenuMgr->connectViewer(); + QApplication::restoreOverrideCursor(); +} + +#ifndef HAVE_SALOME +//****************************************************** +void XGUI_Workshop::onExit() +{ + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->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) { + bool saved = onSave(); + if (!saved) { + return; + } + } else if (anAnswer == QMessageBox::Cancel) { + return; + } + } + qApp->exit(); +} + +//****************************************************** +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(); + } +} +#endif + +//****************************************************** +void XGUI_Workshop::onTrihedronVisibilityChanged(bool theState) +{ + XGUI_Displayer* aDisplayer = displayer(); + if (aDisplayer) + aDisplayer->displayTrihedron(theState); +} + //****************************************************** bool XGUI_Workshop::onSave() { @@ -712,8 +817,9 @@ bool XGUI_Workshop::onSave() std::list aFiles; saveDocument(myCurrentDir, aFiles); updateCommandStatus(); - if (!isSalomeMode()) +#ifndef HAVE_SALOME myMainWindow->setModifiedState(false); +#endif return true; } @@ -722,7 +828,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 (*)")); @@ -737,7 +843,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?"), @@ -747,10 +853,10 @@ bool XGUI_Workshop::onSaveAs() } } myCurrentDir = aTempDir; - if (!isSalomeMode()) { +#ifndef HAVE_SALOME myMainWindow->setCurrentDir(myCurrentDir, false); myMainWindow->setModifiedState(false); - } +#endif return onSave(); } @@ -759,14 +865,18 @@ void XGUI_Workshop::onUndo(int theTimes) { objectBrowser()->treeView()->setCurrentIndex(QModelIndex()); SessionPtr aMgr = ModelAPI_Session::get(); + std::list aUndoList = aMgr->undoList(); if (aMgr->isOperation()) { /// this is important for nested operations /// when sketch operation is active, this condition is false and /// the sketch operation is not aborted operationMgr()->onAbortOperation(); } - for (int i = 0; i < theTimes; ++i) { + std::list::const_iterator aIt = aUndoList.cbegin(); + for (int i = 0; (i < theTimes) && (aIt != aUndoList.cend()); ++i, ++aIt) { aMgr->undo(); + if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND) + myObjectBrowser->rebuildDataTree(); } operationMgr()->updateApplyOfOperations(); @@ -784,14 +894,18 @@ void XGUI_Workshop::onRedo(int theTimes) objectBrowser()->treeView()->setCurrentIndex(QModelIndex()); SessionPtr aMgr = ModelAPI_Session::get(); + std::list aRedoList = aMgr->redoList(); if (aMgr->isOperation()) { /// this is important for nested operations /// when sketch operation is active, this condition is false and /// the sketch operation is not aborted operationMgr()->onAbortOperation(); } - for (int i = 0; i < theTimes; ++i) { + std::list::const_iterator aIt = aRedoList.cbegin(); + for (int i = 0; (i < theTimes) && (aIt != aRedoList.cend()); ++i, ++aIt) { aMgr->redo(); + if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND) + myObjectBrowser->rebuildDataTree(); } operationMgr()->updateApplyOfOperations(); updateCommandStatus(); @@ -802,45 +916,65 @@ void XGUI_Workshop::onRedo(int theTimes) } //****************************************************** -void XGUI_Workshop::onRebuild() +//void XGUI_Workshop::onRebuild() +//{ +// SessionPtr aMgr = ModelAPI_Session::get(); +// bool aWasOperation = aMgr->isOperation(); // keep this value +// if (!aWasOperation) { +// aMgr->startOperation("Rebuild"); +// } +// static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild"); +// Events_Loop::loop()->send(std::shared_ptr( +// new Events_Message(aRebuildEvent, this))); +// if (!aWasOperation) { +// aMgr->finishOperation(); +// } +// updateCommandStatus(); +//} + +//****************************************************** +void XGUI_Workshop::onWidgetStateChanged(int thePreviousState) { - SessionPtr aMgr = ModelAPI_Session::get(); - bool aWasOperation = aMgr->isOperation(); // keep this value - if (!aWasOperation) { - aMgr->startOperation("Rebuild"); + ModuleBase_ModelWidget* anActiveWidget = 0; + ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); + if (anOperation) { + ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel(); + if (aPanel) + anActiveWidget = aPanel->activeWidget(); } - static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild"); - Events_Loop::loop()->send(std::shared_ptr( - new Events_Message(aRebuildEvent, this))); - if (!aWasOperation) { - aMgr->finishOperation(); - } - updateCommandStatus(); + if (anActiveWidget) + operationMgr()->onValidateOperation(); + + myModule->widgetStateChanged(thePreviousState); } //****************************************************** -void XGUI_Workshop::onPreferences() +void XGUI_Workshop::onValuesChanged() { - 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_ModelWidget* aSenderWidget = (ModuleBase_ModelWidget*)(sender()); + if (!aSenderWidget || aSenderWidget->canAcceptFocus()) + return; + + ModuleBase_ModelWidget* anActiveWidget = 0; + ModuleBase_Operation* anOperation = myOperationMgr->currentOperation(); + if (anOperation) { + ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel(); + if (aPanel) + anActiveWidget = aPanel->activeWidget(); + } + if (anActiveWidget) { + ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast + (anActiveWidget); + if (aWidgetValidated) + aWidgetValidated->clearValidatedCash(); } } -//****************************************************** +void XGUI_Workshop::onWidgetObjectUpdated() +{ + operationMgr()->onValidateOperation(); +} + ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule) { QString libName = QString::fromStdString(library(theModule.toStdString())); @@ -890,8 +1024,8 @@ ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule) ModuleBase_IModule* aModule = crtInst ? crtInst(myModuleConnector) : 0; if (!err.isEmpty()) { - if (mainWindow()) { - Events_Error::send(err.toStdString()); + if (desktop()) { + Events_InfoMessage("XGUI_Workshop", err.toStdString()).send(); } else { qWarning(qPrintable(err)); } @@ -914,6 +1048,9 @@ bool XGUI_Workshop::createModule() // myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); myModule->createFeatures(); +#ifdef HAVE_SALOME + salomeConnector()->createFeatureActions(); +#endif //myActionsMgr->update(); return true; } @@ -922,13 +1059,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) { @@ -953,7 +1090,7 @@ void XGUI_Workshop::updateCommandStatus() aCmd->setEnabled(false); } } - myActionsMgr->update(); + myActionsMgr->updateCommandsStatus(); emit commandStatusUpdated(); } @@ -977,6 +1114,7 @@ QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent) aObjDock->setStyleSheet( "::title { position: relative; padding-left: 5px; text-align: left center }"); myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock); + myObjectBrowser->setXMLReader(myDataModelXMLReader); myModule->customizeObjectBrowser(myObjectBrowser); aObjDock->setWidget(myObjectBrowser); @@ -991,7 +1129,7 @@ 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, myOperationMgr); @@ -1008,11 +1146,14 @@ void XGUI_Workshop::createDockWidgets() QAction* aCancelAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Abort); connect(aCancelAct, SIGNAL(triggered()), myOperationMgr, SLOT(onAbortOperation())); - 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))); + + QAction* aPreviewAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Preview); + connect(aPreviewAct, SIGNAL(triggered()), this, SLOT(onPreviewActionClicked())); + + connect(myPropertyPanel, SIGNAL(keyReleased(QObject*, QKeyEvent*)), + myOperationMgr, SLOT(onKeyReleased(QObject*, QKeyEvent*))); + connect(myPropertyPanel, SIGNAL(enterClicked(QObject*)), + myOperationMgr, SLOT(onProcessEnter(QObject*))); } //****************************************************** @@ -1028,8 +1169,8 @@ void XGUI_Workshop::showPropertyPanel() // 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(); + ModuleBase_Tools::activateWindow(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()"); + ModuleBase_Tools::setFocus(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()"); } //****************************************************** @@ -1046,22 +1187,24 @@ void XGUI_Workshop::hidePropertyPanel() // 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 = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; - aDesktop->activateWindow(); - aDesktop->setFocus(); + // It is possible that this code is to be moved to SHAPER package + QMainWindow* aDesktop = desktop(); + ModuleBase_Tools::activateWindow(aDesktop, "XGUI_Workshop::hidePropertyPanel()"); + ModuleBase_Tools::setFocus(aDesktop, "XGUI_Workshop::showPropertyPanel()"); } //****************************************************** void XGUI_Workshop::showObjectBrowser() { - myObjectBrowser->parentWidget()->show(); + if (!isSalomeMode()) + myObjectBrowser->parentWidget()->show(); } //****************************************************** void XGUI_Workshop::hideObjectBrowser() { - myObjectBrowser->parentWidget()->hide(); + if (!isSalomeMode()) + myObjectBrowser->parentWidget()->hide(); } //****************************************************** @@ -1082,16 +1225,22 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) QObjectPtrList aObjects = mySelector->selection()->selectedObjects(); if (theId == "DELETE_CMD") deleteObjects(); + else if (theId == "CLEAN_HISTORY_CMD") + cleanHistory(); else if (theId == "MOVE_CMD") moveObjects(); else if (theId == "COLOR_CMD") changeColor(aObjects); - else if (theId == "SHOW_CMD") + else if (theId == "SHOW_CMD") { showObjects(aObjects, true); + mySelector->updateSelectionBy(ModuleBase_ISelection::Browser); + } else if (theId == "HIDE_CMD") showObjects(aObjects, false); - else if (theId == "SHOW_ONLY_CMD") + else if (theId == "SHOW_ONLY_CMD") { showOnlyObjects(aObjects); + mySelector->updateSelectionBy(ModuleBase_ISelection::Browser); + } else if (theId == "SHADING_CMD") setDisplayMode(aObjects, XGUI_Displayer::Shading); else if (theId == "WIREFRAME_CMD") @@ -1103,238 +1252,286 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) aObj->setDisplayed(false); } Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + } else if (theId == "SELECT_VERTEX_CMD") { + setViewerSelectionMode(TopAbs_VERTEX); + } else if (theId == "SELECT_EDGE_CMD") { + setViewerSelectionMode(TopAbs_EDGE); + } else if (theId == "SELECT_FACE_CMD") { + setViewerSelectionMode(TopAbs_FACE); + } else if (theId == "SELECT_RESULT_CMD") { + //setViewerSelectionMode(-1); + //IMP: an attempt to use result selection with other selection modes + setViewerSelectionMode(ModuleBase_ResultPrs::Sel_Result); + setViewerSelectionMode(TopAbs_COMPSOLID); + } else if (theId == "SHOW_RESULTS_CMD") { + highlightResults(aObjects); + } else if (theId == "SHOW_FEATURE_CMD") { + highlightFeature(aObjects); + } +} + +//************************************************************** +void XGUI_Workshop::setViewerSelectionMode(int theMode) +{ + if (theMode == -1) + myViewerSelMode.clear(); + else { + if (myViewerSelMode.contains(theMode)) + myViewerSelMode.removeAll(theMode); + else + myViewerSelMode.append(theMode); } + activateObjectsSelection(myDisplayer->displayedObjects()); +} + +//************************************************************** +void XGUI_Workshop::activateObjectsSelection(const QObjectPtrList& theList) +{ + QIntList aModes; + module()->activeSelectionModes(aModes); + if (aModes.isEmpty() && (myViewerSelMode.length() > 0)) + aModes.append(myViewerSelMode); + myDisplayer->activateObjects(aModes, theList); } //************************************************************** void XGUI_Workshop::deleteObjects() { ModuleBase_IModule* aModule = module(); - // 1. allow the module to delete objects, do nothing if it has succeed + // allow the module to delete objects, do nothing if it has succeed if (aModule->deleteObjects()) { updateCommandStatus(); return; } - if (!abortAllOperations()) - return; QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); - // It is necessary to clear selection in order to avoid selection changed event during - // 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 (!abortAllOperations()) return; bool hasResult = false; bool hasFeature = false; bool hasParameter = false; - bool hasSubFeature = false; - ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter, hasSubFeature); + bool hasCompositeOwner = false; + ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter, hasCompositeOwner); if (!(hasFeature || hasParameter)) return; - // 1. start operation - QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text(); - aDescription += tr(" %1"); - QStringList aObjectNames; - foreach (ObjectPtr aObj, anObjects) { - if (!aObj->data()->isValid()) - continue; - aObjectNames << QString::fromStdString(aObj->data()->name()); - } - aDescription = aDescription.arg(aObjectNames.join(", ")); + // delete objects + std::map > aReferences; + std::set aFeatures; + ModuleBase_Tools::convertToFeatures(anObjects, aFeatures); + ModelAPI_Tools::findAllReferences(aFeatures, aReferences); + + bool aDone = false; + QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text() + " %1"; + aDescription = aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", ")); ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module()); operationMgr()->startOperation(anOpAction); - // 3. delete objects - QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; - std::set anIgnoredFeatures; - if (deleteFeatures(anObjects, anIgnoredFeatures, aDesktop, true)) { - operationMgr()->commitOperation(); + + std::set aFeatureRefsToDelete; + if (ModuleBase_Tools::askToDelete(aFeatures, aReferences, desktop(), aFeatureRefsToDelete)) { + // WORKAROUND, should be done before each object remove, if it presents in XGUI_DataModel tree + // It is necessary to clear selection in order to avoid selection changed event during + // deletion and negative consequences connected with processing of already deleted items + mySelector->clearSelection(); + + if (!aFeatureRefsToDelete.empty()) + aFeatures.insert(aFeatureRefsToDelete.begin(), aFeatureRefsToDelete.end()); + aDone = ModelAPI_Tools::removeFeatures(aFeatures, false); } - else { + if (aDone) + operationMgr()->commitOperation(); + else operationMgr()->abortOperation(operationMgr()->currentOperation()); +} + +//************************************************************** +void addRefsToFeature(const FeaturePtr& theFeature, + const std::map >& theMainList, + std::set& theReferences) +{ + //if (theReferences.find(theFeature) != theReferences.end()) + // return; + if (theMainList.find(theFeature) == theMainList.end()) + return; // this feature is not in the selection list, so exists without references to it + std::set aMainReferences = theMainList.at(theFeature); + + std::set::const_iterator anIt = aMainReferences.begin(), + aLast = aMainReferences.end(); + for (; anIt != aLast; anIt++) { + FeaturePtr aRefFeature = *anIt; + if (theReferences.find(aRefFeature) == theReferences.end()) + theReferences.insert(aRefFeature); + addRefsToFeature(aRefFeature, theMainList, theReferences); } } //************************************************************** -void XGUI_Workshop::moveObjects() +void XGUI_Workshop::cleanHistory() { if (!abortAllOperations()) return; - SessionPtr aMgr = ModelAPI_Session::get(); - - QString anActionId = "MOVE_CMD"; - QString aDescription = contextMenuMgr()->action(anActionId)->text(); - aMgr->startOperation(aDescription.toStdString()); - QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); - // 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(myMainWindow, anObjects)) - return; - - DocumentPtr anActiveDocument = aMgr->activeDocument(); - FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true); - foreach (ObjectPtr aObject, anObjects) { - if (!myModule->canApplyAction(aObject, anActionId)) - continue; + std::set aFeatures; + ModuleBase_Tools::convertToFeatures(anObjects, aFeatures); + +#ifdef DEBUG_CLEAN_HISTORY + QStringList anInfo; + std::set::const_iterator aFIt; + for (aFIt = aFeatures.begin(); aFIt != aFeatures.end(); ++aFIt) { + FeaturePtr aFeature = ModelAPI_Feature::feature(*aFIt); + anInfo.append(aFeature->name().c_str()); + } + QString anInfoStr = anInfo.join(";\t"); + qDebug(QString("cleanHistory for: [%1] - %2").arg(aFeatures.size()).arg(anInfoStr).toStdString().c_str()); +#endif - FeaturePtr aFeature = std::dynamic_pointer_cast(aObject); - if (aFeature.get()) { - anActiveDocument->moveFeature(aFeature, aCurrentFeature); - aCurrentFeature = anActiveDocument->currentFeature(true); + std::map > aReferences; + ModelAPI_Tools::findAllReferences(aFeatures, aReferences, true, false); + // find for each object whether all reference values are in the map as key, that means that there is + // no other reference in the model to this object, so it might be removed by cleaning history + // sk_1(ext_1, vertex_1) + (sk_3, bool_1) - cann't be deleted, dependency to bool_1 + // ext_1(bool_1, sk_3) - cann't be deleted, dependency to bool_1 + // vertex_1() + // sk_2(ext_2) + (bool_1) - cann't be deleted, dependency to bool_1 + // ext_2(bool_1) - cann't be deleted, dependency to bool_1 + // sk_3() + // Information: bool_1 is not selected + std::set anUnusedObjects; + std::map >::const_iterator aMainIt = aReferences.begin(), + aMainLast = aReferences.end(); + for (; aMainIt != aMainLast; aMainIt++) { + FeaturePtr aMainListFeature = aMainIt->first; + std::set aMainRefList = aMainIt->second; + std::set::const_iterator aRefIt = aMainRefList.begin(), aRefLast = aMainRefList.end(); + bool aFeatureOutOfTheList = false; + for (; aRefIt != aRefLast && !aFeatureOutOfTheList; aRefIt++) { + FeaturePtr aRefFeature = *aRefIt; + aFeatureOutOfTheList = aReferences.find(aRefFeature) == aReferences.end(); } + if (!aFeatureOutOfTheList) + anUnusedObjects.insert(aMainListFeature); } - aMgr->finishOperation(); -} -//************************************************************** -bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList, - const std::set& theIgnoredFeatures, - QWidget* theParent, - const bool theAskAboutDeleteReferences) -{ -#ifdef DEBUG_DELETE - QStringList aDInfo; - QObjectPtrList::const_iterator aDIt = theList.begin(), aDLast = theList.end(); - for (; aDIt != aDLast; ++aDIt) { - aDInfo.append(ModuleBase_Tools::objectInfo((*aDIt))); - } - QString anInfoStr = aDInfo.join(", "); - qDebug(QString("deleteFeatures: %1, %2").arg(theList.size()).arg(anInfoStr).toStdString().c_str()); +#ifdef DEBUG_CLEAN_HISTORY + anInfo.clear(); + for (aFIt = anUnusedObjects.begin(); aFIt != anUnusedObjects.end(); ++aFIt) { + FeaturePtr aFeature = *aFIt; + anInfo.append(aFeature->name().c_str()); + } + qDebug(QString("unused objects: [%1] - %2").arg(anInfo.size()).arg(anInfo.join(";\t")).toStdString().c_str()); #endif - // 1. find all referenced features - std::set aDirectRefFeatures, aIndirectRefFeatures; - foreach (ObjectPtr aDeletedObj, theList) { - 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) - aDirectRefNames.append(aFeature->name().c_str()); - QString aDirectNames = aDirectRefNames.join(", "); - - QStringList aIndirectRefNames; - foreach (const FeaturePtr& aFeature, aIndirectRefFeatures) - aIndirectRefNames.append(aFeature->name().c_str()); - QString aIndirectNames = aIndirectRefNames.join(", "); - - 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; - } + // warn about the references remove, break the delete operation if the user chose it + if (!anUnusedObjects.empty()) { + QStringList aNames; + foreach (const FeaturePtr& aFeature, anUnusedObjects) { + aNames.append(aFeature->name().c_str()); } + aNames.sort(); + QString anUnusedNames = aNames.join(", "); + + QString anActionId = "CLEAN_HISTORY_CMD"; + QString aDescription = contextMenuMgr()->action(anActionId)->text(); - QMessageBox aMessageBox(theParent); - aMessageBox.setWindowTitle(tr("Delete features")); + QMessageBox aMessageBox(desktop()); + aMessageBox.setWindowTitle(aDescription); 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)); - } + QString aText = QString(tr("Unused features are the following: %1.\nThese features will be deleted.\nWould you like to continue?") + .arg(anUnusedNames)); aMessageBox.setText(aText); - aMessageBox.exec(); - QMessageBox::ButtonRole aButtonRole = aMessageBox.buttonRole(aMessageBox.clickedButton()); + if (aMessageBox.exec() == QMessageBox::No) + return; - if (aButtonRole == QMessageBox::NoRole) - return false; + // 1. start operation + aDescription += "by deleting of " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", ")); + ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module()); + operationMgr()->startOperation(anOpAction); - if (aButtonRole == QMessageBox::ActionRole) { - foreach (ObjectPtr aObj, theList) - ModelAPI_ReplaceParameterMessage::send(aObj, this); - doDeleteReferences = false; + // WORKAROUND, should be done before each object remove, if it presents in XGUI_DataModel tree + // It is necessary to clear selection in order to avoid selection changed event during + // deletion and negative consequences connected with processing of already deleted items + mySelector->clearSelection(); + + std::set anIgnoredFeatures; + if (ModelAPI_Tools::removeFeatures(anUnusedObjects, true)) { + operationMgr()->commitOperation(); + } + else { + operationMgr()->abortOperation(operationMgr()->currentOperation()); } } + else { + QString anActionId = "CLEAN_HISTORY_CMD"; + QString aDescription = contextMenuMgr()->action(anActionId)->text(); - // 3. remove referenced features - 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; -#endif - 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()); -#endif - } - } -#ifdef DEBUG_DELETE - qDebug(QString("remove references:%1").arg(anInfo.join("; ")).toStdString().c_str()); - anInfo.clear(); -#endif + QMessageBox aMessageBox(desktop()); + aMessageBox.setWindowTitle(aDescription); + aMessageBox.setIcon(QMessageBox::Warning); + aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes); + aMessageBox.setDefaultButton(QMessageBox::No); + + QString aText; + aMessageBox.setStandardButtons(QMessageBox::Ok); + aMessageBox.setDefaultButton(QMessageBox::Ok); + + aText = QString(tr("All features are relevant, there is nothing to be deleted")); + aMessageBox.setText(aText); + + if (aMessageBox.exec() == QMessageBox::No) + return; } +} - QString anActionId = "DELETE_CMD"; - QString anId = QString::fromStdString(anActionId.toStdString().c_str()); - QStringList anObjectGroups = contextMenuMgr()->actionObjectGroups(anId); - // 4. remove the parameter features - foreach (ObjectPtr aObj, theList) { - // features and parameters can be removed here, - // the results are removed only by a corresponded feature remove - std::string aGroupName = aObj->groupName(); - if (!anObjectGroups.contains(aGroupName.c_str())) - continue; +//************************************************************** +void XGUI_Workshop::moveObjects() +{ + if (!abortAllOperations()) + return; - if (!myModule->canApplyAction(aObj, anActionId)) + SessionPtr aMgr = ModelAPI_Session::get(); + + QString anActionId = "MOVE_CMD"; + QString aDescription = contextMenuMgr()->action(anActionId)->text(); + aMgr->startOperation(aDescription.toStdString()); + + QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); + // 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 + std::set aFeatures; + ModuleBase_Tools::convertToFeatures(anObjects, aFeatures); + if (!XGUI_Tools::canRemoveOrRename(desktop(), aFeatures)) + return; + + DocumentPtr anActiveDocument = aMgr->activeDocument(); + FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true); + std::set::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end(); + for (; anIt != aLast; anIt++) { + FeaturePtr aFeature = *anIt; + if (!aFeature.get() || !myModule->canApplyAction(aFeature, anActionId)) continue; - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - if (aFeature) { - /*// TODO: to learn the workshop to delegate the Part object deletion to the PartSet module - // part features are removed in the PartSet module. This condition should be moved there - if (aFeature->getKind() == "Part") - continue; - */ - DocumentPtr aDoc = aObj->document(); - if (theIgnoredFeatures.find(aFeature) == theIgnoredFeatures.end()) { -#ifdef DEBUG_DELETE - QString anInfoStr = ModuleBase_Tools::objectInfo(aFeature); - anInfo.append(anInfoStr); - qDebug(QString("remove feature :%1").arg(anInfoStr).toStdString().c_str()); -#endif - aDoc->removeFeature(aFeature); - } - } + anActiveDocument->moveFeature(aFeature, aCurrentFeature); + aCurrentFeature = anActiveDocument->currentFeature(true); } -#ifdef DEBUG_DELETE - qDebug(QString("remove features:%1").arg(anInfo.join("; ")).toStdString().c_str()); -#endif - return true; + aMgr->finishOperation(); +} + +//************************************************************** +bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theObjects) +{ + std::map > aReferences; + std::set aFeatures; + ModuleBase_Tools::convertToFeatures(theObjects, aFeatures); + + return ModelAPI_Tools::removeFeaturesAndReferences(aFeatures); } bool hasResults(QObjectPtrList theObjects, const std::set& theTypes) @@ -1364,7 +1561,9 @@ std::list allFeatures(const DocumentPtr& theDocument) // 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()) { + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + foreach (const ResultPtr& aResult, aResults) { ResultPartPtr aResultPart = std::dynamic_pointer_cast(aResult); if (aResultPart.get() && aResultPart->partDoc().get()) { @@ -1436,7 +1635,7 @@ bool XGUI_Workshop::canMoveFeature() std::set aPlacedFeatures(aFeaturesBetween.begin(), aFeaturesBetween.end()); // 2. Get all reference features to the selected object in the document std::set aRefFeatures; - XGUI_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures); + ModuleBase_Tools::refsToFeatureInFeatureDocument(aObject, aRefFeatures); if (aRefFeatures.empty()) continue; @@ -1503,6 +1702,7 @@ void setColor(ResultPtr theResult, const 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 @@ -1529,8 +1729,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; @@ -1541,11 +1743,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(); @@ -1561,8 +1760,7 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) setColor(aResult, !isRandomColor ? aColorResult : aDlg->getRandomColor()); } } - if (!aWasOperation) - aMgr->finishOperation(); + aMgr->finishOperation(); updateCommandStatus(); } @@ -1720,6 +1918,15 @@ QList XGUI_Workshop::processHistoryList(const std::list return aResult; } +void XGUI_Workshop::setStatusBarMessage(const QString& theMessage) +{ +#ifdef HAVE_SALOME + salomeConnector()->putInfo(theMessage, -1); +#else + myMainWindow->putInfo(theMessage, -1); +#endif +} + void XGUI_Workshop::synchronizeViewer() { SessionPtr aMgr = ModelAPI_Session::get(); @@ -1739,9 +1946,66 @@ void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc, int aSize = theDoc->size(theGroup); for (int i = 0; i < aSize; i++) { aObj = theDoc->object(theGroup, i); - if (aObj->isDisplayed()) + if (aObj->isDisplayed()) { + // Hide the presentation with an empty shape. But isDisplayed state of the object should not + // be changed to the object becomes visible when the shape becomes not empty + ResultPtr aRes = std::dynamic_pointer_cast(aObj); + if (aRes.get() && (!aRes->shape().get() || aRes->shape()->isNull())) + continue; myDisplayer->display(aObj, false); + } } if (theUpdateViewer) myDisplayer->updateViewer(); } + +void XGUI_Workshop::highlightResults(const QObjectPtrList& theObjects) +{ + FeaturePtr aFeature; + QObjectPtrList aSelList = theObjects; + std::list aResList; + bool aHasHidden = false; + foreach(ObjectPtr aObj, theObjects) { + aFeature = std::dynamic_pointer_cast(aObj); + if (aFeature.get()) { + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + std::list >::const_iterator aIt; + for(aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) { + aHasHidden |= (*aIt)->isConcealed(); + aSelList.append(*aIt); + } + } + } + if (aSelList.count() > theObjects.count()) { + // if something was found + bool aBlocked = objectBrowser()->blockSignals(true); + objectBrowser()->setObjectsSelected(aSelList); + objectBrowser()->blockSignals(aBlocked); + } + if (aHasHidden) + QMessageBox::information(desktop(), tr("Find results"), + tr("Results not found"), QMessageBox::Ok); +} + +void XGUI_Workshop::highlightFeature(const QObjectPtrList& theObjects) +{ + ResultPtr aResult; + QObjectPtrList aSelList = theObjects; + FeaturePtr aFeature; + foreach(ObjectPtr aObj, theObjects) { + aResult = std::dynamic_pointer_cast(aObj); + if (aResult.get()) { + aFeature = ModelAPI_Feature::feature(aResult); + if (aFeature.get()) { + aSelList.append(aFeature); + } + } + } + if (aSelList.count() > theObjects.count()) { + // if something was found + bool aBlocked = objectBrowser()->blockSignals(true); + objectBrowser()->setObjectsSelected(aSelList); + objectBrowser()->blockSignals(aBlocked); + } +}