X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=ce5f478a3d2568c9c1c740897ec72f592193c65e;hb=1fd15bed1c62f994a3438bc4a12f44d0361f98c9;hp=24953f5a600d23f01f8a94773b53016988133b67;hpb=185923a92c76805bc1b410b0f655e214394a8573;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 24953f5a6..ce5f478a3 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,9 +35,9 @@ #include #include -#include #include #include +#include #include #include @@ -33,6 +46,7 @@ #include #include #include +#include #include #include @@ -43,6 +57,7 @@ #include #include #include +#include #include #include @@ -91,6 +106,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; } @@ -154,24 +173,32 @@ 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; mySelectedFeature = aCoincident; + QList anIsAttributes; PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, - SketchPlugin_ConstraintCoincidence::ENTITY_A()); + SketchPlugin_ConstraintCoincidence::ENTITY_A(), + anIsAttributes); PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, - SketchPlugin_ConstraintCoincidence::ENTITY_B()); + SketchPlugin_ConstraintCoincidence::ENTITY_B(), + anIsAttributes); if (myCoinsideLines.size() > 0) { aIsDetach = true; 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++; } @@ -258,7 +285,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); } @@ -290,16 +316,15 @@ 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 // in order to do not abort/commit it - if (!anOpMgr->canStartOperation(tr("Detach"))) + bool isCommitted; + if (!anOpMgr->canStartOperation(tr("Detach"), isCommitted)) return; // the objects are processed but can not be deleted anOpMgr->startOperation(anOpAction); @@ -351,18 +376,19 @@ 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); - if (!anOpMgr->canStartOperation(anOpAction->id())) + 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++) { @@ -378,6 +404,7 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) aSketchFeature->data()->attribute(anAttribute)); if (anAuxiliaryAttr) anAuxiliaryAttr->setValue(isChecked); + ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anVisualEvent); } } } @@ -386,6 +413,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 @@ -478,6 +506,38 @@ void PartSet_MenuMgr::activatePart(ResultPartPtr thePart) const } } +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) { if (myModule->workshop()->currentOperation()) @@ -493,9 +553,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, @@ -510,13 +572,21 @@ void PartSet_MenuMgr::grantedOperationIds(ModuleBase_Operation* theOperation, 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);