X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=84cbda90551f8c23f60403aa6ea4cfa55bd591c9;hb=4bd5b3938f3aba070cd4a79b8e6ffd625dcdbe81;hp=391ed7cdd4c49cd2c9d99141f6d2ef931195ab8d;hpb=6156449367dbe2da7c80b03359bae7626846a402;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 391ed7cdd..84cbda905 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -62,6 +62,8 @@ #include #include #include +#include +#include #include #include @@ -129,7 +131,6 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) myOperationMgr = new XGUI_OperationMgr(this, 0); myActionsMgr = new XGUI_ActionsMgr(this); myErrorDlg = new XGUI_ErrorDialog(QApplication::desktop()); - myErrorMgr = new XGUI_ErrorMgr(this); myContextMenuMgr = new XGUI_ContextMenuMgr(this); connect(myContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this, SLOT(onContextMenuCommand(const QString&, bool))); @@ -143,6 +144,7 @@ XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector) ModuleBase_IWorkshop* aWorkshop = moduleConnector(); myOperationMgr->setWorkshop(aWorkshop); + myErrorMgr = new XGUI_ErrorMgr(this, aWorkshop); myEventsListener = new XGUI_WorkshopListener(aWorkshop); connect(myOperationMgr, SIGNAL(operationStarted(ModuleBase_Operation*)), @@ -155,8 +157,8 @@ 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())); + //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), + // myErrorMgr, SLOT(onValidationStateChanged())); if (myMainWindow) connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit())); @@ -221,16 +223,29 @@ void XGUI_Workshop::activateModule() myActionsMgr->update(); + // activate visualized objects in the viewer + XGUI_Displayer* aDisplayer = displayer(); + QObjectPtrList aDisplayed = aDisplayer->displayedObjects(); + QIntList aModes; + module()->activeSelectionModes(aModes); + aDisplayer->activateObjects(aModes, aDisplayed); } void XGUI_Workshop::deactivateModule() { myModule->deactivateSelectionFilters(); + // remove internal displayer filter + displayer()->deactivateSelectionFilters(); + disconnect(myDisplayer, SIGNAL(objectDisplayed(ObjectPtr, AISObjectPtr)), myModule, SLOT(onObjectDisplayed(ObjectPtr, AISObjectPtr))); disconnect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)), myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr))); + + XGUI_Displayer* aDisplayer = displayer(); + QObjectPtrList aDisplayed = aDisplayer->displayedObjects(); + aDisplayer->deactivateObjects(aDisplayed, true); } //****************************************************** @@ -361,39 +376,94 @@ void XGUI_Workshop::onStartWaiting() } } +//****************************************************** +void XGUI_Workshop::onAcceptActionClicked() +{ + QAction* anAction = dynamic_cast(sender()); + XGUI_OperationMgr* anOperationMgr = operationMgr(); + if (anOperationMgr) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (anOperationMgr->currentOperation()); + if (aFOperation) { + if (errorMgr()->canProcessClick(anAction, aFOperation->feature())) + myOperationMgr->onCommitOperation(); + } + } +} + +//****************************************************** +/*void XGUI_Workshop::onValidationStateChanged(bool theEnabled) +{ + 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); + } + } +}*/ + //****************************************************** void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer) { if (!myModule->canActivateSelection(theObject)) { - if (myDisplayer->isActive(theObject)) - myDisplayer->deactivate(theObject, theUpdateViewer); + if (myDisplayer->isActive(theObject)) { + QObjectPtrList anObjects; + anObjects.append(theObject); + myDisplayer->deactivateObjects(anObjects, theUpdateViewer); + } + } +} + +//****************************************************** +bool XGUI_Workshop::isFeatureOfNested(const FeaturePtr& theFeature) +{ + bool aHasNested = false; + std::string aFeatureKind = theFeature->getKind(); + if (isSalomeMode()) { + XGUI_SalomeConnector* aSalomeConnector = salomeConnector(); + if (aSalomeConnector->isFeatureOfNested(actionsMgr()->action(aFeatureKind.c_str()))) + aHasNested = true; + } else { + AppElements_MainMenu* aMenuBar = mainWindow()->menuObject(); + AppElements_Command* aCommand = aMenuBar->feature(aFeatureKind.c_str()); + if (aCommand && aCommand->button()->additionalButtonWidget()) + aHasNested = true; } + return aHasNested; } //****************************************************** void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation) { - setNestedFeatures(theOperation); + setGrantedFeatures(theOperation); - if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel - setPropertyPanel(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 commited after the controls filling, the method perform should + // 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 (!theOperation->isEditOperation()) { - theOperation->activateByPreselection(); - if (operationMgr()->currentOperation() != theOperation) + if (!aFOperation->isEditOperation()) { + aFOperation->activateByPreselection(); + if (operationMgr()->currentOperation() != aFOperation) return; } } updateCommandStatus(); - myModule->onOperationStarted(theOperation); + myModule->onOperationStarted(aFOperation); // the objects of the current operation should be deactivated QObjectPtrList anObjects; - FeaturePtr aFeature = theOperation->feature(); + FeaturePtr aFeature = aFOperation->feature(); anObjects.append(aFeature); std::list aResults = aFeature->results(); std::list::const_iterator aIt; @@ -410,7 +480,7 @@ void XGUI_Workshop::onOperationStarted(ModuleBase_Operation* theOperation) //****************************************************** void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation) { - setNestedFeatures(theOperation); + setGrantedFeatures(theOperation); if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel setPropertyPanel(theOperation); @@ -424,27 +494,35 @@ void XGUI_Workshop::onOperationResumed(ModuleBase_Operation* theOperation) //****************************************************** void XGUI_Workshop::onOperationStopped(ModuleBase_Operation* theOperation) { + updateCommandStatus(); + + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (theOperation); + if (!aFOperation) + return; + ModuleBase_ISelection* aSel = mySelector->selection(); QObjectPtrList aObj = aSel->selectedPresentations(); //!< No need for property panel - updateCommandStatus(); hidePropertyPanel(); myPropertyPanel->cleanContent(); - myModule->onOperationStopped(theOperation); + myModule->onOperationStopped(aFOperation); // 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); + FeaturePtr aFeature = aFOperation->feature(); + 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::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; @@ -463,18 +541,29 @@ void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation) myModule->onOperationAborted(theOperation); } -void XGUI_Workshop::setNestedFeatures(ModuleBase_Operation* theOperation) +void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation) { - if (this->isSalomeMode()) - theOperation->setNestedFeatures(mySalomeConnector->nestedActions(theOperation->id())); - else - theOperation->setNestedFeatures(myActionsMgr->nestedCommands(theOperation->id())); + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (!aFOperation) + return; + + QStringList aGrantedIds; + if (isSalomeMode()) + aGrantedIds = mySalomeConnector->nestedActions(theOperation->id()); + else + aGrantedIds = myActionsMgr->nestedCommands(theOperation->id()); + + aFOperation->setGrantedOperationIds(aGrantedIds); } void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (!aFOperation) + return; + showPropertyPanel(); - QString aXmlRepr = theOperation->getDescription()->xmlRepresentation(); + QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aXmlRepr.toStdString(), myModuleConnector); @@ -483,15 +572,15 @@ void XGUI_Workshop::setPropertyPanel(ModuleBase_Operation* theOperation) QList aWidgets = aFactory.getModelWidgets(); foreach (ModuleBase_ModelWidget* aWidget, aWidgets) { - bool isStoreValue = !theOperation->isEditOperation() && + bool isStoreValue = !aFOperation->isEditOperation() && !aWidget->getDefaultValue().empty() && !aWidget->isComputedDefault(); - aWidget->setFeature(theOperation->feature(), isStoreValue); + aWidget->setFeature(aFOperation->feature(), isStoreValue); aWidget->enableFocusProcessing(); } myPropertyPanel->setModelWidgets(aWidgets); - theOperation->setPropertyPanel(myPropertyPanel); + aFOperation->setPropertyPanel(myPropertyPanel); myModule->propertyPanelDefined(theOperation); @@ -511,7 +600,7 @@ void XGUI_Workshop::saveDocument(const QString& theName, std::list& QApplication::restoreOverrideCursor(); } -bool XGUI_Workshop::isActiveOperationAborted() +bool XGUI_Workshop::abortAllOperations() { return myOperationMgr->abortAllOperations(); } @@ -559,7 +648,7 @@ void XGUI_Workshop::onNew() //****************************************************** void XGUI_Workshop::onOpen() { - if(!isActiveOperationAborted()) + if(!abortAllOperations()) return; //save current file before close if modified SessionPtr aSession = ModelAPI_Session::get(); @@ -591,7 +680,6 @@ void XGUI_Workshop::onOpen() aSession->closeAll(); aSession->load(myCurrentDir.toLatin1().constData()); myObjectBrowser->rebuildDataTree(); - //displayAllResults(); updateCommandStatus(); QApplication::restoreOverrideCursor(); } @@ -599,7 +687,7 @@ void XGUI_Workshop::onOpen() //****************************************************** bool XGUI_Workshop::onSave() { - if(!isActiveOperationAborted()) + if(!abortAllOperations()) return false; if (myCurrentDir.isEmpty()) { return onSaveAs(); @@ -615,7 +703,7 @@ bool XGUI_Workshop::onSave() //****************************************************** bool XGUI_Workshop::onSaveAs() { - if(!isActiveOperationAborted()) + if(!abortAllOperations()) return false; QFileDialog dialog(mainWindow()); dialog.setWindowTitle(tr("Select directory to save files...")); @@ -663,7 +751,8 @@ void XGUI_Workshop::onUndo(int theTimes) for (int i = 0; i < theTimes; ++i) { aMgr->undo(); } - updateCompositeActionState(); + + operationMgr()->updateApplyOfOperations(); updateCommandStatus(); } @@ -687,7 +776,7 @@ void XGUI_Workshop::onRedo(int theTimes) for (int i = 0; i < theTimes; ++i) { aMgr->redo(); } - updateCompositeActionState(); + operationMgr()->updateApplyOfOperations(); updateCommandStatus(); // unblock the viewer update functionality and make update on purpose @@ -730,6 +819,7 @@ void XGUI_Workshop::onPreferences() myMainWindow->menuObject()->updateFromResources(); } } + displayer()->redisplayObjects(); } } @@ -850,20 +940,6 @@ 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(); @@ -914,18 +990,15 @@ void XGUI_Workshop::createDockWidgets() myPropertyPanel->installEventFilter(myOperationMgr); QAction* aOkAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept); - connect(aOkAct, SIGNAL(triggered()), myOperationMgr, SLOT(onCommitOperation())); + connect(aOkAct, SIGNAL(triggered()), this, SLOT(onAcceptActionClicked())); + 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)), - aOkAct, SLOT(setEnabled(bool))); - QAction* aAcceptAllAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::AcceptAll); - connect(myOperationMgr, SIGNAL(nestedStateChanged(bool)), - aAcceptAllAct, SLOT(setEnabled(bool))); - + //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)), + // this, SLOT(onValidationStateChanged(bool))); } //****************************************************** @@ -993,8 +1066,10 @@ void XGUI_Workshop::onContextMenuCommand(const QString& theId, bool isChecked) setDisplayMode(aObjects, XGUI_Displayer::Wireframe); else if (theId == "HIDEALL_CMD") { QObjectPtrList aList = myDisplayer->displayedObjects(); - foreach (ObjectPtr aObj, aList) - aObj->setDisplayed(false); + foreach (ObjectPtr aObj, aList) { + if (module()->canEraseObject(aObj)) + aObj->setDisplayed(false); + } Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); } } @@ -1009,7 +1084,7 @@ void XGUI_Workshop::deleteObjects() return; } - if (!isActiveOperationAborted()) + if (!abortAllOperations()) return; QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); // It is necessary to clear selection in order to avoid selection changed event during @@ -1037,38 +1112,24 @@ void XGUI_Workshop::deleteObjects() aObjectNames << QString::fromStdString(aObj->data()->name()); } aDescription = aDescription.arg(aObjectNames.join(", ")); + ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module()); - 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 - // this is performed in the RemoveFeature of Part object. - /*foreach (ObjectPtr aObj, anObjects) - { - ResultPartPtr aPart = std::dynamic_pointer_cast(aObj); - if (aPart) { - DocumentPtr aDoc = aObj->document(); - if (aDoc == aMgr->activeDocument()) { - aDoc->close(); - } - } - }*/ + operationMgr()->startOperation(anOpAction); // 3. delete objects QMainWindow* aDesktop = isSalomeMode() ? salomeConnector()->desktop() : myMainWindow; std::set anIgnoredFeatures; if (deleteFeatures(anObjects, anIgnoredFeatures, aDesktop, true)) { - myDisplayer->updateViewer(); - aMgr->finishOperation(); - updateCommandStatus(); + operationMgr()->commitOperation(); } else { - aMgr->abortOperation(); + operationMgr()->abortOperation(operationMgr()->currentOperation()); } } //************************************************************** void XGUI_Workshop::moveObjects() { - if (!isActiveOperationAborted()) + if (!abortAllOperations()) return; SessionPtr aMgr = ModelAPI_Session::get(); @@ -1078,8 +1139,14 @@ void XGUI_Workshop::moveObjects() aMgr->startOperation(aDescription.toStdString()); QObjectPtrList anObjects = mySelector->selection()->selectedObjects(); - DocumentPtr anActiveDocument = aMgr->activeDocument(); + // It is necessary to clear selection in order to avoid selection changed event during + // moving and negative consequences connected with processing of already moved items + mySelector->clearSelection(); + // check whether the object can be moved. There should not be parts which are not loaded + if (!XGUI_Tools::canRemoveOrRename(myMainWindow, anObjects)) + return; + DocumentPtr anActiveDocument = aMgr->activeDocument(); FeaturePtr aCurrentFeature = anActiveDocument->currentFeature(true); foreach (ObjectPtr aObject, anObjects) { if (!myModule->canApplyAction(aObject, anActionId)) @@ -1219,6 +1286,32 @@ bool hasResults(QObjectPtrList theObjects, const std::set& theTypes return isFoundResultType; } +//************************************************************** +// Returns the list of all features for theDocument and all features of +// all nested parts. +std::list allFeatures(const DocumentPtr& theDocument) +{ + std::list aResultList; + std::list anAllFeatures = theDocument->allFeatures(); + foreach (const FeaturePtr& aFeature, anAllFeatures) { + // The order of appending features of the part and the part itself is important + + // Append features from a part feature + foreach (const ResultPtr& aResult, aFeature->results()) { + ResultPartPtr aResultPart = + std::dynamic_pointer_cast(aResult); + if (aResultPart.get() && aResultPart->partDoc().get()) { + // Recursion + std::list anAllFeatures = allFeatures(aResultPart->partDoc()); + aResultList.insert(aResultList.end(), anAllFeatures.begin(), anAllFeatures.end()); + } + } + + aResultList.push_back(aFeature); + } + return aResultList; +} + //************************************************************** // Returns the list of features placed between theObject and the current feature // in the same document. Excludes theObject, includes the current feature. @@ -1226,14 +1319,14 @@ std::list toCurrentFeatures(const ObjectPtr& theObject) { std::list aResult; DocumentPtr aDocument = theObject->document(); - std::list anAllFeatures = aDocument->allFeatures(); + std::list anAllFeatures = allFeatures(aDocument); // find the object iterator std::list::iterator aObjectIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), theObject); - if (aObjectIt == anAllFeatures.end()) + if (aObjectIt == anAllFeatures.end()) return aResult; // find the current feature iterator std::list::iterator aCurrentIt = std::find(anAllFeatures.begin(), anAllFeatures.end(), aDocument->currentFeature(true)); - if (aCurrentIt == anAllFeatures.end()) + if (aCurrentIt == anAllFeatures.end()) return aResult; // check the right order if (std::distance(aObjectIt, anAllFeatures.end()) <= std::distance(aCurrentIt, anAllFeatures.end())) @@ -1252,8 +1345,12 @@ bool XGUI_Workshop::canMoveFeature() QObjectPtrList aObjects = mySelector->selection()->selectedObjects(); QObjectPtrList aValidatedObjects; foreach (ObjectPtr aObject, aObjects) { - if (myModule->canApplyAction(aObject, anActionId)) - aValidatedObjects.append(aObject); + if (!myModule->canApplyAction(aObject, anActionId)) + continue; + // To be moved feature should be in active document + if (aObject->document() != ModelAPI_Session::get()->activeDocument()) + continue; + aValidatedObjects.append(aObject); } if (aValidatedObjects.size() != aObjects.size()) aObjects = aValidatedObjects; @@ -1282,7 +1379,7 @@ bool XGUI_Workshop::canMoveFeature() std::set_intersection(aRefFeatures.begin(), aRefFeatures.end(), aPlacedFeatures.begin(), aPlacedFeatures.end(), std::inserter(aIntersectionFeatures, aIntersectionFeatures.begin())); - // 4. Return false if any reference feature is placed before curent feature + // 4. Return false if any reference feature is placed before current feature if (!aIntersectionFeatures.empty()) aCanMove = false; } @@ -1429,8 +1526,10 @@ void XGUI_Workshop::showOnlyObjects(const QObjectPtrList& theList) { // Hide all displayed objects QObjectPtrList aList = myDisplayer->displayedObjects(); - foreach (ObjectPtr aObj, aList) - aObj->setDisplayed(false); + foreach (ObjectPtr aObj, aList) { + if (module()->canEraseObject(aObj)) + aObj->setDisplayed(false); + } // Show only objects from the list foreach (ObjectPtr aObj, theList) { @@ -1458,20 +1557,6 @@ void XGUI_Workshop::registerValidators() const ModelAPI_ValidatorsFactory* aFactory = aMgr->validators(); } -//************************************************************** -/*void XGUI_Workshop::displayAllResults() -{ - SessionPtr aMgr = ModelAPI_Session::get(); - DocumentPtr aRootDoc = aMgr->moduleDocument(); - displayDocumentResults(aRootDoc); - for (int i = 0; i < aRootDoc->size(ModelAPI_ResultPart::group()); i++) { - ObjectPtr aObject = aRootDoc->object(ModelAPI_ResultPart::group(), i); - ResultPartPtr aPart = std::dynamic_pointer_cast(aObject); - displayDocumentResults(aPart->partDoc()); - } - myDisplayer->updateViewer(); -}*/ - //************************************************************** void XGUI_Workshop::displayDocumentResults(DocumentPtr theDoc) { @@ -1520,6 +1605,8 @@ void XGUI_Workshop::closeDocument() myDisplayer->eraseAll(); objectBrowser()->clearContent(); + module()->closeDocument(); + SessionPtr aMgr = ModelAPI_Session::get(); aMgr->closeAll(); } @@ -1546,9 +1633,9 @@ QList XGUI_Workshop::processHistoryList(const std::list std::list::const_iterator it = theList.cbegin(); for (; it != theList.cend(); it++) { QString anId = QString::fromStdString(*it); - bool isEditing = anId.endsWith(ModuleBase_Operation::EditSuffix()); + bool isEditing = anId.endsWith(ModuleBase_OperationFeature::EditSuffix()); if (isEditing) { - anId.chop(ModuleBase_Operation::EditSuffix().size()); + anId.chop(ModuleBase_OperationFeature::EditSuffix().size()); } ActionInfo anInfo; QAction* aContextMenuAct = myContextMenuMgr->actionByName(anId);