X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Selection.cpp;h=9e29e8b1b08bf729dd70ae701143b374d9bef318;hb=0dbe381518ba8993c2c4fa0fcb3ddd8fe5b8479b;hp=07fcafc613a47684e1ae3d049b507a1f81ebe0fc;hpb=9ddad7aadf48e6754d8ddeea4eaf0c37c66a9b8f;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp index 07fcafc61..9e29e8b1b 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,15 +23,23 @@ #include "XGUI_ViewerProxy.h" #include "XGUI_ObjectsBrowser.h" +#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 @@ -41,6 +62,7 @@ XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop) QList XGUI_Selection::getSelected(const SelectionPlace& thePlace) const { QList aPresentations; + QList aToRemove; switch (thePlace) { case Browser: @@ -50,8 +72,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; @@ -78,15 +154,15 @@ Handle(AIS_InteractiveObject) XGUI_Selection::getIO(const ModuleBase_ViewerPrsPt void XGUI_Selection::getSelectedInViewer(QList& thePresentations) const { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (!aContext.IsNull() && aContext->HasOpenedContext()) { - QList aSelectedIds; // Remember of selected address in order to avoid duplicates + if (!aContext.IsNull()) { + 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.Access())) + if (aSelectedIds.contains((size_t)anOwner.get())) continue; - aSelectedIds.append((long)anOwner.Access()); + aSelectedIds.append((size_t)anOwner.get()); fillPresentation(aPrs, anOwner); @@ -121,8 +197,7 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, const Handle(SelectMgr_EntityOwner)& theOwner) const { thePrs->setOwner(theOwner); - - Handle(AIS_InteractiveObject) anIO = + Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast(theOwner->Selectable()); thePrs->setInteractive(anIO); @@ -130,54 +205,110 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, // for one feature Handle(StdSelect_BRepOwner) aBRO = Handle(StdSelect_BRepOwner)::DownCast(theOwner); if( !aBRO.IsNull() && aBRO->HasShape() ) { - // 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 + // 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()); +#ifdef BEFORE_TRIHEDRON_PATCH #ifndef DEBUG_DELIVERY if (aShape.IsNull()) aShape = findAxisShape(anIO); +#endif #endif if (!aShape.IsNull()) { - std::shared_ptr aGeomShape = std::shared_ptr(new GeomAPI_Shape()); + std::shared_ptr aGeomShape = + std::shared_ptr(new GeomAPI_Shape()); aGeomShape->setImpl(new TopoDS_Shape(aShape)); thePrs->setShape(aGeomShape); } } 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()); + ObjectPtr aObj; if (!aAxis.IsNull()) { // an Axis from Trihedron - Handle(Geom_Line) aLine = aAxis->Component(); - Handle(Prs3d_DatumAspect) DA = aAxis->Attributes()->DatumAspect(); - Handle(Geom_TrimmedCurve) aTLine = new Geom_TrimmedCurve(aLine, 0, DA->FirstAxisLength()); - - BRep_Builder aBuilder; - TopoDS_Edge aEdge; - aBuilder.MakeEdge(aEdge, aTLine, Precision::Confusion()); - if (!aEdge.IsNull()) { - std::shared_ptr aGeomShape = std::shared_ptr(new GeomAPI_Shape()); - aGeomShape->setImpl(new TopoDS_Shape(aEdge)); - thePrs->setShape(aGeomShape); + gp_Lin aLine = aAxis->Component()->Lin(); + gp_Dir aDir = aLine.Direction(); + std::string aAxName; + if (aDir.X() == 1.) + aAxName = "OX"; + else if (aDir.Y() == 1.) + aAxName = "OY"; + else if (aDir.Z() == 1.) + aAxName = "OZ"; + if (aAxName.length() > 0) { + ResultPtr aAx; + for (int i = 0; i < aSize; i++) { + aObj = aDoc->object(ModelAPI_ResultConstruction::group(), i); + if (aObj->data()->name() == aAxName) { + aAx = std::dynamic_pointer_cast(aObj); + break; + } + } + if (aAx.get()) { + thePrs->setObject(aAx); + thePrs->setShape(aAx->shape()); + return; + } } } else { Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast(anIO); if (!aPoint.IsNull()) { - // A point from trihedron - Handle(Geom_Point) aPnt = aPoint->Component(); - BRep_Builder aBuilder; - TopoDS_Vertex aVertex; - aBuilder.MakeVertex(aVertex, aPnt->Pnt(), Precision::Confusion()); - if (!aVertex.IsNull()) { - std::shared_ptr aGeomShape = std::shared_ptr(new GeomAPI_Shape()); - aGeomShape->setImpl(new TopoDS_Shape(aVertex)); - thePrs->setShape(aGeomShape); + // An origin point from trihedron + ResultPtr aOrigin; + for (int i = 0; i < aSize; i++) { + aObj = aDoc->object(ModelAPI_ResultConstruction::group(), i); + if (aObj->data()->name() == "Origin") { + aOrigin = std::dynamic_pointer_cast(aObj); + break; + } + } + if (aOrigin.get()) { + thePrs->setObject(aOrigin); + thePrs->setShape(aOrigin->shape()); + return; + } + } + } +#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 } - + XGUI_Displayer* aDisplayer = myWorkshop->displayer(); ObjectPtr aFeature = aDisplayer->getObject(anIO); @@ -187,7 +318,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())) { @@ -207,42 +338,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()) { - ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs()); - Handle(AIS_InteractiveObject) anIO = aContext->DetectedInteractive(); - if (aSelectedIds.contains((long)anIO.Access())) - continue; - - aSelectedIds.append((long)anIO.Access()); - 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); - if (aContext->HasOpenedContext()) { - 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); - } + Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner(); + if (!anOwner.IsNull()) { + if (aSelectedIds.contains((size_t)anOwner.get())) + continue; + aSelectedIds.append((size_t)anOwner.get()); + + ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs()); + fillPresentation(aPrs, anOwner); + aPresentations.push_back(aPrs); } - 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 @@ -267,18 +384,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 { @@ -286,40 +391,13 @@ ObjectPtr XGUI_Selection::getSelectableObject(const Handle(SelectMgr_EntityOwner Handle(SelectMgr_EntityOwner) aEO = theOwner; if (!aEO.IsNull()) { - Handle(AIS_InteractiveObject) anObj = + Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast(aEO->Selectable()); anObject = myWorkshop->displayer()->getObject(anObj); } return anObject; } -//************************************************************** -void XGUI_Selection::selectedShapes(NCollection_List& theList, - std::list& theOwners) const -{ - theList.Clear(); - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (aContext.IsNull()) - return; - - for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { - TopoDS_Shape aShape = aContext->SelectedShape(); - if (aShape.IsNull()) { - aShape = findAxisShape(aContext->SelectedInteractive()); - } - if (!aShape.IsNull()) { - theList.Append(aShape); - Handle(SelectMgr_EntityOwner) aEO = aContext->SelectedOwner(); - if (!aEO.IsNull()) { - Handle(AIS_InteractiveObject) anObj = - Handle(AIS_InteractiveObject)::DownCast(aEO->Selectable()); - ObjectPtr anObject = myWorkshop->displayer()->getObject(anObj); - theOwners.push_back(anObject); - } - } - } -} - //************************************************************** void XGUI_Selection::selectedOwners(SelectMgr_IndexedMapOfOwner& theSelectedOwners) const { @@ -349,11 +427,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); @@ -362,6 +443,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; @@ -373,7 +455,7 @@ TopoDS_Shape XGUI_Selection::findAxisShape(Handle(AIS_InteractiveObject) theIO) Handle(Prs3d_DatumAspect) DA = aAxis->Attributes()->DatumAspect(); Handle(Geom_TrimmedCurve) aTLine = new Geom_TrimmedCurve(aLine, 0, DA->FirstAxisLength()); - BRep_Builder aBuilder; + BRep_Builder aBuilder; TopoDS_Edge aEdge; aBuilder.MakeEdge(aEdge, aTLine, Precision::Confusion()); if (!aEdge.IsNull()) @@ -392,3 +474,4 @@ TopoDS_Shape XGUI_Selection::findAxisShape(Handle(AIS_InteractiveObject) theIO) } return aShape; } +#endif