X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=b5b0b5f6baeeb50b95d9cd621859c12dd4d9cfdf;hb=47c18d4de2719126f6b045b5c37525cd8f170aa1;hp=3b5068dfab64fac7fff402303c1f37c4b7d74355;hpb=db1e462ad6a76ee857f47602ec9acba6315529c8;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 3b5068dfa..b5b0b5f6b 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -1,4 +1,4 @@ -#include "XGUI_Module.h" +#include "ModuleBase_IModule.h" #include "XGUI_Constants.h" #include "XGUI_Command.h" #include "XGUI_MainMenu.h" @@ -10,6 +10,7 @@ #include "XGUI_Viewer.h" #include "ModuleBase_WidgetFactory.h" #include "XGUI_SelectionMgr.h" +#include "XGUI_Selection.h" #include "XGUI_ObjectsBrowser.h" #include "XGUI_Displayer.h" #include "XGUI_OperationMgr.h" @@ -28,14 +29,18 @@ #include #include #include +#include #include #include #include + #include #include #include +#include + #include #include #include @@ -74,7 +79,7 @@ QString XGUI_Workshop::featureIcon(const std::string& theId) XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) : QObject(), myCurrentDir(QString()), - myPartSetModule(NULL), + myModule(NULL), mySalomeConnector(theConnector), myPropertyPanel(0), myObjectBrowser(0), @@ -85,6 +90,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myDisplayer = new XGUI_Displayer(this); mySelector = new XGUI_SelectionMgr(this); + //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands())); myOperationMgr = new XGUI_OperationMgr(this); myActionsMgr = new XGUI_ActionsMgr(this); @@ -94,6 +100,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) this, SLOT(onContextMenuCommand(const QString&, bool))); myViewerProxy = new XGUI_ViewerProxy(this); + connect(myViewerProxy, SIGNAL(selectionChanged()), this, SLOT(updateCommandsOnViewSelection())); myModuleConnector = new XGUI_ModuleConnector(this); @@ -119,13 +126,12 @@ void XGUI_Workshop::startApplication() Events_Loop* aLoop = Events_Loop::loop(); aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors. //TODO(sbh): Implement static method to extract event id [SEID] - Events_ID aFeatureId = aLoop->eventByName(EVENT_FEATURE_LOADED); - aLoop->registerListener(this, aFeatureId); - Events_ID aPartSetId = aLoop->eventByName("PartSetModuleEvent"); - aLoop->registerListener(this, aPartSetId); - Events_ID aFeatureUpdatedId = aLoop->eventByName(EVENT_FEATURE_UPDATED); - aLoop->registerListener(this, aFeatureUpdatedId); + aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_LOADED)); + // TODO Is it good to use non standard event within workshop? + aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED)); + aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_UPDATED)); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_CREATED)); + aLoop->registerListener(this, Events_Loop::eventByName(EVENT_FEATURE_TO_REDISPLAY)); activateModule(); if (myMainWindow) { @@ -221,69 +227,32 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage) } return; } + // Process creation of Part if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_CREATED)) { const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast(theMessage); - std::set aFeatures = aUpdMsg->features(); + onFeatureCreatedMsg(aUpdMsg); + } - std::set::const_iterator aIt; - bool aHasPart = false; - for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { - FeaturePtr aFeature = (*aIt); - if (aFeature->getKind() == PARTSET_PART_KIND) { - aHasPart = true; - //break; - } else { - myDisplayer->display(aFeature, false); - } - } - myDisplayer->updateViewer(); - if (aHasPart) { - //The created part will be created in Object Browser later and we have to activate it - // only when it is created everywere - QTimer::singleShot(50, this, SLOT(activateLastPart())); - } + // Redisplay feature + if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_TO_REDISPLAY)) { + const Model_FeatureUpdatedMessage* aUpdMsg = dynamic_cast(theMessage); + onFeatureRedisplayMsg(aUpdMsg); } //Update property panel on corresponding message. If there is no current operation (no //property panel), or received message has different feature to the current - do nothing. - static Events_ID aFeatureUpdatedId = Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED); - if (theMessage->eventID() == aFeatureUpdatedId) { + if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_FEATURE_UPDATED)) { const Model_FeatureUpdatedMessage* anUpdateMsg = dynamic_cast(theMessage); - - std::set aFeatures = anUpdateMsg->features(); - if (myOperationMgr->hasOperation()) - { - FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature(); - std::set::const_iterator aIt; - for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { - FeaturePtr aNewFeature = (*aIt); - if(aNewFeature == aCurrentFeature) { - myPropertyPanel->updateContentWidget(aCurrentFeature); - break; - } - } - } - // Redisplay feature if it is modified - std::set::const_iterator aIt; - for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { - FeaturePtr aFeature = (*aIt); - if (aFeature->getKind() != PARTSET_PART_KIND) { - if (myDisplayer->isVisible(aFeature)) - myDisplayer->redisplay(aFeature, false); - else - myDisplayer->display(aFeature, false); - } - } - myDisplayer->updateViewer(); + onFeatureUpdatedMsg(anUpdateMsg); } + //An operation passed by message. Start it, process and commit. - const Config_PointerMessage* aPartSetMsg = dynamic_cast(theMessage); - if (aPartSetMsg) { - myPropertyPanel->cleanContent(); - ModuleBase_Operation* anOperation = - (ModuleBase_Operation*)(aPartSetMsg->pointer()); + if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) { + const Config_PointerMessage* aPartSetMsg = dynamic_cast(theMessage); + //myPropertyPanel->cleanContent(); + ModuleBase_Operation* anOperation = (ModuleBase_Operation*)aPartSetMsg->pointer(); if (myOperationMgr->startOperation(anOperation)) { myPropertyPanel->updateContentWidget(anOperation->feature()); @@ -299,9 +268,68 @@ void XGUI_Workshop::processEvent(const Events_Message* theMessage) if (anAppError) { emit errorOccurred(QString::fromLatin1(anAppError->description())); } +} +//****************************************************** +void XGUI_Workshop::onFeatureUpdatedMsg(const Model_FeatureUpdatedMessage* theMsg) +{ + std::set aFeatures = theMsg->features(); + if (myOperationMgr->hasOperation()) + { + FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature(); + std::set::const_iterator aIt; + for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { + FeaturePtr aNewFeature = (*aIt); + if(aNewFeature == aCurrentFeature) { + myPropertyPanel->updateContentWidget(aCurrentFeature); + break; + } + } + } } +//****************************************************** +void XGUI_Workshop::onFeatureRedisplayMsg(const Model_FeatureUpdatedMessage* theMsg) +{ + std::set aFeatures = theMsg->features(); + std::set::const_iterator aIt; + bool isDisplayed = false; + for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { + FeaturePtr aFeature = (*aIt); + if (aFeature->getKind() != PARTSET_PART_KIND) { + isDisplayed = myDisplayer->redisplay(aFeature, false); + } + } + if (isDisplayed) + myDisplayer->updateViewer(); +} + +//****************************************************** +void XGUI_Workshop::onFeatureCreatedMsg(const Model_FeatureUpdatedMessage* theMsg) +{ + std::set aFeatures = theMsg->features(); + + std::set::const_iterator aIt; + bool aHasPart = false; + bool isDisplayed = false; + for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { + FeaturePtr aFeature = (*aIt); + if (aFeature->getKind() == PARTSET_PART_KIND) { + aHasPart = true; + //break; + } else { + isDisplayed = myDisplayer->display(aFeature, false); + } + } + if (isDisplayed) + myDisplayer->updateViewer(); + if (aHasPart) { + //The created part will be created in Object Browser later and we have to activate it + // only when it is created everywere + QTimer::singleShot(50, this, SLOT(activateLastPart())); + } +} + //****************************************************** void XGUI_Workshop::onOperationStarted() { @@ -313,9 +341,9 @@ void XGUI_Workshop::onOperationStarted() showPropertyPanel(); QString aXmlRepr = aOperation->getDescription()->xmlRepresentation(); ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(), myModuleConnector); - QWidget* aContent = myPropertyPanel->contentWidget(); - qDeleteAll(aContent->children()); - aFactory.createWidget(aContent); + + myPropertyPanel->cleanContent(); + aFactory.createWidget(myPropertyPanel->contentWidget()); QList aWidgets = aFactory.getModelWidgets(); QList::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end(); @@ -343,7 +371,7 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) //!< No need for property panel updateCommandStatus(); hidePropertyPanel(); - //myPropertyPanel->cleanContent(); + myPropertyPanel->cleanContent(); } /* @@ -374,7 +402,7 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage) QKeySequence(), isUsePropPanel); salomeConnector()->setNestedActions(aId, aNestedFeatures.split(" ")); myActionsMgr->addCommand(aAction); - myPartSetModule->featureCreated(aAction); + myModule->featureCreated(aAction); } else { XGUI_MainMenu* aMenuBar = myMainWindow->menuObject(); @@ -396,7 +424,7 @@ void XGUI_Workshop::addFeature(const Config_FeatureMessage* theMessage) QKeySequence(), isUsePropPanel); aCommand->setNestedCommands(aNestedFeatures.split(" ", QString::SkipEmptyParts)); myActionsMgr->addCommand(aCommand); - myPartSetModule->featureCreated(aCommand); + myModule->featureCreated(aCommand); } } @@ -575,7 +603,7 @@ void XGUI_Workshop::onRedo() } //****************************************************** -XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule) +ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule) { QString libName = QString::fromStdString(library(theModule.toStdString())); @@ -623,7 +651,7 @@ XGUI_Module* XGUI_Workshop::loadModule(const QString& theModule) } #endif - XGUI_Module* aModule = crtInst ? crtInst(this) : 0; + ModuleBase_IModule* aModule = crtInst ? crtInst(this) : 0; if (!err.isEmpty()) { if (mainWindow()) { @@ -640,10 +668,10 @@ bool XGUI_Workshop::activateModule() { Config_ModuleReader aModuleReader; QString moduleName = QString::fromStdString(aModuleReader.getModuleName()); - myPartSetModule = loadModule(moduleName); - if (!myPartSetModule) + myModule = loadModule(moduleName); + if (!myModule) return false; - myPartSetModule->createFeatures(); + myModule->createFeatures(); myActionsMgr->update(); return true; } @@ -689,6 +717,24 @@ void XGUI_Workshop::updateCommandStatus() myActionsMgr->update(); } +//****************************************************** +QList XGUI_Workshop::getModuleCommands() const +{ + QList aCommands; + if (isSalomeMode()) { // update commands in SALOME mode + aCommands = salomeConnector()->commandList(); + } else { + XGUI_MainMenu* aMenuBar = myMainWindow->menuObject(); + foreach (XGUI_Workbench* aWb, aMenuBar->workbenches()) { + if (aWb != aMenuBar->generalPage()) { + foreach(XGUI_Command* aCmd, aWb->features()) + aCommands.append(aCmd); + } + } + } + return aCommands; +} + //****************************************************** QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent) { @@ -773,7 +819,7 @@ void XGUI_Workshop::onFeatureTriggered() if (aCmd) { QString aId = salomeConnector()->commandId(aCmd); if (!aId.isNull()) - myPartSetModule->launchOperation(aId); + myModule->launchOperation(aId); } } @@ -812,7 +858,7 @@ XGUI_SalomeViewer* XGUI_Workshop::salomeViewer() const //************************************************************** void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) { - QFeatureList aFeatures = mySelector->selectedFeatures(); + QFeatureList aFeatures = mySelector->selection()->selectedFeatures(); if ((theId == "ACTIVATE_PART_CMD") && (aFeatures.size() > 0)) activatePart(aFeatures.first()); else if (theId == "DEACTIVATE_PART_CMD") @@ -839,7 +885,7 @@ void XGUI_Workshop::onWidgetValuesChanged() QList::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end(); for (; anIt != aLast; anIt++) { ModuleBase_ModelWidget* aCustom = *anIt; - if (aCustom && (!aCustom->isInitialized(aFeature) || aCustom == aSenderWidget)) { + if (aCustom && (/*!aCustom->isInitialized(aFeature) ||*/ aCustom == aSenderWidget)) { aCustom->storeValue(aFeature); } } @@ -913,3 +959,24 @@ void XGUI_Workshop::showFeatures(QFeatureList theList, bool isVisible) } myDisplayer->updateViewer(); } + +//************************************************************** +void XGUI_Workshop::updateCommandsOnViewSelection() +{ + PluginManagerPtr aMgr = ModelAPI_PluginManager::get(); + ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); + XGUI_Selection* aSelection = mySelector->selection(); + + QList aActions = getModuleCommands(); + foreach(QAction* aAction, aActions) { + QString aId = aAction->data().toString(); + const ModelAPI_Validator* aValidator = aFactory->validator(aId.toStdString()); + if (aValidator) { + const ModuleBase_SelectionValidator* aSelValidator = + dynamic_cast(aValidator); + if (aSelValidator) { + aAction->setEnabled(aSelValidator->isValid(aSelection)); + } + } + } +}