X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=27ef45623acef008b35523d72895c2f86583bf35;hb=8a3aaa8971528932753e86f7e9721ca086cd3104;hp=387594ec062f8d5e3c8642b4417c489a2f6a3883;hpb=fccb11b890bf75fde316cd0dbc911fa001368062;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 387594ec0..27ef45623 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -16,8 +16,11 @@ #include "XGUI_PropertyPanel.h" #include "XGUI_ContextMenuMgr.h" #include "XGUI_ModuleConnector.h" +#include "XGUI_WorkshopListener.h" + #include #include +#include #include #include @@ -49,7 +52,6 @@ #include #include -#include #include #include #include @@ -67,6 +69,8 @@ #include #include +#include + #include #include #include @@ -79,6 +83,7 @@ #include #include #include +#include #ifdef _DEBUG #include @@ -91,47 +96,7 @@ #include #endif -//#define DEBUG_FEATURE_CREATED -//#define DEBUG_FEATURE_REDISPLAY - -QMap XGUI_Workshop::myIcons; - - -QIcon XGUI_Workshop::featureIcon(const FeaturePtr& theFeature) -{ - QIcon anIcon; - - std::string aKind = theFeature->getKind(); - QString aId(aKind.c_str()); - if (!myIcons.contains(aId)) - return anIcon; - - QString anIconString = myIcons[aId]; - - ModelAPI_ExecState aState = theFeature->data()->execState(); - switch(aState) { - case ModelAPI_StateDone: - case ModelAPI_StateNothing: { - anIcon = QIcon(anIconString); - } - break; - case ModelAPI_StateMustBeUpdated: { - anIcon = ModuleBase_Tools::lighter(anIconString); - } - break; - case ModelAPI_StateExecFailed: { - anIcon = ModuleBase_Tools::composite(":pictures/exec_state_failed.png", anIconString); - } - break; - case ModelAPI_StateInvalidArgument: { - anIcon = ModuleBase_Tools::composite(":pictures/exec_state_invalid_parameters.png", - anIconString); - } - break; - default: break; - } - return anIcon; -} +//#define DEBUG_DELETE XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) : QObject(), @@ -140,21 +105,27 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) mySalomeConnector(theConnector), myPropertyPanel(0), myObjectBrowser(0), - myDisplayer(0), - myUpdatePrefs(false), - myPartActivating(false), - myIsLoadingData(false) + 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() ); + } + myDisplayer = new XGUI_Displayer(this); mySelector = new XGUI_SelectionMgr(this); //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands())); - myOperationMgr = new XGUI_OperationMgr(this); + myOperationMgr = new XGUI_OperationMgr(this, 0); myActionsMgr = new XGUI_ActionsMgr(this); - myErrorDlg = new XGUI_ErrorDialog(myMainWindow); + myErrorDlg = new XGUI_ErrorDialog(QApplication::desktop()); myContextMenuMgr = new XGUI_ContextMenuMgr(this); connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this, SLOT(onContextMenuCommand(const QString&, bool))); @@ -165,6 +136,11 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myModuleConnector = new XGUI_ModuleConnector(this); + ModuleBase_IWorkshop* aWorkshop = moduleConnector(); + myOperationMgr->setWorkshop(aWorkshop); + + myEventsListener = new XGUI_WorkshopListener(aWorkshop); + connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), SLOT(onOperationStarted(ModuleBase_Operation*))); connect(myOperationMgr, SIGNAL(operationResumed(ModuleBase_Operation*)), @@ -175,8 +151,23 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) SLOT(onOperationCommitted(ModuleBase_Operation*))); connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)), SLOT(onOperationAborted(ModuleBase_Operation*))); - connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit())); + 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&))); + + //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_Prop::Color, ModelAPI_ResultBody::DEFAULT_COLOR()); + Config_PropManager::registerProp("Visualization", "result_group_color", "Group color", + Config_Prop::Color, ModelAPI_ResultGroup::DEFAULT_COLOR()); + Config_PropManager::registerProp("Visualization", "result_construction_color", "Construction color", + Config_Prop::Color, ModelAPI_ResultConstruction::DEFAULT_COLOR()); + Config_PropManager::registerProp("Visualization", "result_part_color", "Part color", + Config_Prop::Color, ModelAPI_ResultPart::DEFAULT_COLOR()); } //****************************************************** @@ -194,30 +185,14 @@ void XGUI_Workshop::startApplication() Config_Prop::Directory, ""); //Initialize event listening - Events_Loop* aLoop = Events_Loop::loop(); - aLoop->registerListener(this, Events_Error::errorID()); //!< Listening application errors. - aLoop->registerListener(this, Events_Loop::eventByName(Config_FeatureMessage::GUI_EVENT())); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_DELETED)); - aLoop->registerListener(this, Events_LongOp::eventID()); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_PLUGIN_LOADED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOSHOW)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_TOHIDE)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_SELFILTER_LOADED)); - - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED)); - aLoop->registerListener(this, Events_Loop::eventByName(EVENT_UPDATE_VIEWER_UNBLOCKED)); + myEventsListener->initializeEventListening(); registerValidators(); // Calling of loadCustomProps before activating module is required // by Config_PropManger to restore user-defined path to plugins ModuleBase_Preferences::loadCustomProps(); - activateModule(); + createModule(); if (myMainWindow) { myMainWindow->show(); updateCommandStatus(); @@ -228,6 +203,29 @@ void XGUI_Workshop::startApplication() emit applicationStarted(); } +void XGUI_Workshop::activateModule() +{ + myModule->activateSelectionFilters(); + + connect(myDisplayer, SIGNAL(objectDisplayed(ObjectPtr, AISObjectPtr)), + myModule, SLOT(onObjectDisplayed(ObjectPtr, AISObjectPtr))); + connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)), + myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); + + myActionsMgr->update(); + +} + +void XGUI_Workshop::deactivateModule() +{ + myModule->deactivateSelectionFilters(); + + disconnect(myDisplayer, SIGNAL(objectDisplayed(ObjectPtr, AISObjectPtr)), + myModule, SLOT(onObjectDisplayed(ObjectPtr, AISObjectPtr))); + disconnect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)), + myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); +} + //****************************************************** void XGUI_Workshop::initMenu() { @@ -273,7 +271,7 @@ void XGUI_Workshop::initMenu() AppElements_Command* aCommand; - aCommand = aGroup->addFeature("SAVE_CMD", tr("Save..."), tr("Save the document"), + aCommand = aGroup->addFeature("SAVE_CMD", tr("Save"), tr("Save the document"), QIcon(":pictures/save.png"), QKeySequence::Save); aCommand->connectTo(this, SLOT(onSave())); //aCommand->disable(); @@ -335,151 +333,6 @@ AppElements_Workbench* XGUI_Workshop::addWorkbench(const QString& theName) return aMenuBar->addWorkbench(theName); } -//****************************************************** -void XGUI_Workshop::processEvent(const std::shared_ptr& theMessage) -{ - if (QApplication::instance()->thread() != QThread::currentThread()) { - #ifdef _DEBUG - std::cout << "XGUI_Workshop::processEvent: " << "Working in another thread." << std::endl; - #endif - SessionPtr aMgr = ModelAPI_Session::get(); - PostponeMessageQtEvent* aPostponeEvent = new PostponeMessageQtEvent(theMessage); - QApplication::postEvent(this, aPostponeEvent); - return; - } - - //A message to start feature creation received. - if (theMessage->eventID() == Events_Loop::loop()->eventByName(Config_FeatureMessage::GUI_EVENT())) { - std::shared_ptr aFeatureMsg = - std::dynamic_pointer_cast(theMessage); - if (!aFeatureMsg->isInternal()) { - addFeature(aFeatureMsg); - } - } - // Process creation of Part - else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) { - std::shared_ptr aUpdMsg = - std::dynamic_pointer_cast(theMessage); - onFeatureCreatedMsg(aUpdMsg); - if (myUpdatePrefs) { - if (mySalomeConnector) - mySalomeConnector->createPreferences(); - myUpdatePrefs = false; - } - } - else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_PLUGIN_LOADED)) { - myUpdatePrefs = true; - } - // Redisplay feature - else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)) { - std::shared_ptr aUpdMsg = - std::dynamic_pointer_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. - else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_UPDATED)) { - std::shared_ptr anUpdateMsg = - std::dynamic_pointer_cast(theMessage); - onFeatureUpdatedMsg(anUpdateMsg); - } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_DELETED)) { - std::shared_ptr aDelMsg = - std::dynamic_pointer_cast(theMessage); - onObjectDeletedMsg(aDelMsg); - } else if (theMessage->eventID() == Events_LongOp::eventID()) { - if (Events_LongOp::isPerformed()) { - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - } else { - QApplication::restoreOverrideCursor(); - } - } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOSHOW)) { - std::shared_ptr anUpdateMsg = - std::dynamic_pointer_cast(theMessage); - const std::set& aObjList = anUpdateMsg->objects(); - QObjectPtrList aList; - std::set::const_iterator aIt; - for (aIt = aObjList.cbegin(); aIt != aObjList.cend(); ++aIt) - aList.append(*aIt); - showObjects(aList, true); - } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_TOHIDE)) { - std::shared_ptr anUpdateMsg = - std::dynamic_pointer_cast(theMessage); - const std::set& aObjList = anUpdateMsg->objects(); - QObjectPtrList aList; - std::set::const_iterator aIt; - for (aIt = aObjList.cbegin(); aIt != aObjList.cend(); ++aIt) - aList.append(*aIt); - showObjects(aList, false); - } - //An operation passed by message. Start it, process and commit. - else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OPERATION_LAUNCHED)) { - std::shared_ptr aPartSetMsg = - std::dynamic_pointer_cast(theMessage); - //myPropertyPanel->cleanContent(); - ModuleBase_Operation* anOperation = (ModuleBase_Operation*) aPartSetMsg->pointer(); - - if (myOperationMgr->startOperation(anOperation)) { - myPropertyPanel->updateContentWidget(anOperation->feature()); - if (!anOperation->getDescription()->hasXmlRepresentation()) { - if (anOperation->commit()) - updateCommandStatus(); - } - } - } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) { - myActionsMgr->update(); - // Find and Activate active part - if (myPartActivating) - return; - SessionPtr aMgr = ModelAPI_Session::get(); - DocumentPtr aActiveDoc = aMgr->activeDocument(); - DocumentPtr aDoc = aMgr->moduleDocument(); - if (aActiveDoc == aDoc) { - activatePart(ResultPartPtr()); - return; - } - std::string aGrpName = ModelAPI_ResultPart::group(); - for (int i = 0; i < aDoc->size(aGrpName); i++) { - ResultPartPtr aPart = std::dynamic_pointer_cast(aDoc->object(aGrpName, i)); - if (aPart->partDoc() == aActiveDoc) { - activatePart(aPart); // Activate a part which corresponds to active Doc - return; - } - } - // If not found then activate global document - activatePart(ResultPartPtr()); - - } - else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_SELFILTER_LOADED)) { - std::shared_ptr aMsg = - std::dynamic_pointer_cast(theMessage); - if (aMsg) { - ModuleBase_FilterFactory* aFactory = moduleConnector()->selectionFilters(); - if (!aMsg->attributeId().empty()) { - aFactory->assignFilter(aMsg->selectionFilterId(), aMsg->featureId(), aMsg->attributeId(), - aMsg->parameters()); - } - } - } else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_UPDATE_VIEWER_BLOCKED)) { - // the viewer's update context will not happens until viewer updated is emitted - myDisplayer->enableUpdateViewer(false); - } else if (theMessage->eventID() == Events_Loop::eventByName(EVENT_UPDATE_VIEWER_UNBLOCKED)) { - // the viewer's update context is unblocked, the viewer's update works - myDisplayer->enableUpdateViewer(true); - } else { - //Show error dialog if error message received. - std::shared_ptr anAppError = std::dynamic_pointer_cast(theMessage); - if (anAppError) { - emit errorOccurred(QString::fromLatin1(anAppError->description())); - } - return; - } - if (!isSalomeMode()) { - SessionPtr aMgr = ModelAPI_Session::get(); - if (aMgr->isModified() != myMainWindow->isModifiedState()) - myMainWindow->setModifiedState(aMgr->isModified()); - } -} - //****************************************************** QMainWindow* XGUI_Workshop::desktop() const { @@ -494,138 +347,14 @@ void XGUI_Workshop::onStartWaiting() } } -//****************************************************** -void XGUI_Workshop::onFeatureUpdatedMsg(const std::shared_ptr& theMsg) -{ - std::set aFeatures = theMsg->objects(); - if (myOperationMgr->hasOperation()) { - FeaturePtr aCurrentFeature = myOperationMgr->currentOperation()->feature(); - std::set::const_iterator aIt; - for (aIt = aFeatures.begin(); aIt != aFeatures.end(); ++aIt) { - ObjectPtr aNewFeature = (*aIt); - if (aNewFeature == aCurrentFeature) { - myPropertyPanel->updateContentWidget(aCurrentFeature); - break; - } - } - } - myOperationMgr->onValidateOperation(); - if (myObjectBrowser) - myObjectBrowser->processEvent(theMsg); -} //****************************************************** -void XGUI_Workshop::onFeatureRedisplayMsg(const std::shared_ptr& theMsg) +void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer) { - std::set aObjects = theMsg->objects(); - std::set::const_iterator aIt; - -#ifdef DEBUG_FEATURE_REDISPLAY - QStringList anInfo; - for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) { - anInfo.append(ModuleBase_Tools::objectInfo((*aIt))); + if (!myModule->canActivateSelection(theObject)) { + if (myDisplayer->isActive(theObject)) + myDisplayer->deactivate(theObject, theUpdateViewer); } - QString anInfoStr = anInfo.join(", "); - qDebug(QString("onFeatureRedisplayMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str()); -#endif - - for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) { - ObjectPtr aObj = (*aIt); - - // Hide the object if it is invalid or concealed one - bool aHide = !aObj->data() || !aObj->data()->isValid(); - if (!aHide) { // check that this is not hidden result - ResultPtr aRes = std::dynamic_pointer_cast(aObj); - aHide = aRes && aRes->isConcealed(); - } - if (aHide) - myDisplayer->erase(aObj, false); - else { - // Redisplay the visible object or the object of the current operation - bool isVisibleObject = myDisplayer->isVisible(aObj); - #ifdef DEBUG_FEATURE_REDISPLAY - //QString anObjInfo = ModuleBase_Tools::objectInfo((aObj)); - //qDebug(QString("visible=%1 : display= %2").arg(isVisibleObject).arg(anObjInfo).toStdString().c_str()); - #endif - - if (isVisibleObject) { // redisplay visible object - //displayObject(aObj); // In order to update presentation - // in order to avoid the check whether the object can be redisplayed, the exact method - // of redisplay is called. This modification is made in order to have the line is updated - // by creation of a horizontal constraint on the line by preselection - myDisplayer->redisplay(aObj, false); - if (myOperationMgr->hasOperation()) { - ModuleBase_Operation* aOperation = myOperationMgr->currentOperation(); - if (!aOperation->isEditOperation() && - aOperation->hasObject(aObj) && myDisplayer->isActive(aObj)) - myDisplayer->deactivate(aObj); - } - } else { // display object if the current operation has it - ModuleBase_Operation* aOperation = myOperationMgr->currentOperation(); - if (aOperation && aOperation->hasObject(aObj)) { - ModuleBase_Operation* aOperation = myOperationMgr->currentOperation(); - #ifdef DEBUG_FEATURE_REDISPLAY - QString anObjInfo = ModuleBase_Tools::objectInfo((aObj)); - qDebug(QString(" display object = %1").arg(anObjInfo).toStdString().c_str()); - #endif - if (displayObject(aObj)) { - // Deactivate object of current operation from selection - if (myDisplayer->isActive(aObj)) - myDisplayer->deactivate(aObj); - } - } - } - } - } - myDisplayer->updateViewer(); -} - -//****************************************************** -void XGUI_Workshop::onFeatureCreatedMsg(const std::shared_ptr& theMsg) -{ - std::set aObjects = theMsg->objects(); - std::set::const_iterator aIt; -#ifdef DEBUG_FEATURE_CREATED - QStringList anInfo; - for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) { - anInfo.append(ModuleBase_Tools::objectInfo((*aIt))); - } - QString anInfoStr = anInfo.join(", "); - qDebug(QString("onFeatureCreatedMsg: %1, %2").arg(aObjects.size()).arg(anInfoStr).toStdString().c_str()); -#endif - - //bool aHasPart = false; - bool isDisplayed = false; - for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) { - ObjectPtr anObject = *aIt; - // the validity of the data should be checked here in order to avoid display of the objects, - // which were created, then deleted, but flush for the creation event happens after that - if (!anObject->data() || !anObject->data()->isValid()) - continue; - //ResultPartPtr aPart = std::dynamic_pointer_cast(*aIt); - //if (aPart) { - //aHasPart = true; - // If a feature is created from the aplication's python console - // it doesn't stored in the operation mgr and doesn't displayed - //} else { - isDisplayed = displayObject(*aIt); - //} - } - if (myObjectBrowser) - myObjectBrowser->processEvent(theMsg); - if (isDisplayed) - myDisplayer->updateViewer(); - //if (aHasPart) { // TODO: Avoid activate last part on loading of document - // activateLastPart(); - //} -} - -//****************************************************** -void XGUI_Workshop::onObjectDeletedMsg(const std::shared_ptr& theMsg) -{ - if (myObjectBrowser) - myObjectBrowser->processEvent(theMsg); - //std::set aFeatures = theMsg->objects(); } //****************************************************** @@ -636,10 +365,33 @@ void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation) if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel connectWithOperation(theOperation); setPropertyPanel(theOperation); + // filling the operation values by the current selection + // if the operation can be commited after the controls filling, the method perform should + // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch) + if (!theOperation->isEditOperation()) { + theOperation->activateByPreselection(); + if (operationMgr()->currentOperation() != theOperation) + return; + } } updateCommandStatus(); - myModule->operationStarted(theOperation); + myModule->onOperationStarted(theOperation); + + // the objects of the current operation should be deactivated + QObjectPtrList anObjects; + FeaturePtr aFeature = theOperation->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(); } //****************************************************** @@ -653,7 +405,7 @@ void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation) } updateCommandStatus(); - myModule->operationResumed(theOperation); + myModule->onOperationResumed(theOperation); } @@ -667,39 +419,36 @@ void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) hidePropertyPanel(); myPropertyPanel->cleanContent(); - // Activate objects created by current operation - // in order to clean selection modes - // the deactivation should be pefromed in the same place, where the mode is activated, - // e.g. activation in the current widget activation, deactivation - in the widget's deactivation - //QIntList aModes; - //myDisplayer->activateObjects(aModes); - myModule->operationStopped(theOperation); - - // if the operation is nested, do not deactivate objects - //if (myOperationMgr->operationsCount() == 0) { - // Activate selection mode for all objects + myModule->onOperationStopped(theOperation); + + // the deactivated objects of the current operation should be activated back. + // They were deactivated on operation start or an object redisplay + QObjectPtrList anObjects; + FeaturePtr aFeature = theOperation->feature(); + if (myDisplayer->isVisible(aFeature) && !myDisplayer->isActive(aFeature)) + anObjects.append(aFeature); + std::list aResults = aFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { + ResultPtr anObject = *aIt; + if (myDisplayer->isVisible(anObject) && !myDisplayer->isActive(anObject)) { + anObjects.append(anObject); + } + } QIntList aModes; - // TODO: check on OCC_6.9.0 - // the module current active modes should not be deactivated in order to save the objects selected - // the deactivate object in the mode of selection leads to the object is deselected in the viewer. - // But, in OCC_6.8.0 this deselection does not happened automatically. It is necessary to call - // ClearOutdatedSelection, but this method has an error in the realization, which should be fixed in - // the OCC_6.9.0 release. Moreother, it is possible that ClearOutdatedSelection will be called inside - // Deactivate method of AIS_InteractiveContext. In this case, we need not call it. module()->activeSelectionModes(aModes); - myDisplayer->activateObjects(aModes); - //} + myDisplayer->activateObjects(aModes, anObjects); } void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation) { - myModule->operationCommitted(theOperation); + myModule->onOperationCommitted(theOperation); } void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation) { - myModule->operationAborted(theOperation); + myModule->onOperationAborted(theOperation); } void XGUI_Workshop::setNestedFeatures(ModuleBase_Operation* theOperation) @@ -737,97 +486,6 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) myPropertyPanel->setWindowTitle(theOperation->getDescription()->description()); } -bool XGUI_Workshop::event(QEvent * theEvent) -{ - PostponeMessageQtEvent* aPostponedEv = dynamic_cast(theEvent); - if (aPostponedEv) { - std::shared_ptr aEventPtr = aPostponedEv->postponedMessage(); - processEvent(aEventPtr); - return true; - } - return false; -} - -/* - * - */ -void XGUI_Workshop::addFeature(const std::shared_ptr& theMessage) -{ - if (!theMessage) { -#ifdef _DEBUG - qDebug() << "XGUI_Workshop::addFeature: NULL message."; -#endif - return; - } - ActionInfo aFeatureInfo; - aFeatureInfo.initFrom(theMessage); - // Remember features icons - myIcons[QString::fromStdString(theMessage->id())] = aFeatureInfo.iconFile; - - QString aWchName = QString::fromStdString(theMessage->workbenchId()); - QStringList aNestedFeatures = - QString::fromStdString(theMessage->nestedFeatures()).split(" ", QString::SkipEmptyParts); - QString aDocKind = QString::fromStdString(theMessage->documentKind()); - QList aNestedActList; - bool isColumnButton = !aNestedFeatures.isEmpty(); - if (isColumnButton) { - QString aNestedActions = QString::fromStdString(theMessage->actionsWhenNested()); - if (aNestedActions.contains("accept")) { - QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll, NULL); - connect(anAction, SIGNAL(triggered()), myOperationMgr, SLOT(commitAllOperations())); - aNestedActList << anAction; - } - if (aNestedActions.contains("abort")) { - QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AbortAll, NULL); - connect(anAction, SIGNAL(triggered()), myOperationMgr, SLOT(abortAllOperations())); - aNestedActList << anAction; - } - } - - if (isSalomeMode()) { - QAction* aAction; - if (isColumnButton) { - aAction = salomeConnector()->addNestedFeature(aWchName, aFeatureInfo, aNestedActList); - } else { - aAction = salomeConnector()->addFeature(aWchName, aFeatureInfo); - } - salomeConnector()->setNestedActions(aFeatureInfo.id, aNestedFeatures); - salomeConnector()->setDocumentKind(aFeatureInfo.id, aDocKind); - - myActionsMgr->addCommand(aAction); - myModule->actionCreated(aAction); - } else { - //Find or create Workbench - AppElements_MainMenu* aMenuBar = myMainWindow->menuObject(); - AppElements_Workbench* aPage = aMenuBar->findWorkbench(aWchName); - if (!aPage) { - aPage = addWorkbench(aWchName); - } - //Find or create Group - QString aGroupName = QString::fromStdString(theMessage->groupId()); - AppElements_MenuGroupPanel* aGroup = aPage->findGroup(aGroupName); - if (!aGroup) { - aGroup = aPage->addGroup(aGroupName); - } - // Check if hotkey sequence is already defined: - QKeySequence aHotKey = myActionsMgr->registerShortcut(aFeatureInfo.shortcut); - if(aHotKey != aFeatureInfo.shortcut) { - aFeatureInfo.shortcut = aHotKey; - } - // Create feature... - AppElements_Command* aCommand = aGroup->addFeature(aFeatureInfo, - aDocKind, - aNestedFeatures); - // Enrich created button with accept/abort buttons if necessary - AppElements_Button* aButton = aCommand->button(); - if (aButton->isColumnButton()) { - aButton->setAdditionalButtons(aNestedActList); - } - myActionsMgr->addCommand(aCommand); - myModule->actionCreated(aCommand); - } -} - /* * Makes a signal/slot connections between Property Panel * and given operation. The given operation becomes a @@ -924,12 +582,11 @@ void XGUI_Workshop::onOpen() } else if (anAnswer == QMessageBox::Cancel) { return; } - aSession->closeAll(); myCurrentDir = ""; } //show file dialog, check if readable and open - myCurrentDir = QFileDialog::getExistingDirectory(mainWindow()); + myCurrentDir = QFileDialog::getExistingDirectory(mainWindow(), tr("Select directory")); if (myCurrentDir.isEmpty()) return; QFileInfo aFileInfo(myCurrentDir); @@ -939,12 +596,11 @@ void XGUI_Workshop::onOpen() return; } QApplication::setOverrideCursor(Qt::WaitCursor); - myIsLoadingData = true; + aSession->closeAll(); aSession->load(myCurrentDir.toLatin1().constData()); myObjectBrowser->rebuildDataTree(); - displayAllResults(); + //displayAllResults(); updateCommandStatus(); - myIsLoadingData = false; QApplication::restoreOverrideCursor(); } @@ -972,13 +628,14 @@ bool XGUI_Workshop::onSaveAs() QFileDialog dialog(mainWindow()); dialog.setWindowTitle(tr("Select directory to save files...")); dialog.setFileMode(QFileDialog::Directory); - dialog.setFilter(tr("Folders (*)")); + dialog.setFilter(tr("Directories (*)")); dialog.setOptions(QFileDialog::HideNameFilterDetails | QFileDialog::ShowDirsOnly); dialog.setViewMode(QFileDialog::Detail); if (!dialog.exec()) { return false; } + QString aTempDir = dialog.selectedFiles().first(); QDir aDir(aTempDir); if (aDir.exists() && !aDir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty()) { @@ -986,7 +643,7 @@ bool XGUI_Workshop::onSaveAs() myMainWindow, //: Title of the dialog which asks user if he wants to save study in existing non-empty folder tr("Save"), - tr("The folder already contains some files, save anyway?"), + tr("The directory already contains some files, save anyway?"), QMessageBox::Save | QMessageBox::Cancel); if (answer == QMessageBox::Cancel) { return false; @@ -1010,6 +667,7 @@ void XGUI_Workshop::onUndo(int theTimes) for (int i = 0; i < theTimes; ++i) { aMgr->undo(); } + updateCompositeActionState(); updateCommandStatus(); } @@ -1029,6 +687,7 @@ void XGUI_Workshop::onRedo(int theTimes) for (int i = 0; i < theTimes; ++i) { aMgr->redo(); } + updateCompositeActionState(); updateCommandStatus(); // unblock the viewer update functionality and make update on purpose @@ -1134,7 +793,7 @@ ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule) } //****************************************************** -bool XGUI_Workshop::activateModule() +bool XGUI_Workshop::createModule() { Config_ModuleReader aModuleReader; QString moduleName = QString::fromStdString(aModuleReader.getModuleName()); @@ -1142,13 +801,13 @@ bool XGUI_Workshop::activateModule() if (!myModule) return false; - connect(myDisplayer, SIGNAL(objectDisplayed(ObjectPtr, AISObjectPtr)), - myModule, SLOT(onObjectDisplayed(ObjectPtr, AISObjectPtr))); - connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)), - myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); + //connect(myDisplayer, SIGNAL(objectDisplayed(ObjectPtr, AISObjectPtr)), + // myModule, SLOT(onObjectDisplayed(ObjectPtr, AISObjectPtr))); + //connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)), + // myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); myModule->createFeatures(); - myActionsMgr->update(); + //myActionsMgr->update(); return true; } @@ -1165,20 +824,16 @@ void XGUI_Workshop::updateCommandStatus() } SessionPtr aMgr = ModelAPI_Session::get(); if (aMgr->hasModuleDocument()) { - QAction *aUndoCmd, *aRedoCmd; foreach(QAction* aCmd, aCommands) { QString aId = aCmd->data().toString(); if (aId == "UNDO_CMD") - aUndoCmd = aCmd; + aCmd->setEnabled(myModule->canUndo()); else if (aId == "REDO_CMD") - aRedoCmd = aCmd; + aCmd->setEnabled(myModule->canRedo()); else // Enable all commands aCmd->setEnabled(true); } - - aUndoCmd->setEnabled(myModule->canUndo()); - aRedoCmd->setEnabled(myModule->canRedo()); updateHistory(); } else { foreach(QAction* aCmd, aCommands) { @@ -1195,6 +850,20 @@ void XGUI_Workshop::updateCommandStatus() emit commandStatusUpdated(); } +//****************************************************** +void XGUI_Workshop::updateCompositeActionState() +{ + // in order to apply is enabled only if there are modifications in the model + // e.g. sketch can be applyed only if at least one nested element create is finished + bool aCanUndo = ModelAPI_Session::get()->canUndo(); + bool aParentValid = operationMgr()->isParentOperationValid(); + bool aCurrentValid = operationMgr()->currentOperation() && + operationMgr()->currentOperation()->isValid(); + + QAction* aAcceptAllAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll); + aAcceptAllAct->setEnabled(aParentValid && (aCanUndo || aCurrentValid)); +} + void XGUI_Workshop::updateHistory() { std::list aUndoList = ModelAPI_Session::get()->undoList(); @@ -1215,8 +884,8 @@ QDockWidget* XGUI_Workshop::createObjectBrowser(QWidget* theParent) aObjDock->setStyleSheet( "::title { position: relative; padding-left: 5px; text-align: left center }"); myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock); - connect(myObjectBrowser, SIGNAL(activePartChanged(ObjectPtr)), this, - SLOT(changeCurrentDocument(ObjectPtr))); + myObjectBrowser->setDataModel(myModule->dataModel()); + myModule->customizeObjectBrowser(myObjectBrowser); aObjDock->setWidget(myObjectBrowser); myContextMenuMgr->connectObjectBrowser(); @@ -1289,32 +958,15 @@ void XGUI_Workshop::hideObjectBrowser() } //****************************************************** -void XGUI_Workshop::onFeatureTriggered() -{ - QAction* aCmd = dynamic_cast(sender()); - if (aCmd) { - QString aId = salomeConnector()->commandId(aCmd); - if (!aId.isNull()) - myModule->launchOperation(aId); - } -} - -//****************************************************** -void XGUI_Workshop::changeCurrentDocument(ObjectPtr theObj) -{ - SessionPtr aMgr = ModelAPI_Session::get(); - if (theObj) { - ResultPartPtr aPart = std::dynamic_pointer_cast(theObj); - if (aPart) { - DocumentPtr aPartDoc = aPart->partDoc(); - if (aPartDoc) { - aMgr->setActiveDocument(aPartDoc); - return; - } - } - } - aMgr->setActiveDocument(aMgr->moduleDocument()); -} +//void XGUI_Workshop::onFeatureTriggered() +//{ +// QAction* aCmd = dynamic_cast(sender()); +// if (aCmd) { +// QString aId = salomeConnector()->commandId(aCmd); +// if (!aId.isNull()) +// myModule->launchOperation(aId); +// } +//} //****************************************************** void XGUI_Workshop::salomeViewerSelectionChanged() @@ -1332,13 +984,10 @@ ModuleBase_IViewer* XGUI_Workshop::salomeViewer() const void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) { QObjectPtrList aObjects = mySelector->selection()->selectedObjects(); - if ((theId == "ACTIVATE_PART_CMD") && (aObjects.size() > 0)) { - ResultPartPtr aPart = std::dynamic_pointer_cast(aObjects.first()); - activatePart(aPart); - } else if (theId == "DEACTIVATE_PART_CMD") - activatePart(ResultPartPtr()); - else if (theId == "DELETE_CMD") + if (theId == "DELETE_CMD") deleteObjects(); + if (theId == "MOVE_CMD") + moveObjects(); else if (theId == "COLOR_CMD") changeColor(aObjects); else if (theId == "SHOW_CMD") @@ -1351,49 +1000,14 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) setDisplayMode(aObjects, XGUI_Displayer::Shading); else if (theId == "WIREFRAME_CMD") setDisplayMode(aObjects, XGUI_Displayer::Wireframe); - else if (theId == "HIDEALL_CMD") - myDisplayer->eraseAll(); - else if (theId == "EDIT_CMD") { - FeaturePtr aFeature = std::dynamic_pointer_cast(aObjects.first()); - if (aFeature == NULL) { - ResultParameterPtr aParam = - std::dynamic_pointer_cast(aObjects.first()); - if (aParam.get() != NULL) { - aFeature = ModelAPI_Feature::feature(aParam); - } - } - if (aFeature.get() != NULL) - myModule->editFeature(aFeature); + else if (theId == "HIDEALL_CMD") { + QObjectPtrList aList = myDisplayer->displayedObjects(); + foreach (ObjectPtr aObj, aList) + aObj->setDisplayed(false); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); } } -//************************************************************** -void XGUI_Workshop::activatePart(ResultPartPtr theFeature) -{ - if (!myPartActivating) { - myPartActivating = true; - if (theFeature) - theFeature->activate(); - changeCurrentDocument(theFeature); - myObjectBrowser->activatePart(theFeature); - myPartActivating = false; - } - updateCommandStatus(); -} - -//************************************************************** -//void XGUI_Workshop::activateLastPart() -//{ -// SessionPtr aMgr = ModelAPI_Session::get(); -// DocumentPtr aDoc = aMgr->moduleDocument(); -// std::string aGrpName = ModelAPI_ResultPart::group(); -// ObjectPtr aLastPart = aDoc->object(aGrpName, aDoc->size(aGrpName) - 1); -// ResultPartPtr aPart = std::dynamic_pointer_cast(aLastPart); -// if (aPart) { -// activatePart(aPart); -// } -//} - //************************************************************** void XGUI_Workshop::deleteObjects() { @@ -1407,10 +1021,18 @@ void XGUI_Workshop::deleteObjects() if (!isActiveOperationAborted()) 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 + mySelector->clearSelection(); + // check whether the object can be deleted. There should not be parts which are not loaded + if (!XGUI_Tools::canRemoveOrRename(myMainWindow, anObjects)) + return; + bool hasResult = false; bool hasFeature = false; bool hasParameter = false; - XGUI_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter); + bool hasSubFeature = false; + ModuleBase_Tools::checkObjects(anObjects, hasResult, hasFeature, hasParameter, hasSubFeature); if (!(hasFeature || hasParameter)) return; @@ -1419,7 +1041,7 @@ void XGUI_Workshop::deleteObjects() aDescription += tr(" %1"); QStringList aObjectNames; foreach (ObjectPtr aObj, anObjects) { - if (!aObj->data().get()) + if (!aObj->data()->isValid()) continue; aObjectNames << QString::fromStdString(aObj->data()->name()); } @@ -1428,7 +1050,8 @@ void XGUI_Workshop::deleteObjects() SessionPtr aMgr = ModelAPI_Session::get(); aMgr->startOperation(aDescription.toStdString()); // 2. close the documents of the removed parts if the result part is in a list of selected objects - foreach (ObjectPtr aObj, anObjects) + // this is performed in the RemoveFeature of Part object. + /*foreach (ObjectPtr aObj, anObjects) { ResultPartPtr aPart = std::dynamic_pointer_cast(aObj); if (aPart) { @@ -1437,7 +1060,7 @@ void XGUI_Workshop::deleteObjects() aDoc->close(); } } - } + }*/ // 3. delete objects QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; std::set anIgnoredFeatures; @@ -1451,19 +1074,55 @@ void XGUI_Workshop::deleteObjects() } } +//************************************************************** +void XGUI_Workshop::moveObjects() +{ + if (!isActiveOperationAborted()) + 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(); + DocumentPtr anActiveDocument = aMgr->activeDocument(); + + FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true); + foreach (ObjectPtr aObject, anObjects) { + if (!myModule->canApplyAction(aObject, anActionId)) + continue; + + FeaturePtr aFeature = std::dynamic_pointer_cast(aObject); + if (aFeature.get()) { + anActiveDocument->moveFeature(aFeature, aCurrentFeature); + aCurrentFeature = anActiveDocument->currentFeature(true); + } + } + aMgr->finishOperation(); +} + //************************************************************** bool XGUI_Workshop::deleteFeatures(const QObjectPtrList& theList, - std::set theIgnoredFeatures, + 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()); +#endif + // 1. find all referenced features std::set aRefFeatures; - foreach (ObjectPtr aObj, theList) { - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - if (aFeature.get() != NULL) { - aObj->document()->refsToFeature(aFeature, aRefFeatures, false); - } + foreach (ObjectPtr aDeletedObj, theList) { + XGUI_Tools::refsToFeatureInAllDocuments(aDeletedObj, aDeletedObj, aRefFeatures); } // 2. warn about the references remove, break the delete operation if the user chose it if (theAskAboutDeleteReferences && !aRefFeatures.empty()) { @@ -1487,22 +1146,59 @@ These features will be deleted also. Would you like to continue?")).arg(aNames), // 3. remove referenced features std::set::const_iterator anIt = aRefFeatures.begin(), aLast = aRefFeatures.end(); +#ifdef DEBUG_DELETE + QStringList anInfo; +#endif for (; anIt != aLast; anIt++) { FeaturePtr aFeature = (*anIt); DocumentPtr aDoc = aFeature->document(); - if (theIgnoredFeatures.find(aFeature) == theIgnoredFeatures.end()) + 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 + 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; + + if (!myModule->canApplyAction(aObj, 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()) + 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); + } } } +#ifdef DEBUG_DELETE + qDebug(QString("remove features:%1").arg(anInfo.join("; ")).toStdString().c_str()); +#endif return true; } @@ -1522,6 +1218,78 @@ bool hasResults(QObjectPtrList theObjects, const std::set& theTypes return isFoundResultType; } +//************************************************************** +// Returns the list of features placed between theObject and the current feature +// in the same document. Excludes theObject, includes the current feature. +std::list toCurrentFeatures(const ObjectPtr& theObject) +{ + std::list aResult; + DocumentPtr aDocument = theObject->document(); + std::list anAllFeatures = aDocument->allFeatures(); + // find the object iterator + std::list::iterator aObjectIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject); + 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()) + return aResult; + // check the right order + if (std::distance(aObjectIt, anAllFeatures.end()) <= std::distance(aCurrentIt, anAllFeatures.end())) + return aResult; + // exclude the object + std::advance(aObjectIt, 1); + // include the current feature + std::advance(aCurrentIt, 1); + return std::list(aObjectIt, aCurrentIt); +} + +bool XGUI_Workshop::canMoveFeature() +{ + QString anActionId = "MOVE_CMD"; + + QObjectPtrList aObjects = mySelector->selection()->selectedObjects(); + QObjectPtrList aValidatedObjects; + foreach (ObjectPtr aObject, aObjects) { + if (myModule->canApplyAction(aObject, anActionId)) + aValidatedObjects.append(aObject); + } + if (aValidatedObjects.size() != aObjects.size()) + aObjects = aValidatedObjects; + + bool aCanMove = !aObjects.empty(); + + QObjectPtrList::const_iterator anIt = aObjects.begin(), aLast = aObjects.end(); + for (; anIt != aLast && aCanMove; anIt++) { + ObjectPtr aObject = *anIt; + // 1. Get features placed between selected and current in the document + std::list aFeaturesBetween = toCurrentFeatures(aObject); + // if aFeaturesBetween is empty it means wrong order or aObject is the current feature + if (aFeaturesBetween.empty()) + aCanMove = false; + else { + 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); + + if (aRefFeatures.empty()) + continue; + else { + // 3. Find any placed features in all reference features + std::set aIntersectionFeatures; + 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 + if (!aIntersectionFeatures.empty()) + aCanMove = false; + } + } + } + return aCanMove; +} + //************************************************************** bool XGUI_Workshop::canChangeColor() const { @@ -1560,29 +1328,14 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) // The objects are iterated until a first valid color is found std::vector aColor; foreach(ObjectPtr anObject, theObjects) { - if (anObject->groupName() == ModelAPI_ResultPart::group()) { - ResultPartPtr aPart = std::dynamic_pointer_cast(anObject); - DocumentPtr aPartDoc = aPart->partDoc(); - // the document should be checked on null, because in opened document if the part - // has not been activated yet, the part document is empty - if (!aPartDoc.get()) { - emit errorOccurred(QString::fromLatin1("Color can not be changed on a part with an empty document")); - } - else { - if (aPartDoc->size(ModelAPI_ResultBody::group()) > 0) { - ObjectPtr aObject = aPartDoc->object(ModelAPI_ResultBody::group(), 0); - ResultBodyPtr aBody = std::dynamic_pointer_cast(aObject); - if (aBody.get()) { - std::string aSection, aName, aDefault; - aBody->colorConfigInfo(aSection, aName, aDefault); - if (!aSection.empty() && !aName.empty()) { - aColor = Config_PropManager::color(aSection, aName, aDefault); - } - } - } - } - } + ResultPtr aResult = std::dynamic_pointer_cast(anObject); + if (aResult.get()) + XGUI_CustomPrs::getResultColor(aResult, aColor); else { + // TODO: remove the obtaining a color from the AIS object + // this does not happen never because: + // 1. The color can be changed only on results + // 2. The result can be not visualized in the viewer(e.g. Origin Construction) AISObjectPtr anAISObj = myDisplayer->getAISObject(anObject); if (anAISObj.get()) { aColor.resize(3); @@ -1617,24 +1370,8 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) foreach(ObjectPtr anObj, theObjects) { ResultPtr aResult = std::dynamic_pointer_cast(anObj); if (aResult.get() != NULL) { - if (aResult->groupName() == ModelAPI_ResultPart::group()) { - ResultPartPtr aPart = std::dynamic_pointer_cast(aResult); - DocumentPtr aPartDoc = aPart->partDoc(); - // the document should be checked on null, because in opened document if the part - // has not been activated yet, the part document is empty - if (aPartDoc.get()) { - for (int i = 0; i < aPartDoc->size(ModelAPI_ResultBody::group()); i++) { - ObjectPtr aObject = aPartDoc->object(ModelAPI_ResultBody::group(), i); - ResultBodyPtr aBody = std::dynamic_pointer_cast(aObject); - std::vector aColorResult = aDlg->getColor(); - setColor(aBody, aColorResult); - } - } - } - else { - std::vector aColorResult = aDlg->getColor(); - setColor(aResult, aColorResult); - } + std::vector aColorResult = aDlg->getColor(); + setColor(aResult, aColorResult); } } if (!aWasOperation) @@ -1643,23 +1380,52 @@ void XGUI_Workshop::changeColor(const QObjectPtrList& theObjects) } //************************************************************** +#define SET_DISPLAY_GROUP(aGroupName, aDisplay) \ +for (int i = 0; i < aDoc->size(aGroupName); i++) { \ + aDoc->object(aGroupName, i)->setDisplayed(aDisplay); \ +} void XGUI_Workshop::showObjects(const QObjectPtrList& theList, bool isVisible) { - foreach (ObjectPtr aObj, theList) - { - if (isVisible) { - displayObject(aObj); + foreach (ObjectPtr aObj, theList) { + /* + ResultPartPtr aPartRes = std::dynamic_pointer_cast(aObj); + if (aPartRes) { + DocumentPtr aDoc = aPartRes->partDoc(); + SET_DISPLAY_GROUP(ModelAPI_ResultBody::group(), isVisible) + SET_DISPLAY_GROUP(ModelAPI_ResultConstruction::group(), isVisible) + SET_DISPLAY_GROUP(ModelAPI_ResultGroup::group(), isVisible) } else { - myDisplayer->erase(aObj, false); - } + */ + aObj->setDisplayed(isVisible); + //} } - myDisplayer->updateViewer(); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); } //************************************************************** void XGUI_Workshop::showOnlyObjects(const QObjectPtrList& theList) { - myDisplayer->showOnly(theList); + // Hide all displayed objects + QObjectPtrList aList = myDisplayer->displayedObjects(); + foreach (ObjectPtr aObj, aList) + aObj->setDisplayed(false); + + // Show only objects from the list + foreach (ObjectPtr aObj, theList) { + /* + ResultPartPtr aPartRes = std::dynamic_pointer_cast(aObj); + if (aPartRes) { + DocumentPtr aDoc = aPartRes->partDoc(); + SET_DISPLAY_GROUP(ModelAPI_ResultBody::group(), true) + SET_DISPLAY_GROUP(ModelAPI_ResultConstruction::group(), true) + SET_DISPLAY_GROUP(ModelAPI_ResultGroup::group(), true) + } else { + */ + aObj->setDisplayed(true); + //} + } + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + } @@ -1671,7 +1437,7 @@ void XGUI_Workshop::registerValidators() const } //************************************************************** -void XGUI_Workshop::displayAllResults() +/*void XGUI_Workshop::displayAllResults() { SessionPtr aMgr = ModelAPI_Session::get(); DocumentPtr aRootDoc = aMgr->moduleDocument(); @@ -1682,7 +1448,7 @@ void XGUI_Workshop::displayAllResults() displayDocumentResults(aPart->partDoc()); } myDisplayer->updateViewer(); -} +}*/ //************************************************************** void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc) @@ -1696,8 +1462,10 @@ void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc) //************************************************************** void XGUI_Workshop::displayGroupResults(DocumentPtr theDoc, std::string theGroup) { - for (int i = 0; i < theDoc->size(theGroup); i++) - displayObject(theDoc->object(theGroup, i)); + for (int i = 0; i < theDoc->size(theGroup); i++) + theDoc->object(theGroup, i)->setDisplayed(true); + //displayObject(theDoc->object(theGroup, i)); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); } //************************************************************** @@ -1724,25 +1492,6 @@ void XGUI_Workshop::closeDocument() SessionPtr aMgr = ModelAPI_Session::get(); aMgr->closeAll(); - objectBrowser()->clearContent(); -} - -//************************************************************** -bool XGUI_Workshop::displayObject(ObjectPtr theObj) -{ - if (!myModule->canDisplayObject(theObj)) - return false; - - ResultBodyPtr aBody = std::dynamic_pointer_cast(theObj); - if (aBody.get() != NULL) { - int aNb = myDisplayer->objectsCount(); - myDisplayer->display(theObj, false); - if (aNb == 0) - viewer()->fitAll(); - } else if (!(myIsLoadingData || myPartActivating)) - myDisplayer->display(theObj, false); - - return true; } void XGUI_Workshop::addHistoryMenu(QObject* theObject, const char* theSignal, const char* theSlot)