X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=b0cf3a6dc6369eb8dd15b4ed6b5ee3fe171dc09e;hb=aceff7878bbcc7a44510096de268a781e7380c6f;hp=9b5919c20d411df18d759c8cbe87ccc36781c5ee;hpb=4df8e41bd2fdbee3bb669a84abf7b080c386a76f;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 9b5919c20..b0cf3a6dc 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_MenuMgr.cpp -// Created: 03 April 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2021 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// #include "PartSet_MenuMgr.h" #include "PartSet_Module.h" @@ -22,21 +35,30 @@ #include #include +#include +#include +#include +#include #include #include #include #include +#include #include +#include +#include #include #include #include -#include #include +#include #include #include +#include +#include #include #include @@ -68,31 +90,27 @@ void PartSet_MenuMgr::createActions() { QAction* aAction; - aAction = new QAction(tr("Auxiliary"), this); + QWidget* aParent = myModule->workshop()->desktop(); + aAction = ModuleBase_Tools::createAction(QIcon(), tr("Auxiliary"), aParent); aAction->setCheckable(true); addAction("AUXILIARY_CMD", aAction); - aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePart(bool))); + aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Activate"), aParent, + this, SLOT(onActivatePart(bool))); myActions["ACTIVATE_PART_CMD"] = aAction; - aAction = new QAction(QIcon(":icons/deactivate.png"), tr("Deactivate"), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool))); - myActions["DEACTIVATE_PART_CMD"] = aAction; - // Activate PartSet - aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool))); + aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Activate"), aParent, + this, SLOT(onActivatePartSet(bool))); myActions["ACTIVATE_PARTSET_CMD"] = aAction; - aAction = new QAction(QIcon(":icons/edit.png"), tr("Edit..."), this); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onEdit(bool))); + aAction = ModuleBase_Tools::createAction(QIcon(":icons/edit.png"), tr("Edit..."), aParent, + this, SLOT(onEdit(bool))); myActions["EDIT_CMD"] = aAction; - aAction = new QAction(QIcon(), tr("Select parent feature"), this); - aAction->setCheckable(false); - connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onSelectParentFeature())); - myActions["SELECT_PARENT_CMD"] = aAction; + aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Load all parts"), + aParent, this, SLOT(onActivateAllParts())); + myActions["ACTIVATE_ALL_PARTS_CMD"] = aAction; } @@ -106,11 +124,15 @@ void PartSet_MenuMgr::onAction(bool isChecked) } } -bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap& theStdActions) const +bool PartSet_MenuMgr::addViewerMenu(const QMap& theStdActions, + QWidget* theParent, + QMap& theMenuActions) const { + int anIndex = 0; + ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); if (!PartSet_SketcherMgr::isSketchOperation(anOperation) && - !PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) + !myModule->sketchMgr()->isNestedSketchOperation(anOperation)) return false; myCoinsideLines.clear(); @@ -120,95 +142,89 @@ bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap aPrsList = aSelection->getSelected(ModuleBase_ISelection::Viewer); - TopoDS_Shape aShape; - ResultPtr aResult; - FeaturePtr aFeature; - foreach(ModuleBase_ViewerPrs aPrs, aPrsList) { - aResult = std::dynamic_pointer_cast(aPrs.object()); - if (aResult.get() != NULL) { - aShape = aPrs.shape(); - if (aShape.IsEqual(aResult->shape()->impl())) - hasFeature = true; - else - hasAttribute = true; - } else { - aFeature = std::dynamic_pointer_cast(aPrs.object()); - hasFeature = (aFeature.get() != NULL); + QList aPrsList = aSelection->getSelected(ModuleBase_ISelection::Viewer); + if (aPrsList.size() > 1) { + hasFeature = true; + } else if (aPrsList.size() == 1) { + ResultPtr aResult; + FeaturePtr aFeature; + foreach(ModuleBase_ViewerPrsPtr aPrs, aPrsList) { + aResult = std::dynamic_pointer_cast(aPrs->object()); + if (aResult.get() != NULL) { + const GeomShapePtr& aShape = aPrs->shape(); + if (aShape.get() && aShape->isEqual(aResult->shape())) + hasFeature = true; + else + hasAttribute = true; + } else { + aFeature = std::dynamic_pointer_cast(aPrs->object()); + hasFeature = (aFeature.get() != NULL); + } } - } - if (aPrsList.size() == 1) { - TopoDS_Shape aShape = aPrsList.first().shape(); - if ((!aShape.IsNull()) && aShape.ShapeType() == TopAbs_VERTEX) { + const GeomShapePtr& aShape = aPrsList.first()->shape(); + if (aShape.get() && !aShape->isNull() && aShape->shapeType() == GeomAPI_Shape::VERTEX) { // Find 2d coordinates FeaturePtr aSketchFea = myModule->sketchMgr()->activeSketch(); if (aSketchFea->getKind() == SketchPlugin_Sketch::ID()) { - gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aShape)); + const TopoDS_Shape& aTDShape = aShape->impl(); + gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aTDShape)); std::shared_ptr aPnt3d(new GeomAPI_Pnt(aPnt.X(), aPnt.Y(), aPnt.Z())); std::shared_ptr aSelPnt = PartSet_Tools::convertTo2D(aSketchFea, aPnt3d); // Find coincident in these coordinates - ObjectPtr aObj = aPrsList.first().object(); - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - const std::set& aRefsList = aFeature->data()->refsToMe(); - std::set::const_iterator aIt; - FeaturePtr aCoincident; - for (aIt = aRefsList.cbegin(); aIt != aRefsList.cend(); ++aIt) { - std::shared_ptr aAttr = (*aIt); - FeaturePtr aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); - if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { - std::shared_ptr a2dPnt = - PartSet_Tools::getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (a2dPnt.get() && aSelPnt->isEqual(a2dPnt)) { - aCoincident = aConstrFeature; - break; - } else { - a2dPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); - if (a2dPnt.get() && aSelPnt->isEqual(a2dPnt)) { - aCoincident = aConstrFeature; - break; - } - } - } - } + ObjectPtr aObj = aPrsList.first()->object(); + FeaturePtr aCoincident = + PartSet_Tools::findFirstCoincidence(ModelAPI_Feature::feature(aObj), aSelPnt); // If we have coincidence then add Detach menu if (aCoincident.get() != NULL) { + QList aCoins; mySelectedFeature = aCoincident; - PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); - PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); + QList anIsAttributes; + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, + SketchPlugin_ConstraintCoincidence::ENTITY_A(), + anIsAttributes); + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, + SketchPlugin_ConstraintCoincidence::ENTITY_B(), + anIsAttributes); if (myCoinsideLines.size() > 0) { aIsDetach = true; - QMenu* aSubMenu = theMenu->addMenu(tr("Detach")); + QMenu* aSubMenu = new QMenu(tr("Detach"), theParent); + theMenuActions[anIndex++] = aSubMenu->menuAction(); QAction* aAction; int i = 0; - foreach (FeaturePtr aCoins, myCoinsideLines) { - aAction = aSubMenu->addAction(aCoins->data()->name().c_str()); + foreach (FeaturePtr aCoinsL, myCoinsideLines) { + QString anItemText = QString::fromStdWString(aCoinsL->data()->name()); +#ifdef _DEBUG + if (anIsAttributes[i]) + anItemText += " [attribute]"; +#endif + aAction = aSubMenu->addAction(anItemText); aAction->setData(QVariant(i)); i++; } connect(aSubMenu, SIGNAL(hovered(QAction*)), SLOT(onLineHighlighted(QAction*))); connect(aSubMenu, SIGNAL(aboutToHide()), SLOT(onDetachMenuHide())); connect(aSubMenu, SIGNAL(triggered(QAction*)), SLOT(onLineDetach(QAction*))); - } + } } } } } - if ((!aIsDetach) && hasFeature) { - theMenu->addAction(theStdActions["DELETE_CMD"]); + if (!hasAttribute) { + bool isAuxiliary; + if (canSetAuxiliary(isAuxiliary)) { + QAction* anAction = action("AUXILIARY_CMD"); + theMenuActions[anIndex++] = anAction; + anAction->setChecked(isAuxiliary); + } } - if (hasAttribute) - return true; - bool isAuxiliary; - if (canSetAuxiliary(isAuxiliary)) { - QAction* anAction = action("AUXILIARY_CMD"); - theMenu->addAction(anAction); - anAction->setChecked(isAuxiliary); + + if (!aIsDetach && hasFeature) { + // Delete item should be the last in the list of actions + theMenuActions[1000] = theStdActions["DELETE_CMD"]; } + return true; } @@ -217,7 +233,7 @@ void PartSet_MenuMgr::updateViewerMenu(const QMap& theStdActi ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); bool isActiveSketch = PartSet_SketcherMgr::isSketchOperation(anOperation) || - PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + myModule->sketchMgr()->isNestedSketchOperation(anOperation); if (isActiveSketch) { theStdActions["WIREFRAME_CMD"]->setEnabled(false); theStdActions["SHADING_CMD"]->setEnabled(false); @@ -258,60 +274,64 @@ QColor PartSet_MenuMgr::setLineColor(int theId, const QColor theColor, bool theU } -void PartSet_MenuMgr::onLineDetach(QAction* theAction) +void addRefCoincidentFeatures(const std::set& theRefList, + std::shared_ptr& theRefPnt, + QObjectPtrList& theOutList) { - int aId = theAction->data().toInt(); - FeaturePtr aLine = myCoinsideLines.at(aId); - std::shared_ptr aOrig = PartSet_Tools::getPoint(mySelectedFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (aOrig.get() == NULL) - aOrig = PartSet_Tools::getPoint(mySelectedFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); - - gp_Pnt aOr = aOrig->impl(); - const std::set& aRefsList = aLine->data()->refsToMe(); - - QObjectPtrList aToDelFeatures; std::set::const_iterator aIt; - // Find all coincedences corresponded to the selected line in the selected point - for (aIt = aRefsList.cbegin(); aIt != aRefsList.cend(); ++aIt) { + for (aIt = theRefList.cbegin(); aIt != theRefList.cend(); ++aIt) { std::shared_ptr aAttr = (*aIt); FeaturePtr aConstrFeature = std::dynamic_pointer_cast(aAttr->owner()); - if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { - std::shared_ptr aPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); - if (aPnt.get() == NULL) - aPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); + if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { + std::shared_ptr aPnt = PartSet_Tools::getCoincedencePoint(aConstrFeature); if (aPnt.get() == NULL) return; - gp_Pnt aP = aPnt->impl(); - if (aOrig->isEqual(aPnt)) { - aToDelFeatures.append(aConstrFeature); - } else { - aPnt = PartSet_Tools::getPoint(aConstrFeature, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); - aP = aPnt->impl(); - if (aOrig->isEqual(aPnt)) { - aToDelFeatures.append(aConstrFeature); - break; - } + if (theRefPnt->isEqual(aPnt) && (!theOutList.contains(aConstrFeature))) { + theOutList.append(aConstrFeature); } } } +} + +void PartSet_MenuMgr::onLineDetach(QAction* theAction) +{ + int aId = theAction->data().toInt(); + FeaturePtr aLine = myCoinsideLines.at(aId); + std::shared_ptr aOrig = PartSet_Tools::getCoincedencePoint(mySelectedFeature); + if (!aOrig.get()) + return; + + const std::set& aRefsList = aLine->data()->refsToMe(); + + QObjectPtrList aToDelFeatures; + + addRefCoincidentFeatures(aRefsList, aOrig, aToDelFeatures); + + const std::list& aResults = aLine->results(); + std::list::const_iterator aResIt; + for (aResIt = aResults.cbegin(); aResIt != aResults.cend(); aResIt++) { + ResultPtr aResult = (*aResIt); + const std::set& aRefList = aResult->data()->refsToMe(); + addRefCoincidentFeatures(aRefList, aOrig, aToDelFeatures); + } if (aToDelFeatures.size() > 0) { XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); XGUI_Workshop* aWorkshop = aConnector->workshop(); - ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); - if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) - anOperation->abort(); - - SessionPtr aMgr = ModelAPI_Session::get(); - QString aName = tr("Detach %1").arg(aLine->data()->name().c_str()); - aMgr->startOperation(aName.toStdString()); + ModuleBase_Operation* anOpAction = new ModuleBase_Operation(tr("Detach %1").arg( + QString::fromStdWString(aLine->data()->name())), myModule); + XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); + // the active nested sketch operation should be aborted unconditionally + // the Delete action should be additionally granted for the Sketch operation + // in order to do not abort/commit it + bool isCommitted; + if (!anOpMgr->canStartOperation(tr("Detach"), isCommitted)) + return; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); aWorkshop->deleteFeatures(aToDelFeatures); - aMgr->finishOperation(); + + anOpMgr->commitOperation(); } myCoinsideLines.clear(); } @@ -327,22 +347,26 @@ void PartSet_MenuMgr::onDetachMenuHide() myPrevId = -1; } - + void PartSet_MenuMgr::setAuxiliary(const bool isChecked) { ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); + CompositeFeaturePtr aSketch = myModule->sketchMgr()->activeSketch(); bool isActiveSketch = PartSet_SketcherMgr::isSketchOperation(anOperation) || - PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + myModule->sketchMgr()->isNestedSketchOperation(anOperation); if (!isActiveSketch) return; QObjectPtrList anObjects; bool isUseTransaction = false; // 1. change auxiliary type of a created feature - if (PartSet_SketcherMgr::isNestedCreateOperation(anOperation) && - PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { - anObjects.append(anOperation->feature()); + if (myModule->sketchMgr()->isNestedCreateOperation(anOperation, aSketch) && + PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (anOperation); + if (aFOperation) + anObjects.append(aFOperation->feature()); } else { isUseTransaction = true; @@ -352,14 +376,20 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) } QAction* anAction = action("AUXILIARY_CMD"); - SessionPtr aMgr = ModelAPI_Session::get(); + //SessionPtr aMgr = ModelAPI_Session::get(); + ModuleBase_Operation* anOpAction = 0; + XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); + XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); if (isUseTransaction) { - if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) - anOperation->abort(); - aMgr->startOperation(anAction->text().toStdString()); - } - myModule->sketchMgr()->storeSelection(); + anOpAction = new ModuleBase_Operation(anAction->text(), myModule); + bool isCommitted; + if (!anOpMgr->canStartOperation(anOpAction->id(), isCommitted)) + return; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); + } + static const Events_ID anVisualEvent = Events_Loop::eventByName(EVENT_VISUAL_ATTRIBUTES); if (anObjects.size() > 0) { QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); for (; anIt != aLast; anIt++) { @@ -370,23 +400,21 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) if (aSketchFeature.get() != NULL) { std::string anAttribute = SketchPlugin_SketchEntity::AUXILIARY_ID(); - std::shared_ptr anAuxiliaryAttr = - std::dynamic_pointer_cast(aSketchFeature->data()->attribute(anAttribute)); + std::shared_ptr anAuxiliaryAttr = + std::dynamic_pointer_cast( + aSketchFeature->data()->attribute(anAttribute)); if (anAuxiliaryAttr) anAuxiliaryAttr->setValue(isChecked); + ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anVisualEvent); } } } } - if (isUseTransaction) { - aMgr->finishOperation(); - XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - aWorkshop->updateCommandStatus(); - } + if (isUseTransaction) + anOpMgr->commitOperation(); Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - myModule->sketchMgr()->restoreSelection(); + Events_Loop::loop()->flush(anVisualEvent); } bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const @@ -394,21 +422,25 @@ bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const bool anEnabled = false; ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); + CompositeFeaturePtr aSketch = myModule->sketchMgr()->activeSketch(); bool isActiveSketch = PartSet_SketcherMgr::isSketchOperation(anOperation) || - PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + myModule->sketchMgr()->isNestedSketchOperation(anOperation); if (!isActiveSketch) return anEnabled; QObjectPtrList anObjects; // 1. change auxiliary type of a created feature - if (PartSet_SketcherMgr::isNestedCreateOperation(anOperation) && + if (myModule->sketchMgr()->isNestedCreateOperation(anOperation, aSketch) && PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { - anObjects.append(anOperation->feature()); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(anOperation); + if (aFOperation) + anObjects.append(aFOperation->feature()); } else { /// The operation should not be aborted here, because the method does not changed /// the auxilliary state, but checks the possibility to perform this - ///if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) + ///if (myModule->sketchMgr()->isNestedSketchOperation(anOperation)) /// anOperation->abort(); // 2. change auxiliary type of selected sketch entities ModuleBase_ISelection* aSelection = myModule->workshop()->selection(); @@ -427,8 +459,9 @@ bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const if (aSketchFeature.get() != NULL) { std::string anAttribute = SketchPlugin_SketchEntity::AUXILIARY_ID(); - std::shared_ptr anAuxiliaryAttr = - std::dynamic_pointer_cast(aSketchFeature->data()->attribute(anAttribute)); + std::shared_ptr anAuxiliaryAttr = + std::dynamic_pointer_cast( + aSketchFeature->data()->attribute(anAttribute)); if (anAuxiliaryAttr) isNotAuxiliaryFound = !anAuxiliaryAttr->value(); } @@ -453,8 +486,61 @@ void PartSet_MenuMgr::onActivatePart(bool) aPart = std::dynamic_pointer_cast(aPartFeature->firstResult()); } } - if (aPart.get()) - aPart->activate(); + if (aPart.get()) { + activatePart(aPart); + myModule->workshop()->updateCommandStatus(); + } + } +} + +void PartSet_MenuMgr::activatePart(ResultPartPtr thePart) const +{ + bool isFirstLoad = !thePart->partDoc().get(); + ModuleBase_Tools::blockUpdateViewer(true); + thePart->activate(); + if (isFirstLoad) { + XGUI_Workshop* aWorkshop = myModule->getWorkshop(); + XGUI_ObjectsBrowser* aObjBrowser = aWorkshop->objectBrowser(); + ModuleBase_Tools::setDisplaying(thePart); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + aObjBrowser->onSelectionChanged(); + DocumentPtr aDoc = thePart->partDoc(); + std::list aStates; + aDoc->restoreNodesState(aStates); + aObjBrowser->setStateForDoc(aDoc, aStates); + } + ModuleBase_Tools::blockUpdateViewer(false); +} + +void PartSet_MenuMgr::onActivateAllParts() +{ + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->isOperation()) + return; + + DocumentPtr aDoc = aMgr->moduleDocument(); + int aNbParts = aDoc->size(ModelAPI_ResultPart::group()); + QList aPartsToLoad; + for (int i = 0; i < aNbParts; i++) { + ObjectPtr aObj = aDoc->object(ModelAPI_ResultPart::group(), i); + ResultPartPtr aPartRes = std::dynamic_pointer_cast(aObj); + if (!aPartRes->partDoc().get()) + aPartsToLoad.append(aPartRes); + } + if (!aPartsToLoad.isEmpty()) { + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + aMgr->startOperation("All Parts loading"); + foreach(ResultPartPtr aPartRes, aPartsToLoad) { + aPartRes->loadPart(); + } + aMgr->finishOperation(); + + XGUI_Workshop* aWorkshop = myModule->getWorkshop(); + XGUI_ObjectsBrowser* aObjBrowser = aWorkshop->objectBrowser(); + aObjBrowser->update(); + aWorkshop->viewer()->update(); + aWorkshop->updateCommandStatus(); + QApplication::restoreOverrideCursor(); } } @@ -462,46 +548,62 @@ void PartSet_MenuMgr::onActivatePartSet(bool) { if (myModule->workshop()->currentOperation()) return; + activatePartSet(); +} + +void PartSet_MenuMgr::activatePartSet() const +{ SessionPtr aMgr = ModelAPI_Session::get(); bool isNewTransaction = !aMgr->isOperation(); // activation may cause changes in current features in document, so it must be in transaction - if (isNewTransaction) { + if (isNewTransaction) aMgr->startOperation("Activation"); - } aMgr->setActiveDocument(aMgr->moduleDocument()); - if (isNewTransaction) { + if (isNewTransaction) aMgr->finishOperation(); + + myModule->workshop()->updateCommandStatus(); + myModule->workshop()->viewer()->update(); +} + +void PartSet_MenuMgr::grantedOperationIds(ModuleBase_Operation* theOperation, + QStringList& theIds) const +{ + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { + theIds.append(tr("Detach")); + theIds.append(tr("Auxiliary")); } } void PartSet_MenuMgr::onEdit(bool) { QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects(); - 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); + FeaturePtr aFeature; + foreach(ObjectPtr aObj, aObjects) { + aFeature = std::dynamic_pointer_cast(aObj); + if (aFeature.get()) + break; + } + if (aFeature.get() == NULL) { + ResultParameterPtr aParam; + foreach(ObjectPtr aObj, aObjects) { + aParam = std::dynamic_pointer_cast(aObj); + if (aParam.get()) + break; } + if (aParam.get() != NULL) + aFeature = ModelAPI_Feature::feature(aParam); } if (aFeature.get() != NULL) myModule->editFeature(aFeature); } -void PartSet_MenuMgr::onSelectParentFeature() +bool PartSet_MenuMgr::eventFilter(QObject* theObj, QEvent* theEvent) { - QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects(); - if (aObjects.size() != 1) - return; - - SessionPtr aMgr = ModelAPI_Session::get(); - ResultPtr aResult = std::dynamic_pointer_cast( aObjects.first() ); - if( !aResult.get() ) - return; - - FeaturePtr aParentFeature = aResult->document()->feature( aResult ); - QObjectPtrList aSelection; - aSelection.append( aParentFeature ); - myModule->workshop()->selection()->setSelectedObjects( aSelection ); -} + if (theEvent->type() == QEvent::MouseButtonDblClick) { + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->activeDocument() != aMgr->moduleDocument()) + activatePartSet(); + } + return QObject::eventFilter(theObj, theEvent); +} \ No newline at end of file