X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=d2025cf6c6b8cb4dca9c42bc517d16fabc694479;hb=334029ee7a94867a1ed39d7ba51b6e49770b6e34;hp=46bba030766bddb305291746b842115b2505654d;hpb=64f8bd887acebdba2dfa6d5e26f0ee969ae33772;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 46bba0307..d2025cf6c 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_MenuMgr.cpp -// Created: 03 April 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 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" @@ -32,11 +46,11 @@ #include #include #include +#include #include #include #include -#include #include #include @@ -160,10 +174,13 @@ bool PartSet_MenuMgr::addViewerMenu(const QMap& theStdActions 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); @@ -171,14 +188,19 @@ bool PartSet_MenuMgr::addViewerMenu(const QMap& theStdActions QAction* aAction; int i = 0; foreach (FeaturePtr aCoins, myCoinsideLines) { - aAction = aSubMenu->addAction(aCoins->data()->name().c_str()); + QString anItemText = aCoins->data()->name().c_str(); +#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*))); - } + } } } } @@ -246,7 +268,7 @@ QColor PartSet_MenuMgr::setLineColor(int theId, const QColor theColor, bool theU } -void addRefCoincidentFeatures(const std::set& theRefList, +void addRefCoincidentFeatures(const std::set& theRefList, std::shared_ptr& theRefPnt, QObjectPtrList& theOutList) { @@ -254,14 +276,14 @@ void addRefCoincidentFeatures(const std::set& theRefList, 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()) { + 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 (theRefPnt->isEqual(aPnt) && (!theOutList.contains(aConstrFeature))) { theOutList.append(aConstrFeature); - } + } } } } @@ -273,7 +295,7 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) std::shared_ptr aOrig = PartSet_Tools::getCoincedencePoint(mySelectedFeature); if (!aOrig.get()) return; - + const std::set& aRefsList = aLine->data()->refsToMe(); QObjectPtrList aToDelFeatures; @@ -299,12 +321,13 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) // 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); aWorkshop->deleteFeatures(aToDelFeatures); - + anOpMgr->commitOperation(); } myCoinsideLines.clear(); @@ -321,7 +344,7 @@ void PartSet_MenuMgr::onDetachMenuHide() myPrevId = -1; } - + void PartSet_MenuMgr::setAuxiliary(const bool isChecked) { ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation(); @@ -358,7 +381,8 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) anOpAction = new ModuleBase_OperationAction(anAction->text(), myModule); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation); - 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); @@ -373,8 +397,9 @@ 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); } @@ -402,7 +427,8 @@ bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const // 1. change auxiliary type of a created feature if (myModule->sketchMgr()->isNestedCreateOperation(anOperation, aSketch) && PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(anOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(anOperation); if (aFOperation) anObjects.append(aFOperation->feature()); } @@ -428,8 +454,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(); } @@ -454,9 +481,24 @@ 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(); + thePart->activate(); + if (isFirstLoad) { + XGUI_Workshop* aWorkshop = myModule->getWorkshop(); + XGUI_ObjectsBrowser* aObjBrowser = aWorkshop->objectBrowser(); + DocumentPtr aDoc = thePart->partDoc(); + std::list aStates; + aDoc->restoreNodesState(aStates); + aObjBrowser->setStateForDoc(aDoc, aStates); } } @@ -472,7 +514,8 @@ 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) aMgr->startOperation("Activation"); + if (isNewTransaction) + aMgr->startOperation("Activation"); aMgr->setActiveDocument(aMgr->moduleDocument()); if (isNewTransaction) aMgr->finishOperation(); @@ -491,13 +534,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);