X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.cpp;h=69ece0e8709d00810999da8df422b108f0a4d21d;hb=84f912d8ca079ae8f0a43826983e77acdfb68bf5;hp=86f1a1f3e53fee0ca76d99dfa9c9b1ab4ed8b056;hpb=643eedadb4ba0c91fe67878be0bb94d1bcca922c;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_Coincident.cpp b/src/SketcherPrs/SketcherPrs_Coincident.cpp index 86f1a1f3e..69ece0e87 100644 --- a/src/SketcherPrs/SketcherPrs_Coincident.cpp +++ b/src/SketcherPrs/SketcherPrs_Coincident.cpp @@ -1,13 +1,29 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: SketcherPrs_Coincident.cpp -// Created: 12 February 2015 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 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" #include +#include + #include #include #include @@ -16,11 +32,8 @@ #include #include -#include -#include #include -#include #include #include #include @@ -30,51 +43,92 @@ #include -IMPLEMENT_STANDARD_HANDLE(SketcherPrs_Coincident, AIS_InteractiveObject); IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_Coincident, AIS_InteractiveObject); -SketcherPrs_Coincident::SketcherPrs_Coincident(SketchPlugin_Constraint* theConstraint, - const std::shared_ptr& thePlane) - : AIS_InteractiveObject(), myConstraint(theConstraint), myPlane(thePlane) +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)), myIsCustomColor(false) { - -} - +} +bool SketcherPrs_Coincident::IsReadyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane) +{ + gp_Pnt aPoint; + return readyToDisplay(theConstraint, thePlane, aPoint); +} -void SketcherPrs_Coincident::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode) +bool SketcherPrs_Coincident::readyToDisplay(ModelAPI_Feature* theConstraint, + const std::shared_ptr& thePlane, + gp_Pnt& thePoint) { - std::shared_ptr aPnt = SketcherPrs_Tools::getPoint(myConstraint, - SketchPlugin_Constraint::ENTITY_A()); + bool aReadyToDisplay = false; + // Get point of the presentation + std::shared_ptr aPnt = SketcherPrs_Tools::getPoint(theConstraint, + SketchPlugin_Constraint::ENTITY_A()); if (aPnt.get() == NULL) - return; + aPnt = SketcherPrs_Tools::getPoint(theConstraint, SketchPlugin_Constraint::ENTITY_B()); - std::shared_ptr aPoint = myPlane->to3D(aPnt->x(), aPnt->y()); - myPoint = aPoint->impl(); - - static Handle(Graphic3d_AspectMarker3d) aPtA; - if (aPtA.IsNull()) { - aPtA = new Graphic3d_AspectMarker3d (); - aPtA->SetType(Aspect_TOM_RING1); - aPtA->SetScale(2.); - aPtA->SetColor(myOwnColor); + 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) +{ + gp_Pnt aPoint; + bool aReadyToDisplay = readyToDisplay(myConstraint, mySketcherPlane, aPoint); + if (aReadyToDisplay) + myPoint = aPoint; + + // 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(!aCustomColor ? Quantity_NOC_YELLOW : myCustomColor); + 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()); + aPntArray->AddVertex (myPoint.X(), myPoint.Y(), myPoint.Z()); + aGroup->AddPrimitiveArray (aPntArray); + + // Make a black mid ring + aPtA = new Graphic3d_AspectMarker3d(); + aPtA->SetType(Aspect_TOM_RING1); + aPtA->SetScale(1.); + aPtA->SetColor(!aCustomColor ? Quantity_NOC_BLACK : myCustomColor); + aGroup->SetPrimitivesAspect(aPtA); aGroup->AddPrimitiveArray (aPntArray); + + // Make an internal ring + aPtA = new Graphic3d_AspectMarker3d(); + aPtA->SetType(Aspect_TOM_POINT); + aPtA->SetScale(5.); + aPtA->SetColor(!aCustomColor ? Quantity_NOC_BLACK : myCustomColor); + aGroup->SetPrimitivesAspect(aPtA); + aGroup->AddPrimitiveArray (aPntArray); + + if (!aReadyToDisplay) + SketcherPrs_Tools::sendEmptyPresentationError(myConstraint, + "An empty AIS presentation: SketcherPrs_Coincident"); } void SketcherPrs_Coincident::ComputeSelection(const Handle(SelectMgr_Selection)& aSelection, const Standard_Integer aMode) { - Handle(SelectMgr_EntityOwner) aOwn = new SelectMgr_EntityOwner(this, 10); - Handle(Select3D_SensitivePoint) aSp = new Select3D_SensitivePoint(aOwn, myPoint); - aSelection->Add(aSp); + // There is no selection of coincident - a point is selected instead of coincidence } void SketcherPrs_Coincident::SetColor(const Quantity_NameOfColor aCol) @@ -87,3 +141,13 @@ 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(); +}