X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_SelectionMgr.cpp;h=21abed372525679975ae07e3847d79b1a10ee3a3;hb=fc72d43b677baa05ae7fd317346fd8b723b799ed;hp=eebb23d221e1983816e69be758bfcede126ac176;hpb=189f03f2176ded8896ec9da89e5ecaca2f3e870d;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_SelectionMgr.cpp b/src/XGUI/XGUI_SelectionMgr.cpp old mode 100755 new mode 100644 index eebb23d22..21abed372 --- a/src/XGUI/XGUI_SelectionMgr.cpp +++ b/src/XGUI/XGUI_SelectionMgr.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2023 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,10 +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 "XGUI_SelectionMgr.h" @@ -27,6 +26,7 @@ #include "XGUI_Displayer.h" #include "XGUI_Selection.h" #include "XGUI_OperationMgr.h" +#include "XGUI_SelectionActivate.h" #ifndef HAVE_SALOME #include @@ -38,17 +38,31 @@ #include #include #include -#include +#include +#include +#include + +#include #include #include #include +#include +#include +#include #ifdef TINSPECTOR #include #endif +#ifdef WIN32 +#pragma warning(disable : 4456) // for nested foreach +#endif + +#define OPTIMIZATION_LEVEL 50 + + XGUI_SelectionMgr::XGUI_SelectionMgr(XGUI_Workshop* theParent) : QObject(theParent), myWorkshop(theParent) @@ -96,60 +110,79 @@ void XGUI_SelectionMgr::setSelectedOwners(const SelectMgr_IndexedMapOfOwner& the //************************************************************** void XGUI_SelectionMgr::onObjectBrowserSelection() { + myLastSelectionPlace = ModuleBase_ISelection::Browser; QList aSelectedPrs = - myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser); + myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser); + XGUI_Displayer* aDisplayer = myWorkshop->displayer(); + if (!myWorkshop->operationMgr()->hasOperation()) { - QList aTmpList = aSelectedPrs; - ObjectPtr aObject; - FeaturePtr aFeature; - foreach(ModuleBase_ViewerPrsPtr aPrs, aTmpList) { - aObject = aPrs->object(); - if (aObject.get()) { - aFeature = std::dynamic_pointer_cast(aObject); - if (aFeature.get()) { - const std::list> aResList = aFeature->results(); - ResultPtr aResult; - ResultCompSolidPtr aCompSolid; - std::list::const_iterator aIt; - for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt) { - aResult = (*aIt); - aSelectedPrs.append(std::shared_ptr( - new ModuleBase_ViewerPrs(aResult, GeomShapePtr(), NULL))); - aCompSolid = std::dynamic_pointer_cast(aResult); - if (aCompSolid.get()) { - for (int i = 0; i < aCompSolid->numberOfSubs(); i++) { - ResultBodyPtr aResult = aCompSolid->subResult(i); - aSelectedPrs.append(std::shared_ptr( - new ModuleBase_ViewerPrs(aResult, aResult->shape(), NULL))); - } + ObjectPtr aObject; + FeaturePtr aFeature; + // Select all results of a selected feature in viewer + foreach(ModuleBase_ViewerPrsPtr aPrs, aSelectedPrs) { + aObject = aPrs->object(); + if (aObject.get()) { + aFeature = std::dynamic_pointer_cast(aObject); + if (aFeature.get()) { + std::list allRes; + ModelAPI_Tools::allResults(aFeature, allRes); + std::list::iterator aRes; + for(aRes = allRes.begin(); aRes != allRes.end(); aRes++) { + aSelectedPrs.append(std::shared_ptr( + new ModuleBase_ViewerPrs(*aRes, GeomShapePtr(), NULL))); } } } } } - XGUI_Displayer* aDisplayer = myWorkshop->displayer(); aDisplayer->setSelected(aSelectedPrs); + myWorkshop->updateColorScaleVisibility(); emit selectionChanged(); } //************************************************************** void XGUI_SelectionMgr::onViewerSelection() { + myLastSelectionPlace = ModuleBase_ISelection::Viewer; QList aValues; Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (!aContext.IsNull()) + if (!aContext.IsNull()) { aValues = selection()->getSelected(ModuleBase_ISelection::Viewer); - + // Update is necessary for OCCT 7.4.0: when it is clears selection it doesn't updates viewer +#if OCC_VERSION_HEX == 0x070400 + if (aValues.isEmpty()) + aContext->UpdateCurrentViewer(); +#endif + } QObjectPtrList anObjects; convertToObjectBrowserSelection(aValues, anObjects); - - bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true); myWorkshop->objectBrowser()->setObjectsSelected(anObjects); - myWorkshop->objectBrowser()->blockSignals(aBlocked); emit selectionChanged(); } +//************************************************************** +void XGUI_SelectionMgr::deselectPresentation(const Handle(AIS_InteractiveObject) theObject) +{ + NCollection_List aResultOwners; + + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { + Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); + if (anOwner.IsNull()) // TODO: check why it is possible + continue; + if (anOwner->Selectable() == theObject && anOwner->IsSelected()) + aResultOwners.Append(anOwner); + } + NCollection_List::Iterator anOwnersIt (aResultOwners); + Handle(SelectMgr_EntityOwner) anOwner; + for (; anOwnersIt.More(); anOwnersIt.Next()) { + anOwner = anOwnersIt.Value(); + if (!anOwner.IsNull()) + aContext->AddOrRemoveSelected(anOwner, false); + } +} + //************************************************************** void XGUI_SelectionMgr::updateSelectionBy(const ModuleBase_ISelection::SelectionPlace& thePlace) { @@ -165,9 +198,7 @@ void XGUI_SelectionMgr::updateSelectionBy(const ModuleBase_ISelection::Selection void XGUI_SelectionMgr::clearSelection() { QObjectPtrList aFeatures; - bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true); myWorkshop->objectBrowser()->setObjectsSelected(aFeatures); - myWorkshop->objectBrowser()->blockSignals(aBlocked); QList aSelectedPrs = myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser); @@ -185,13 +216,11 @@ void XGUI_SelectionMgr::setSelected(const QList& theVal aDisplayer->setSelected(theValues); // update selection in Object Browser - bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true); QObjectPtrList anObjects; convertToObjectBrowserSelection(theValues, anObjects); - myWorkshop->objectBrowser()->setObjectsSelected(anObjects); - myWorkshop->objectBrowser()->blockSignals(aBlocked); } + //************************************************************** void XGUI_SelectionMgr::convertToObjectBrowserSelection( const QList& theValues, @@ -205,6 +234,11 @@ void XGUI_SelectionMgr::convertToObjectBrowserSelection( SessionPtr aMgr = ModelAPI_Session::get(); DocumentPtr anActiveDocument = aMgr->activeDocument(); + TopTools_MapOfShape aShapeMap; + bool aToOptimize = (theValues.size() > OPTIMIZATION_LEVEL); + + GeomShapePtr aShape; + TopoDS_Shape aTShape; foreach(ModuleBase_ViewerPrsPtr aPrs, theValues) { if (aPrs->object().get()) { if (!theObjects.contains(aPrs->object())) @@ -212,7 +246,23 @@ void XGUI_SelectionMgr::convertToObjectBrowserSelection( if (aPrs->shape().get() && (!aHasOperation)) { aResult = std::dynamic_pointer_cast(aPrs->object()); if (aResult.get()) { - aFeature = anActiveDocument->producedByFeature(aResult, aPrs->shape()); + aShape = aPrs->shape(); + aTShape = aShape->impl(); + if (aToOptimize) { + if (!aShapeMap.Contains(aTShape)) { + aFeature = anActiveDocument->producedByFeature(aResult, aShape); + if (aFeature.get()) { + QList aResList = findAllShapes(aResult); + foreach(TopoDS_Shape aResShape, aResList) { + if (!aShapeMap.Contains(aResShape)) + aShapeMap.Add(aResShape); + } + } + } + } + else { + aFeature = anActiveDocument->producedByFeature(aResult, aShape); + } if (aFeature.get() && (!theObjects.contains(aFeature))) theObjects.append(aFeature); } @@ -220,3 +270,40 @@ void XGUI_SelectionMgr::convertToObjectBrowserSelection( } } } + +std::list XGUI_SelectionMgr::getSelectedFeatures() +{ + std::list aFeatures; + QObjectPtrList aObjects = selection()->selectedObjects(); + if (aObjects.isEmpty()) + return aFeatures; + + bool isPart = false; + foreach(ObjectPtr aObj, aObjects) { + FeaturePtr aFeature = std::dynamic_pointer_cast(aObj); + if (aFeature.get()) { + ResultPtr aRes = aFeature->firstResult(); + isPart = (aRes.get() && (aRes->groupName() == ModelAPI_ResultPart::group())); + if (!isPart) + aFeatures.push_back(aFeature); + } + } + return aFeatures; +} + +QList XGUI_SelectionMgr::findAllShapes(const ResultPtr& theResult) const +{ + QIntList aModes = myWorkshop->selectionActivate()->activeSelectionModes(); + GeomShapePtr aResShape = theResult->shape(); + TopoDS_Shape aShape = aResShape->impl(); + QList aResult; + foreach(int aShapeType, aModes) { + if (aShapeType < TopAbs_SHAPE) { + TopExp_Explorer aExp(aShape, (TopAbs_ShapeEnum)aShapeType); + for (; aExp.More(); aExp.Next()) { + aResult.append(aExp.Current()); + } + } + } + return aResult; +} \ No newline at end of file