X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ResultPrs.cpp;h=3b32e56eef836e75c07ed6542088306ae578a01b;hb=8c68ad2a530b1656e2ffa26ebdbc22f20482f361;hp=2f85e9a992f03f38b128adedf969a5700818f3b9;hpb=5352bbb1915f98d1f02b1cb953a2de19b286a28c;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_ResultPrs.cpp b/src/ModuleBase/ModuleBase_ResultPrs.cpp old mode 100644 new mode 100755 index 2f85e9a99..3b32e56ee --- a/src/ModuleBase/ModuleBase_ResultPrs.cpp +++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp @@ -5,21 +5,45 @@ // Author: Vitaly SMETANNIKOV #include "ModuleBase_ResultPrs.h" +#include "ModuleBase_Tools.h" #include #include #include +#include + #include -#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include + + + +IMPLEMENT_STANDARD_HANDLE(ModuleBase_BRepOwner, StdSelect_BRepOwner); +IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_BRepOwner, StdSelect_BRepOwner); + +//******************************************************************************************* + +IMPLEMENT_STANDARD_HANDLE(ModuleBase_ResultPrs, ViewerData_AISShape); +IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, ViewerData_AISShape); + + + -IMPLEMENT_STANDARD_HANDLE(ModuleBase_ResultPrs, AIS_Shape); -IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, AIS_Shape); ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult) - : AIS_Shape(TopoDS_Shape()), myResult(theResult), myIsSketchMode(false) + : ViewerData_AISShape(TopoDS_Shape()), myResult(theResult), myIsSketchMode(false) { std::shared_ptr aShapePtr = ModelAPI_Tools::shape(theResult); std::shared_ptr aWirePtr = @@ -31,7 +55,17 @@ ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult) myIsSketchMode = true; } } - Set(aShapePtr->impl()); + TopoDS_Shape aShape = aShapePtr->impl(); + Set(aShape); + Handle(Prs3d_Drawer) aDrawer = Attributes(); + if (aDrawer->HasOwnPointAspect()) + aDrawer->PointAspect()->SetTypeOfMarker(Aspect_TOM_PLUS); + else + aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_PLUS, Quantity_NOC_YELLOW, 1.)); + + // Activate individual repaintng if this is a part of compsolid + ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(myResult); + SetAutoHilight(aCompSolid.get() == NULL); } @@ -40,8 +74,11 @@ void ModuleBase_ResultPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& t const Standard_Integer theMode) { std::shared_ptr aShapePtr = ModelAPI_Tools::shape(myResult); - if (!aShapePtr) + if (!aShapePtr) { + Events_Error::throwException("An empty AIS presentation: ModuleBase_ResultPrs"); return; + } + if (myIsSketchMode) { myFacesList.clear(); ResultConstructionPtr aConstruction = @@ -56,20 +93,26 @@ void ModuleBase_ResultPrs::Compute(const Handle(PrsMgr_PresentationManager3d)& t myOriginalShape = aShapePtr->impl(); if (!myOriginalShape.IsNull()) { Set(myOriginalShape); + + // change deviation coefficient to provide more precise circle + ModuleBase_Tools::setDefaultDeviationCoefficient(myOriginalShape, Attributes()); AIS_Shape::Compute(thePresentationManager, thePresentation, theMode); } + else + Events_Error::throwException("An empty AIS presentation: ModuleBase_ResultPrs"); } void ModuleBase_ResultPrs::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) { - if (aMode > TopAbs_SHAPE) + if (aMode > 8) // In order to avoid using custom selection modes return; + if (myIsSketchMode) { - if (aMode == TopAbs_FACE) { + if (aMode == AIS_Shape::SelectionMode(TopAbs_FACE)) { BRep_Builder aBuilder; TopoDS_Compound aComp; aBuilder.MakeCompound(aComp); @@ -80,9 +123,114 @@ void ModuleBase_ResultPrs::ComputeSelection(const Handle(SelectMgr_Selection)& a aBuilder.Add(aComp, aFace); } Set(aComp); - } else { + } else Set(myOriginalShape); + } + if (aMode == AIS_Shape::SelectionMode(TopAbs_COMPSOLID)) { + // Limit selection area only by actual object (Shape) + ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(myResult); + if (aCompSolid.get()) { + std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aCompSolid); + if (aShapePtr.get()) { + TopoDS_Shape aShape = aShapePtr->impl(); + int aPriority = StdSelect_BRepSelectionTool::GetStandardPriority(aShape, TopAbs_SHAPE); + double aDeflection = Prs3d::GetDeflection(aShape, myDrawer); + + Handle(ModuleBase_BRepOwner) aOwner = new ModuleBase_BRepOwner(aShape, aPriority); + StdSelect_BRepSelectionTool::ComputeSensitive(aShape, aOwner, aSelection, + aDeflection, myDrawer->HLRAngle(), 9, 500); + + for (aSelection->Init(); aSelection->More(); aSelection->Next()) { + Handle(SelectMgr_EntityOwner) anOwner = + Handle(SelectMgr_EntityOwner)::DownCast(aSelection->Sensitive()->BaseSensitive()->OwnerId()); + anOwner->Set(this); + } + return; + } } - } + //AIS_Shape::ComputeSelection(aSelection, 0); + } AIS_Shape::ComputeSelection(aSelection, aMode); -} \ No newline at end of file +} + + +bool ModuleBase_ResultPrs::hasCompSolidSelectionMode() const +{ + if (!HasInteractiveContext()) + return false; + + Handle(AIS_InteractiveContext) aContext = GetContext(); + TColStd_ListOfInteger aModes; + aContext->ActivatedModes(this, aModes); + + TColStd_ListIteratorOfListOfInteger aIt(aModes); + for (; aIt.More(); aIt.Next()) { + if (aIt.Value() == AIS_Shape::SelectionMode(TopAbs_COMPSOLID)) + return true; + } + return false; +} + + +TopoDS_Shape ModuleBase_ResultPrs::getSelectionShape() const +{ + if (hasCompSolidSelectionMode()) { + // In case of CompSolid mode use shape from Parent for highlighting + ResultCompSolidPtr aCompSolid = ModelAPI_Tools::compSolidOwner(myResult); + if (aCompSolid.get()) { + std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aCompSolid); + if (aShapePtr.get()) + return aShapePtr->impl(); + } + } + return myOriginalShape; +} + + +void ModuleBase_ResultPrs::HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM, + const SelectMgr_SequenceOfOwner& theOwners) +{ + Handle(SelectMgr_EntityOwner) anOwner; + Handle(ModuleBase_BRepOwner) aCompOwner; + for (int i = 1; i <= theOwners.Length(); i++) { + anOwner = theOwners.Value(i); + aCompOwner = Handle(ModuleBase_BRepOwner)::DownCast(anOwner); + if (aCompOwner.IsNull()) + anOwner->Hilight(thePM); + else { + TopoDS_Shape aShape = aCompOwner->Shape(); + Handle( Prs3d_Presentation ) aSelectionPrs = GetSelectPresentation( thePM ); + aSelectionPrs->Clear(); + + StdPrs_WFDeflectionShape::Add(aSelectionPrs, aShape, myDrawer); + + aSelectionPrs->SetDisplayPriority(9); + aSelectionPrs->Highlight(Aspect_TOHM_COLOR, aSelectionPrs->HighlightColor()); + aSelectionPrs->Display(); + thePM->Highlight(this); + } + } +} + +void ModuleBase_ResultPrs::HilightOwnerWithColor(const Handle(PrsMgr_PresentationManager3d)& thePM, + const Quantity_NameOfColor theColor, + const Handle(SelectMgr_EntityOwner)& theOwner) +{ + Handle(StdSelect_BRepOwner) aOwner = Handle(StdSelect_BRepOwner)::DownCast(theOwner); + if (aOwner.IsNull()) + return; + + TopoDS_Shape aShape = aOwner->Shape(); + if (!aShape.IsNull()) { + thePM->Color(this, theColor); + + Handle( Prs3d_Presentation ) aHilightPrs = GetHilightPresentation( thePM ); + aHilightPrs->Clear(); + + StdPrs_WFDeflectionShape::Add(aHilightPrs, aShape, myDrawer); + aHilightPrs->Highlight(Aspect_TOHM_COLOR, theColor); + + if (thePM->IsImmediateModeOn()) + thePM->AddToImmediateList(aHilightPrs); + } +}