X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Selection.cpp;h=60fe5e30f296d254f0d42ec2b75136524b02b07e;hb=f421ab3932a5e09ae8082215c3eaaa8cc4944e02;hp=f1d2a09b7c58a738a7b8be2f6c77214469719787;hpb=3b85a6447fe7ec25c2079ffe3466d7266d1361fd;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp index f1d2a09b7..60fe5e30f 100644 --- a/src/XGUI/XGUI_Selection.cpp +++ b/src/XGUI/XGUI_Selection.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: XGUI_Selection.cpp -// Created: 8 July 2014 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2019 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_Selection.h" #include "XGUI_Workshop.h" @@ -10,17 +23,27 @@ #include "XGUI_ViewerProxy.h" #include "XGUI_ObjectsBrowser.h" +#ifndef HAVE_SALOME +#include +#endif + +#include "ModuleBase_BRepOwner.h" #include "ModuleBase_ResultPrs.h" -#include +#include "ModuleBase_ViewerPrs.h" #include #include #include +#include #include #include +#ifdef BEFORE_TRIHEDRON_PATCH #include #include +#else +#include +#endif #include #include #include @@ -43,6 +66,7 @@ XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop) QList XGUI_Selection::getSelected(const SelectionPlace& thePlace) const { QList aPresentations; + QList aToRemove; switch (thePlace) { case Browser: @@ -52,8 +76,62 @@ QList XGUI_Selection::getSelected(const SelectionPlace& getSelectedInViewer(aPresentations); break; case AllControls: - getSelectedInViewer(aPresentations); - getSelectedInBrowser(aPresentations); + // Get selection from object browser + getSelectedInBrowser(aPresentations); + + // Filter out all objects except feature if there is no selected results in object browser + // Filter out all features if in object browser there are selected features and their results + bool aHasFeature = false; + bool aHasResult = false; + foreach(ModuleBase_ViewerPrsPtr aVal, aPresentations) { + if (aVal->object().get()) { + FeaturePtr aFeature = std::dynamic_pointer_cast(aVal->object()); + if (aFeature.get()) { + aHasFeature = true; + std::list aResList = aFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) { + foreach(ModuleBase_ViewerPrsPtr aSel, aPresentations) { + if (aSel->object() == (*aIt)) { + aHasResult = true; + break; + } + } + if (aHasResult) + break; + } + } + } + if (aHasFeature && aHasResult) + break; + } + //Get selection from a viewer + getSelectedInViewer(aPresentations); + + // Filter out extra objects + if (aHasFeature && aHasResult) { + foreach(ModuleBase_ViewerPrsPtr aVal, aPresentations) { + if (aVal->object().get()) { + FeaturePtr aFeature = std::dynamic_pointer_cast(aVal->object()); + if (aFeature.get()) { + aToRemove.append(aVal); + } + } + } + } + else if (aHasFeature && (!aHasResult)) { + foreach(ModuleBase_ViewerPrsPtr aVal, aPresentations) { + if (aVal->object().get()) { + FeaturePtr aFeature = std::dynamic_pointer_cast(aVal->object()); + if (!aFeature.get()) { + aToRemove.append(aVal); + } + } + } + } + foreach(ModuleBase_ViewerPrsPtr aVal, aToRemove) { + aPresentations.removeAll(aVal); + } break; } return aPresentations; @@ -81,14 +159,14 @@ void XGUI_Selection::getSelectedInViewer(QList& thePres { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); if (!aContext.IsNull()) { - QList aSelectedIds; // Remember of selected address in order to avoid duplicates + QList aSelectedIds; // Remember of selected address in order to avoid duplicates for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs()); Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); - if (aSelectedIds.contains((long)anOwner.get())) + if (aSelectedIds.contains((size_t)anOwner.get())) continue; - aSelectedIds.append((long)anOwner.get()); + aSelectedIds.append((size_t)anOwner.get()); fillPresentation(aPrs, anOwner); @@ -122,22 +200,38 @@ void XGUI_Selection::getSelectedInBrowser(QList& thePre void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, const Handle(SelectMgr_EntityOwner)& theOwner) const { - thePrs->setOwner(theOwner); - Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast(theOwner->Selectable()); +#ifndef HAVE_SALOME + Handle(AppElements_ViewCube) aCube = Handle(AppElements_ViewCube)::DownCast(anIO); + if (!aCube.IsNull()) + return; +#endif + + thePrs->setOwner(theOwner); thePrs->setInteractive(anIO); // we should not check the appearance of this feature because there can be some selected shapes // for one feature Handle(StdSelect_BRepOwner) aBRO = Handle(StdSelect_BRepOwner)::DownCast(theOwner); if( !aBRO.IsNull() && aBRO->HasShape() ) { + TopoDS_Shape aShape = aBRO->Shape(); + Handle(ModuleBase_ResultPrs) aPrsObj = + Handle(ModuleBase_ResultPrs)::DownCast(aBRO->Selectable()); + if (!aPrsObj.IsNull()) { + if (aPrsObj->isSubstituted()) { + if (aPrsObj->Shape().IsSame(aShape)) + aShape = aPrsObj->originalShape(); + } + } // the located method is called in the context to obtain the shape by the SelectedShape() // method, so the shape is located by the same rules - TopoDS_Shape aShape = aBRO->Shape().Located (aBRO->Location() * aBRO->Shape().Location()); + aShape = aShape.Located(aBRO->Location() * aShape.Location()); +#ifdef BEFORE_TRIHEDRON_PATCH #ifndef DEBUG_DELIVERY if (aShape.IsNull()) aShape = findAxisShape(anIO); +#endif #endif if (!aShape.IsNull()) { std::shared_ptr aGeomShape = @@ -148,6 +242,7 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, } else { #ifdef DEBUG_DELIVERY // Fill by trihedron shapes +#ifdef BEFORE_TRIHEDRON_PATCH Handle(AIS_Axis) aAxis = Handle(AIS_Axis)::DownCast(anIO); DocumentPtr aDoc = ModelAPI_Session::get()->moduleDocument(); int aSize = aDoc->size(ModelAPI_ResultConstruction::group()); @@ -197,6 +292,39 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, } } } +#else + /// find axis direction + Handle(AIS_TrihedronOwner) aTrihedronOwner = Handle(AIS_TrihedronOwner)::DownCast(theOwner); + if (!aTrihedronOwner.IsNull()) { + const Prs3d_DatumParts& aPart = aTrihedronOwner->DatumPart(); + std::string aName; + switch (aPart) { + case Prs3d_DP_Origin: aName = "Origin"; break; + case Prs3d_DP_XAxis: aName = "OX"; break; + case Prs3d_DP_YAxis: aName = "OY"; break; + case Prs3d_DP_ZAxis: aName = "OZ"; break; + default: break; + } + if (aName.length() > 0) { + DocumentPtr aDoc = ModelAPI_Session::get()->moduleDocument(); + int aSize = aDoc->size(ModelAPI_ResultConstruction::group()); + ObjectPtr aObj; + ResultPtr aResult; + for (int i = 0; i < aSize; i++) { + aObj = aDoc->object(ModelAPI_ResultConstruction::group(), i); + if (aObj->data()->name() == aName) { + aResult = std::dynamic_pointer_cast(aObj); + break; + } + } + if (aResult.get()) { + thePrs->setObject(aResult); + thePrs->setShape(aResult->shape()); + return; + } + } + } +#endif #endif } @@ -209,7 +337,7 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, // is On and we have to use parent result which corresponds to the CompSolid shape ResultPtr aResult = std::dynamic_pointer_cast(aFeature); if (aResult.get()) { - ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(aResult); + ResultBodyPtr aCompSolid = ModelAPI_Tools::bodyOwner(aResult); if (aCompSolid.get()) { GeomShapePtr aShape = aCompSolid->shape(); if (aShape.get() && aShape->isEqual(thePrs->shape())) { @@ -229,49 +357,28 @@ QList XGUI_Selection::getHighlighted() const if (aContext.IsNull()) return aPresentations; - QList aSelectedIds; // Remember of selected address in order to avoid duplicates + QList aSelectedIds; // Remember of selected address in order to avoid duplicates XGUI_Displayer* aDisplayer = myWorkshop->displayer(); for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) { Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner(); if (!anOwner.IsNull()) { - if (aSelectedIds.contains((long)anOwner.get())) + if (aSelectedIds.contains((size_t)anOwner.get())) continue; - aSelectedIds.append((long)anOwner.get()); + aSelectedIds.append((size_t)anOwner.get()); ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs()); fillPresentation(aPrs, anOwner); aPresentations.push_back(aPrs); } - else { // TODO: check why the entity owner is null here, case is selection point on a line - Handle(AIS_InteractiveObject) anIO = aContext->DetectedInteractive(); - ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs()); - aPrs->setInteractive(anIO); - - ObjectPtr aResult = aDisplayer->getObject(anIO); - // we should not check the appearance of this feature because there can be some selected - // shapes for one feature - aPrs->setObject(aResult); - TopoDS_Shape aShape = aContext->DetectedShape(); - if (!aShape.IsNull()) { - std::shared_ptr aGeomShape = - std::shared_ptr(new GeomAPI_Shape()); - aGeomShape->setImpl(new TopoDS_Shape(aShape)); - aPrs->setShape(aGeomShape); - } - aPresentations.push_back(aPrs); - } } return aPresentations; } QObjectPtrList XGUI_Selection::selectedObjects() const { - return myWorkshop->objectBrowser()->selectedObjects(); -} - -void XGUI_Selection::setSelectedObjects( const QObjectPtrList& theObjects ) const -{ - return myWorkshop->objectBrowser()->setObjectsSelected( theObjects ); + if (myWorkshop->objectBrowser()) + return myWorkshop->objectBrowser()->selectedObjects(); + return QObjectPtrList(); } QObjectPtrList XGUI_Selection::selectedPresentations() const @@ -296,18 +403,6 @@ QModelIndexList XGUI_Selection::selectedIndexes() const return myWorkshop->objectBrowser()->selectedIndexes(); } -//************************************************************** -void XGUI_Selection::selectedAISObjects(AIS_ListOfInteractive& theList) const -{ - theList.Clear(); - - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (!aContext.IsNull()) { - for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) - theList.Append(aContext->SelectedInteractive()); - } -} - //************************************************************** ObjectPtr XGUI_Selection::getSelectableObject(const Handle(SelectMgr_EntityOwner)& theOwner) const { @@ -351,11 +446,14 @@ void XGUI_Selection::entityOwners(const Handle(AIS_InteractiveObject)& theObject continue; Handle(SelectMgr_Selection) aSelection = theObject->Selection(aMode); - for (aSelection->Init(); aSelection->More(); aSelection->Next()) { - Handle(SelectMgr_SensitiveEntity) anEntity = aSelection->Sensitive(); + NCollection_Vector anEntities = aSelection->Entities(); + for (NCollection_Vector::Iterator anIt(anEntities); + anIt.More(); + anIt.Next()) { + Handle(SelectMgr_SensitiveEntity) anEntity = anIt.Value(); if (anEntity.IsNull()) continue; - Handle(SelectMgr_EntityOwner) anOwner = + Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast(anEntity->BaseSensitive()->OwnerId()); if (!anOwner.IsNull()) theOwners.Add(anOwner); @@ -364,6 +462,7 @@ void XGUI_Selection::entityOwners(const Handle(AIS_InteractiveObject)& theObject } //************************************************************** +#ifdef BEFORE_TRIHEDRON_PATCH TopoDS_Shape XGUI_Selection::findAxisShape(Handle(AIS_InteractiveObject) theIO) const { TopoDS_Shape aShape; @@ -394,3 +493,4 @@ TopoDS_Shape XGUI_Selection::findAxisShape(Handle(AIS_InteractiveObject) theIO) } return aShape; } +#endif