X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_SelectionMgr.cpp;h=bece087dc5f4266476d175da5814030859875d1f;hb=57af37f78b56b87216f62d45537e0ad3e7197cf3;hp=11e2e76fc4190ce292a8b5ca4fe37a1e49407681;hpb=d7341d62e08a5185a7184de4f4c74c6c4a76ca15;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_SelectionMgr.cpp b/src/XGUI/XGUI_SelectionMgr.cpp old mode 100644 new mode 100755 index 11e2e76fc..bece087dc --- a/src/XGUI/XGUI_SelectionMgr.cpp +++ b/src/XGUI/XGUI_SelectionMgr.cpp @@ -1,4 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> +// 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 "XGUI_SelectionMgr.h" @@ -8,6 +26,7 @@ #include "XGUI_ViewerProxy.h" #include "XGUI_Displayer.h" #include "XGUI_Selection.h" +#include "XGUI_OperationMgr.h" #ifndef HAVE_SALOME #include @@ -19,9 +38,17 @@ #include #include #include +#include + +#include +#include #include +#ifdef TINSPECTOR +#include +#endif + XGUI_SelectionMgr::XGUI_SelectionMgr(XGUI_Workshop* theParent) : QObject(theParent), myWorkshop(theParent) @@ -48,66 +75,54 @@ void XGUI_SelectionMgr::connectViewers() void XGUI_SelectionMgr::setSelectedOwners(const SelectMgr_IndexedMapOfOwner& theSelectedOwners, bool isUpdateViewer) { - SelectMgr_IndexedMapOfOwner aSelectedOwners; - selection()->selectedOwners(aSelectedOwners); - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); if (!aContext.IsNull()) { + /// previous selection should be cleared, else there will be decomposition of selections: + /// as AddOrRemoveSelected inverts current selection + aContext->ClearSelected(false); + for (Standard_Integer i = 1, n = theSelectedOwners.Extent(); i <= n; i++) { Handle(SelectMgr_EntityOwner) anOwner = theSelectedOwners(i); - if (aSelectedOwners.FindIndex(anOwner) > 0) - continue; aContext->AddOrRemoveSelected(anOwner, isUpdateViewer); + #ifdef TINSPECTOR + if (myWorkshop->displayer()->getCallBack()) + myWorkshop->displayer()->getCallBack()->AddOrRemoveSelected(anOwner); + #endif } } } -//************************************************************** -void XGUI_SelectionMgr::updateSelectedOwners(bool isUpdateViewer) -{ - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (aContext.IsNull()) - return; - - const SelectMgr_ListOfFilter& aFilters = aContext->Filters(); - - SelectMgr_IndexedMapOfOwner anOwnersToDeselect; - - SelectMgr_ListIteratorOfListOfFilter anIt(aFilters); - for (; anIt.More(); anIt.Next()) { - Handle(SelectMgr_Filter) aFilter = anIt.Value(); - for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { - Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); - if (!aFilter->IsOk(anOwner)) - anOwnersToDeselect.Add(aContext->SelectedOwner()); - } - } - - setSelectedOwners(anOwnersToDeselect, false); - - if (isUpdateViewer) - aContext->UpdateCurrentViewer(); -} - //************************************************************** void XGUI_SelectionMgr::onObjectBrowserSelection() { - QList aSelectedPrs = + QList aSelectedPrs = myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser); - QList aTmpList = aSelectedPrs; + QList aTmpList = aSelectedPrs; ObjectPtr aObject; FeaturePtr aFeature; - foreach(ModuleBase_ViewerPrs aPrs, aTmpList) { - aObject = aPrs.object(); + 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) { - aSelectedPrs.append(ModuleBase_ViewerPrs((*aIt), GeomShapePtr(), NULL)); + 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))); + } + } } } } @@ -120,38 +135,47 @@ void XGUI_SelectionMgr::onObjectBrowserSelection() //************************************************************** void XGUI_SelectionMgr::onViewerSelection() { - QObjectPtrList aFeatures; + QList aValues; Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (!aContext.IsNull()) { - QList aPresentations = selection()->getSelected(ModuleBase_ISelection::Viewer); - foreach(ModuleBase_ViewerPrs aPrs, aPresentations) { - if (aPrs.object().get()) - aFeatures.append(aPrs.object()); - } - } - // Add features by selected results - QObjectPtrList aTmpList = aFeatures; - ResultPtr aResult; - FeaturePtr aFeature; - foreach(ObjectPtr aObj, aTmpList) { - aResult = std::dynamic_pointer_cast(aObj); - if (aResult.get()) { - aFeature = ModelAPI_Feature::feature(aResult); - if (aFeature.get() && (!aFeatures.contains(aFeature))) - aFeatures.append(aFeature); - } - } + if (!aContext.IsNull()) + aValues = selection()->getSelected(ModuleBase_ISelection::Viewer); + + QObjectPtrList anObjects; + convertToObjectBrowserSelection(aValues, anObjects); + bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true); - myWorkshop->objectBrowser()->setObjectsSelected(aFeatures); + 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 = Handle(SelectMgr_EntityOwner)::DownCast(anOwnersIt.Value()); + if (!anOwner.IsNull()) + aContext->AddOrRemoveSelected(anOwner, false); + } +} + //************************************************************** void XGUI_SelectionMgr::updateSelectionBy(const ModuleBase_ISelection::SelectionPlace& thePlace) { - QList aSelectedPrs = + QList aSelectedPrs = myWorkshop->selector()->selection()->getSelected(thePlace); if (thePlace == ModuleBase_ISelection::Browser) { XGUI_Displayer* aDisplayer = myWorkshop->displayer(); @@ -166,8 +190,8 @@ void XGUI_SelectionMgr::clearSelection() bool aBlocked = myWorkshop->objectBrowser()->blockSignals(true); myWorkshop->objectBrowser()->setObjectsSelected(aFeatures); myWorkshop->objectBrowser()->blockSignals(aBlocked); - - QList aSelectedPrs = + + QList aSelectedPrs = myWorkshop->selector()->selection()->getSelected(ModuleBase_ISelection::Browser); XGUI_Displayer* aDisplayer = myWorkshop->displayer(); @@ -175,3 +199,66 @@ void XGUI_SelectionMgr::clearSelection() emit selectionChanged(); } +//************************************************************** +void XGUI_SelectionMgr::setSelected(const QList& theValues) +{ + // update selection in Viewer + XGUI_Displayer* aDisplayer = myWorkshop->displayer(); + 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, + QObjectPtrList& theObjects) +{ + theObjects.clear(); + + ResultPtr aResult; + FeaturePtr aFeature; + bool aHasOperation = (myWorkshop->operationMgr()->currentOperation() != 0); + SessionPtr aMgr = ModelAPI_Session::get(); + DocumentPtr anActiveDocument = aMgr->activeDocument(); + + foreach(ModuleBase_ViewerPrsPtr aPrs, theValues) { + if (aPrs->object().get()) { + if (!theObjects.contains(aPrs->object())) + theObjects.append(aPrs->object()); + if (aPrs->shape().get() && (!aHasOperation)) { + aResult = std::dynamic_pointer_cast(aPrs->object()); + if (aResult.get()) { + aFeature = anActiveDocument->producedByFeature(aResult, aPrs->shape()); + if (aFeature.get() && (!theObjects.contains(aFeature))) + theObjects.append(aFeature); + } + } + } + } +} + +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; +} \ No newline at end of file