X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=24953f5a600d23f01f8a94773b53016988133b67;hb=6962b55abf9d2cd5c5a5853ef98b72b86bb262e2;hp=28013c9df0d51abdfbe71b16c82de80c221718d2;hpb=c3ae28ba30027cc4a6a757ef623f40adaae96ead;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp index 28013c9df..24953f5a6 100644 --- a/src/PartSet/PartSet_MenuMgr.cpp +++ b/src/PartSet/PartSet_MenuMgr.cpp @@ -24,21 +24,25 @@ #include #include #include +#include +#include #include #include #include #include #include +#include #include #include #include -#include #include +#include #include #include +#include #include #include @@ -70,27 +74,23 @@ 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; // 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; } @@ -104,11 +104,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(); @@ -118,69 +122,52 @@ 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(); + 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; - } - } - } - } + FeaturePtr aCoincident = PartSet_Tools::findFirstCoincidence(aFeature, aSelPnt); // If we have coincidence then add Detach menu if (aCoincident.get() != NULL) { + QList aCoins; mySelectedFeature = aCoincident; - PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, SketchPlugin_ConstraintCoincidence::ENTITY_A()); - PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, + PartSet_Tools::findCoincidences(mySelectedFeature, myCoinsideLines, aCoins, SketchPlugin_ConstraintCoincidence::ENTITY_B()); 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) { @@ -191,22 +178,25 @@ bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMapaddAction(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; } @@ -215,7 +205,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); @@ -256,7 +246,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) { @@ -264,14 +254,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); - } + } } } } @@ -283,7 +273,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; @@ -314,7 +304,7 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction) anOpMgr->startOperation(anOpAction); aWorkshop->deleteFeatures(aToDelFeatures); - + anOpMgr->commitOperation(); } myCoinsideLines.clear(); @@ -331,20 +321,21 @@ 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) && + if (myModule->sketchMgr()->isNestedCreateOperation(anOperation, aSketch) && PartSet_SketcherMgr::isEntity(anOperation->id().toStdString()) ) { ModuleBase_OperationFeature* aFOperation = dynamic_cast (anOperation); @@ -372,8 +363,6 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) anOpMgr->startOperation(anOpAction); } - myModule->sketchMgr()->storeSelection(); - if (anObjects.size() > 0) { QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); for (; anIt != aLast; anIt++) { @@ -384,8 +373,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); } @@ -396,7 +386,6 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked) anOpMgr->commitOperation(); Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - myModule->sketchMgr()->restoreSelection(); } bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const @@ -404,23 +393,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()) ) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(anOperation); + 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(); @@ -439,8 +430,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(); } @@ -465,8 +457,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); } } @@ -482,9 +490,12 @@ 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(); + + myModule->workshop()->updateCommandStatus(); } void PartSet_MenuMgr::grantedOperationIds(ModuleBase_Operation* theOperation, @@ -501,7 +512,7 @@ void PartSet_MenuMgr::onEdit(bool) QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects(); FeaturePtr aFeature = std::dynamic_pointer_cast(aObjects.first()); if (aFeature == NULL) { - ResultParameterPtr aParam = + ResultParameterPtr aParam = std::dynamic_pointer_cast(aObjects.first()); if (aParam.get() != NULL) { aFeature = ModelAPI_Feature::feature(aParam); @@ -511,19 +522,12 @@ void PartSet_MenuMgr::onEdit(bool) 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