X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=4d1bc45b1165902269ec24ca1afb7f5299589aba;hb=88ee9b2b81cf93a6324336b57e30cc8a3a487499;hp=39e3cd77d02e5896c43894bdca340e43d43f9e89;hpb=2532fb2df83ee1ddd9ff3e8b381d3788eaa15b69;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 39e3cd77d..4d1bc45b1 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -12,9 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "PartSet_MenuMgr.h" @@ -35,9 +35,9 @@ #include #include -#include #include #include +#include #include #include @@ -46,6 +46,8 @@ #include #include #include +#include +#include #include #include @@ -56,6 +58,7 @@ #include #include #include +#include #include #include @@ -104,6 +107,10 @@ void PartSet_MenuMgr::createActions() aAction = ModuleBase_Tools::createAction(QIcon(":icons/edit.png"), tr("Edit..."), aParent, this, SLOT(onEdit(bool))); myActions["EDIT_CMD"] = aAction; + + aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Load all parts"), + aParent, this, SLOT(onActivateAllParts())); + myActions["ACTIVATE_ALL_PARTS_CMD"] = aAction; } @@ -167,8 +174,8 @@ bool PartSet_MenuMgr::addViewerMenu(const QMap& theStdActions // Find coincident in these coordinates ObjectPtr aObj = aPrsList.first()->object(); - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - FeaturePtr aCoincident = PartSet_Tools::findFirstCoincidence(aFeature, aSelPnt); + FeaturePtr aCoincident = + PartSet_Tools::findFirstCoincidence(ModelAPI_Feature::feature(aObj), aSelPnt); // If we have coincidence then add Detach menu if (aCoincident.get() != NULL) { QList aCoins; @@ -186,8 +193,8 @@ bool PartSet_MenuMgr::addViewerMenu(const QMap& theStdActions theMenuActions[anIndex++] = aSubMenu->menuAction(); QAction* aAction; int i = 0; - foreach (FeaturePtr aCoins, myCoinsideLines) { - QString anItemText = aCoins->data()->name().c_str(); + foreach (FeaturePtr aCoinsL, myCoinsideLines) { + QString anItemText = QString::fromStdWString(aCoinsL->data()->name()); #ifdef _DEBUG if (anIsAttributes[i]) anItemText += " [attribute]"; @@ -279,7 +286,6 @@ void addRefCoincidentFeatures(const std::set& theRefList, std::shared_ptr aPnt = PartSet_Tools::getCoincedencePoint(aConstrFeature); if (aPnt.get() == NULL) return; - gp_Pnt aP = aPnt->impl(); if (theRefPnt->isEqual(aPnt) && (!theOutList.contains(aConstrFeature))) { theOutList.append(aConstrFeature); } @@ -311,11 +317,9 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) if (aToDelFeatures.size() > 0) { XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); XGUI_Workshop* aWorkshop = aConnector->workshop(); - ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); - ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction( - tr("Detach %1").arg(aLine->data()->name().c_str()), myModule); - bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation); + 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 @@ -373,12 +377,11 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) QAction* anAction = action("AUXILIARY_CMD"); //SessionPtr aMgr = ModelAPI_Session::get(); - ModuleBase_OperationAction* anOpAction = 0; + ModuleBase_Operation* anOpAction = 0; XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); if (isUseTransaction) { - anOpAction = new ModuleBase_OperationAction(anAction->text(), myModule); - bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation); + anOpAction = new ModuleBase_Operation(anAction->text(), myModule); bool isCommitted; if (!anOpMgr->canStartOperation(anOpAction->id(), isCommitted)) @@ -386,6 +389,7 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) 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++) { @@ -401,6 +405,7 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) aSketchFeature->data()->attribute(anAttribute)); if (anAuxiliaryAttr) anAuxiliaryAttr->setValue(isChecked); + ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anVisualEvent); } } } @@ -409,6 +414,7 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) anOpMgr->commitOperation(); Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + Events_Loop::loop()->flush(anVisualEvent); } bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const @@ -490,15 +496,52 @@ void PartSet_MenuMgr::onActivatePart(bool) 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(); + } } void PartSet_MenuMgr::onActivatePartSet(bool) @@ -516,9 +559,11 @@ void PartSet_MenuMgr::activatePartSet() const if (isNewTransaction) aMgr->startOperation("Activation"); aMgr->setActiveDocument(aMgr->moduleDocument()); - if (isNewTransaction) aMgr->finishOperation(); + if (isNewTransaction) + aMgr->finishOperation(); myModule->workshop()->updateCommandStatus(); + myModule->workshop()->viewer()->update(); } void PartSet_MenuMgr::grantedOperationIds(ModuleBase_Operation* theOperation,