X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.cpp;h=8b533fdba3e19c95d8d53d6d34f23a697806c2f1;hb=8ebc9a7d5f87057b61b174e7568e01e44571549d;hp=b85d018b361da4502cfa8bbbc51b465261de0799;hpb=150ef68b3ea2df3c2130a4f5ea8128ddb5c76048;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp index b85d018b3..8b533fdba 100644 --- a/src/SketcherPrs/SketcherPrs_Coincident.cpp +++ b/src/SketcherPrs/SketcherPrs_Coincident.cpp @@ -18,7 +18,6 @@ #include -#include #include #include #include @@ -46,6 +45,8 @@ void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)& { std::shared_ptr aPnt = SketcherPrs_Tools::getPoint(myConstraint, SketchPlugin_Constraint::ENTITY_A()); + if (aPnt.get() == NULL) + aPnt = SketcherPrs_Tools::getPoint(myConstraint, SketchPlugin_Constraint::ENTITY_B()); if (aPnt.get() == NULL) return; @@ -55,15 +56,27 @@ void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)& static Handle(Graphic3d_AspectMarker3d) aPtA; if (aPtA.IsNull()) { aPtA = new Graphic3d_AspectMarker3d (); - aPtA->SetType(Aspect_TOM_RING1); - aPtA->SetScale(2.); - aPtA->SetColor(myOwnColor); } + aPtA->SetType(Aspect_TOM_RING3); + aPtA->SetScale(2.); + aPtA->SetColor(Quantity_NOC_YELLOW); + Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation); aGroup->SetPrimitivesAspect(aPtA); Handle(Graphic3d_ArrayOfPoints) aPntArray = new Graphic3d_ArrayOfPoints(1); aPntArray->AddVertex (aPoint->x(), aPoint->y(), aPoint->z()); aGroup->AddPrimitiveArray (aPntArray); + + aPtA->SetType(Aspect_TOM_RING1); + aPtA->SetScale(1.); + aPtA->SetColor(Quantity_NOC_BLACK); + aGroup->SetPrimitivesAspect(aPtA); + aGroup->AddPrimitiveArray (aPntArray); + + aPtA->SetType(Aspect_TOM_POINT); + aPtA->SetScale(5.); + aGroup->SetPrimitivesAspect(aPtA); + aGroup->AddPrimitiveArray (aPntArray); }