X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Selection.cpp;h=eb59cf8c8274cdcc3cd2044754da17d06412c4a8;hb=f26d7138b86578771c1fc6a0d8d453f6c3044541;hp=a8cd9cc3b35e678388857a52ee9eafbbada053ef;hpb=3a9418e989aabf61341c20e01628e43ca030c491;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Selection.cpp b/src/XGUI/XGUI_Selection.cpp index a8cd9cc3b..eb59cf8c8 100644 --- a/src/XGUI/XGUI_Selection.cpp +++ b/src/XGUI/XGUI_Selection.cpp @@ -10,23 +10,39 @@ #include "XGUI_ViewerProxy.h" #include "XGUI_ObjectsBrowser.h" +#include "ModuleBase_ResultPrs.h" +#include + #include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include +#define DEBUG_DELIVERY + XGUI_Selection::XGUI_Selection(XGUI_Workshop* theWorkshop) : myWorkshop(theWorkshop) { } -QList XGUI_Selection::getSelected(const SelectionPlace& thePlace) const +QList XGUI_Selection::getSelected(const SelectionPlace& thePlace) const { - QList aPresentations; + QList aPresentations; switch (thePlace) { case Browser: @@ -43,17 +59,17 @@ QList XGUI_Selection::getSelected(const SelectionPlace& th return aPresentations; } -Handle(AIS_InteractiveObject) XGUI_Selection::getIO(const ModuleBase_ViewerPrs& thePrs) +Handle(AIS_InteractiveObject) XGUI_Selection::getIO(const ModuleBase_ViewerPrsPtr& thePrs) { - Handle(AIS_InteractiveObject) anIO = thePrs.interactive(); + Handle(AIS_InteractiveObject) anIO = thePrs->interactive(); if (anIO.IsNull()) { - Handle(SelectMgr_EntityOwner) anOwner = thePrs.owner(); + Handle(SelectMgr_EntityOwner) anOwner = thePrs->owner(); if (!anOwner.IsNull()) anIO = Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); - if (anIO.IsNull() && thePrs.object()) { + if (anIO.IsNull() && thePrs->object()) { XGUI_Displayer* aDisplayer = myWorkshop->displayer(); - AISObjectPtr anAISObject = aDisplayer->getAISObject(thePrs.object()); + AISObjectPtr anAISObject = aDisplayer->getAISObject(thePrs->object()); if (anAISObject.get()) anIO = anAISObject->impl(); } @@ -61,16 +77,13 @@ Handle(AIS_InteractiveObject) XGUI_Selection::getIO(const ModuleBase_ViewerPrs& return anIO; } -void XGUI_Selection::getSelectedInViewer(QList& thePresentations) const +void XGUI_Selection::getSelectedInViewer(QList& thePresentations) const { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (aContext.IsNull()) - return; - - if (aContext->HasOpenedContext()) { + if (!aContext.IsNull() && aContext->HasOpenedContext()) { QList aSelectedIds; // Remember of selected address in order to avoid duplicates for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { - ModuleBase_ViewerPrs aPrs; + ModuleBase_ViewerPrsPtr aPrs(new ModuleBase_ViewerPrs()); Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); if (aSelectedIds.contains((long)anOwner.Access())) @@ -85,14 +98,14 @@ void XGUI_Selection::getSelectedInViewer(QList& thePresent } } -void XGUI_Selection::getSelectedInBrowser(QList& thePresentations) const +void XGUI_Selection::getSelectedInBrowser(QList& thePresentations) const { // collect the objects of the parameter presentation to avoid a repeted objects in the result QObjectPtrList aPresentationObjects; - QList::const_iterator aPrsIt = thePresentations.begin(), + QList::const_iterator aPrsIt = thePresentations.begin(), aPrsLast = thePresentations.end(); for (; aPrsIt != aPrsLast; aPrsIt++) { - aPresentationObjects.push_back((*aPrsIt).object()); + aPresentationObjects.push_back((*aPrsIt)->object()); } QObjectPtrList anObjects = selectedObjects(); @@ -100,19 +113,20 @@ void XGUI_Selection::getSelectedInBrowser(QList& thePresen for (; anIt != aLast; anIt++) { ObjectPtr anObject = *anIt; if (anObject.get() != NULL && !aPresentationObjects.contains(anObject)) { - thePresentations.append(ModuleBase_ViewerPrs(anObject, TopoDS_Shape(), NULL)); + thePresentations.append(std::shared_ptr( + new ModuleBase_ViewerPrs(anObject, GeomShapePtr(), NULL))); } } } -void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrs& thePrs, +void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrsPtr& thePrs, const Handle(SelectMgr_EntityOwner)& theOwner) const { - thePrs.setOwner(theOwner); + thePrs->setOwner(theOwner); Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast(theOwner->Selectable()); - thePrs.setInteractive(anIO); + thePrs->setInteractive(anIO); // we should not check the appearance of this feature because there can be some selected shapes // for one feature @@ -121,39 +135,119 @@ void XGUI_Selection::fillPresentation(ModuleBase_ViewerPrs& thePrs, // 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()); - if (!aShape.IsNull()) - thePrs.setShape(aShape); - } +#ifndef DEBUG_DELIVERY + if (aShape.IsNull()) + aShape = findAxisShape(anIO); +#endif + if (!aShape.IsNull()) { + 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 + 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 + 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()); + } + } + } else { + Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast(anIO); + if (!aPoint.IsNull()) { + // 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()); + } + } + } +#endif + } XGUI_Displayer* aDisplayer = myWorkshop->displayer(); ObjectPtr aFeature = aDisplayer->getObject(anIO); - thePrs.setObject(aFeature); + + Handle(ModuleBase_BRepOwner) aCompSolidBRO = Handle(ModuleBase_BRepOwner)::DownCast(theOwner); + if (!aCompSolidBRO.IsNull()) { + // If ModuleBase_BRepOwner object is created then it means that TopAbs_COMPSOLID selection mode + // 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); + if (aCompSolid.get()) { + GeomShapePtr aShape = aCompSolid->shape(); + if (aShape.get() && aShape->isEqual(thePrs->shape())) { + thePrs->setObject(aCompSolid); + return; + } + } + } + } + thePrs->setObject(aFeature); } -QList XGUI_Selection::getHighlighted() const +QList XGUI_Selection::getHighlighted() const { + QList aPresentations; + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + if (aContext.IsNull()) + return aPresentations; + QList aSelectedIds; // Remember of selected address in order to avoid duplicates - QList aPresentations; XGUI_Displayer* aDisplayer = myWorkshop->displayer(); - - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) { - ModuleBase_ViewerPrs aPrs; + 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); + 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); + aPrs->setObject(aResult); if (aContext->HasOpenedContext()) { TopoDS_Shape aShape = aContext->DetectedShape(); - if (!aShape.IsNull()) - aPrs.setShape(aShape); + 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); } @@ -195,10 +289,13 @@ QModelIndexList XGUI_Selection::selectedIndexes() const //************************************************************** void XGUI_Selection::selectedAISObjects(AIS_ListOfInteractive& theList) const { - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); theList.Clear(); - for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) - theList.Append(aContext->SelectedInteractive()); + + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + if (!aContext.IsNull()) { + for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) + theList.Append(aContext->SelectedInteractive()); + } } //************************************************************** @@ -215,34 +312,14 @@ ObjectPtr XGUI_Selection::getSelectableObject(const Handle(SelectMgr_EntityOwner return anObject; } -//************************************************************** -void XGUI_Selection::selectedShapes(NCollection_List& theList, - std::list& theOwners) const -{ - theList.Clear(); - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { - TopoDS_Shape aShape = aContext->SelectedShape(); - 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 { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - - for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { - theSelectedOwners.Add(aContext->SelectedOwner()); + if (!aContext.IsNull()) { + for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { + theSelectedOwners.Add(aContext->SelectedOwner()); + } } } @@ -251,8 +328,7 @@ void XGUI_Selection::entityOwners(const Handle(AIS_InteractiveObject)& theObject SelectMgr_IndexedMapOfOwner& theOwners) const { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - - if (theObject.IsNull() || aContext.IsNull()) + if (aContext.IsNull() || theObject.IsNull()) return; TColStd_ListOfInteger aModes; @@ -276,3 +352,35 @@ void XGUI_Selection::entityOwners(const Handle(AIS_InteractiveObject)& theObject } } } + +//************************************************************** +TopoDS_Shape XGUI_Selection::findAxisShape(Handle(AIS_InteractiveObject) theIO) const +{ + TopoDS_Shape aShape; + // Fill by trihedron shapes + Handle(AIS_Axis) aAxis = Handle(AIS_Axis)::DownCast(theIO); + 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()) + aShape = aEdge; + } else { + Handle(AIS_Point) aPoint = Handle(AIS_Point)::DownCast(theIO); + 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()) + aShape = aVertex; + } + } + return aShape; +}