X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.cpp;h=d6029af489621f5d48a1b0785dd47bce43dd7db6;hb=302437da7f4443349276e835e87452c29dd7c07a;hp=09d58072ee0f0d77ff73e322a0aa6762e5140234;hpb=b8ee56da654b147ed1a537c744c35e9c60562936;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp index 09d58072e..d6029af48 100644 --- a/src/SketcherPrs/SketcherPrs_Coincident.cpp +++ b/src/SketcherPrs/SketcherPrs_Coincident.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Coincident.cpp -// Created: 12 February 2015 -// 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 "SketcherPrs_Coincident.h" #include "SketcherPrs_Tools.h" @@ -18,9 +31,8 @@ #include #include -#include - #include +#include #include #include @@ -31,13 +43,12 @@ #include -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Coincident, AIS_InteractiveObject); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Coincident, AIS_InteractiveObject); -SketcherPrs_Coincident::SketcherPrs_Coincident(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane) -: AIS_InteractiveObject(), myConstraint(theConstraint), mySketcherPlane(thePlane), - myPoint(gp_Pnt(0.0, 0.0, 0.0)) +SketcherPrs_Coincident::SketcherPrs_Coincident(ModelAPI_Feature* theConstraint, + SketchPlugin_Sketch* theSketch) +: AIS_InteractiveObject(), myConstraint(theConstraint), mySketch(theSketch), + myPoint(gp_Pnt(0.0, 0.0, 0.0)), myIsCustomColor(false) { } @@ -48,46 +59,96 @@ bool SketcherPrs_Coincident::IsReadyToDisplay(ModelAPI_Feature* theConstraint, return readyToDisplay(theConstraint, thePlane, aPoint); } +std::shared_ptr getCoincidencePoint(ModelAPI_Feature* theConstraint) +{ + std::shared_ptr aPnt = SketcherPrs_Tools::getPoint(theConstraint, + SketchPlugin_Constraint::ENTITY_A()); + if (aPnt.get() == NULL) + aPnt = SketcherPrs_Tools::getPoint(theConstraint, SketchPlugin_Constraint::ENTITY_B()); + + return aPnt; +} + + bool SketcherPrs_Coincident::readyToDisplay(ModelAPI_Feature* theConstraint, const std::shared_ptr& thePlane, gp_Pnt& thePoint) { bool aReadyToDisplay = false; // Get point of the presentation - std::shared_ptr aPnt = SketcherPrs_Tools::getPoint(theConstraint, - SketchPlugin_Constraint::ENTITY_A()); - if (aPnt.get()) { - aPnt = SketcherPrs_Tools::getPoint(theConstraint, SketchPlugin_Constraint::ENTITY_B()); - aReadyToDisplay = aPnt.get() != NULL; - if (aReadyToDisplay) { - std::shared_ptr aPoint = thePlane->to3D(aPnt->x(), aPnt->y()); - thePoint = aPoint->impl(); - } + std::shared_ptr aPnt = getCoincidencePoint(theConstraint); + aReadyToDisplay = aPnt.get() != NULL; + if (aReadyToDisplay) { + std::shared_ptr aPoint = thePlane->to3D(aPnt->x(), aPnt->y()); + thePoint = aPoint->impl(); } return aReadyToDisplay; } -void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +bool hasEdge(ModelAPI_Feature* theConstraint) +{ + ObjectPtr aObjA = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); + ObjectPtr aObjB = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_B()); + ResultPtr aResA = std::dynamic_pointer_cast(aObjA); + ResultPtr aResB = std::dynamic_pointer_cast(aObjB); + if (aResA.get()) { + GeomAPI_Shape::ShapeType aTypeA = aResA->shape()->shapeType(); + if (aTypeA == GeomAPI_Shape::EDGE) + return true; + } + if (aResB.get()) { + GeomAPI_Shape::ShapeType aTypeB = aResB->shape()->shapeType(); + if (aTypeB == GeomAPI_Shape::EDGE) + return true; + } + return false; +} + + +void SketcherPrs_Coincident::Compute( + const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode) { gp_Pnt aPoint; - bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aPoint); + bool aReadyToDisplay = readyToDisplay(myConstraint, mySketch->coordinatePlane(), aPoint); if (aReadyToDisplay) myPoint = aPoint; - // Get point of the presentation - static Handle(Graphic3d_AspectMarker3d) aPtA; - if (aPtA.IsNull()) { - aPtA = new Graphic3d_AspectMarker3d (); + bool aIsEdge = hasEdge(myConstraint); + if (!aIsEdge) { + std::shared_ptr aPnt = getCoincidencePoint(myConstraint); + std::shared_ptr aP; + FeaturePtr aSub; + int aNumberOfSubs = mySketch->numberOfSubs(); + for (int i = 0; i < aNumberOfSubs; i++) { + aSub = mySketch->subFeature(i); + if (aSub->getKind() == SketchPlugin_ConstraintCoincidence::ID() && + aSub.get() != myConstraint) { + aP = getCoincidencePoint(aSub.get()); + if (aP && aP->isEqual(aPnt)) { + aIsEdge = hasEdge(aSub.get()); + if (aIsEdge) + break; + } + } + } } - // Create the presentation as a combination of standard point markers + Quantity_Color aExternalColor = aIsEdge ? Quantity_NOC_BLACK : Quantity_NOC_YELLOW; + Quantity_Color aInternalColor = aIsEdge ? Quantity_NOC_YELLOW : Quantity_NOC_BLACK; + + int aRatio = SketcherPrs_Tools::pixelRatio(); + // Create the presentation as a combination of standard point markers + bool aCustomColor = myIsCustomColor; // The external yellow contour + Handle(Graphic3d_AspectMarker3d) aPtA = new Graphic3d_AspectMarker3d(); aPtA->SetType(Aspect_TOM_RING3); - aPtA->SetScale(2.); - aPtA->SetColor(Quantity_NOC_YELLOW); + aPtA->SetScale(2. * aRatio); + aPtA->SetColor(!aCustomColor ? aExternalColor : myCustomColor); Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePresentation); aGroup->SetPrimitivesAspect(aPtA); @@ -96,15 +157,18 @@ void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)& aGroup->AddPrimitiveArray (aPntArray); // Make a black mid ring - aPtA->SetType(Aspect_TOM_RING1); - aPtA->SetScale(1.); - aPtA->SetColor(Quantity_NOC_BLACK); + aPtA = new Graphic3d_AspectMarker3d(); + aPtA->SetType(aIsEdge ? Aspect_TOM_STAR : Aspect_TOM_RING1); + aPtA->SetScale(1. * aRatio); + aPtA->SetColor(!aCustomColor ? aInternalColor : myCustomColor); aGroup->SetPrimitivesAspect(aPtA); aGroup->AddPrimitiveArray (aPntArray); // Make an internal ring + aPtA = new Graphic3d_AspectMarker3d(); aPtA->SetType(Aspect_TOM_POINT); - aPtA->SetScale(5.); + aPtA->SetScale(5. * aRatio); + aPtA->SetColor(!aCustomColor ? aInternalColor : myCustomColor); aGroup->SetPrimitivesAspect(aPtA); aGroup->AddPrimitiveArray (aPntArray); @@ -128,5 +192,14 @@ void SketcherPrs_Coincident::SetColor(const Quantity_NameOfColor aCol) void SketcherPrs_Coincident::SetColor(const Quantity_Color &aCol) { hasOwnColor=Standard_True; - myOwnColor=aCol; +} + +void SketcherPrs_Coincident::SetCustomColor(const std::vector& theColor) +{ + myIsCustomColor = !theColor.empty(); + if (myIsCustomColor) + myCustomColor = Quantity_Color(theColor[0] / 255., theColor[1] / 255., + theColor[2] / 255., Quantity_TOC_RGB); + else + myCustomColor = Quantity_Color(); }