X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_SelectionMgr.cpp;h=eebb23d221e1983816e69be758bfcede126ac176;hb=4c763543675ec80cad142d3a2f8b4766ca64ac0f;hp=770cc593566992380acec624b8119dec3612a43e;hpb=0e05260101533fc2566ce52ae228f7dfcbfe5f50;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 770cc5935..eebb23d22 --- 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,54 +75,58 @@ 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; + 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))); + } + } + } + } + } + } XGUI_Displayer* aDisplayer = myWorkshop->displayer(); aDisplayer->setSelected(aSelectedPrs); emit selectionChanged(); @@ -104,22 +135,32 @@ 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()); - } - } + 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::updateSelectionBy(const ModuleBase_ISelection::SelectionPlace& thePlace) +{ + QList aSelectedPrs = + myWorkshop->selector()->selection()->getSelected(thePlace); + if (thePlace == ModuleBase_ISelection::Browser) { + XGUI_Displayer* aDisplayer = myWorkshop->displayer(); + aDisplayer->setSelected(aSelectedPrs); + } + +} //************************************************************** void XGUI_SelectionMgr::clearSelection() { @@ -127,8 +168,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(); @@ -136,3 +177,46 @@ 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); + } + } + } + } +}