X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_HVDirection.cpp;h=78a429f5c6df6f6286be6e3af3336ff5752f6f3b;hb=a4a0d955055f7d26fda227ad47211eaaef645cc7;hp=96134bf734578944c508e313874898ebc6632212;hpb=2532fb2df83ee1ddd9ff3e8b381d3788eaa15b69;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_HVDirection.cpp b/src/SketcherPrs/SketcherPrs_HVDirection.cpp index 96134bf73..78a429f5c 100644 --- a/src/SketcherPrs/SketcherPrs_HVDirection.cpp +++ b/src/SketcherPrs/SketcherPrs_HVDirection.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,9 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SketcherPrs_HVDirection.h" @@ -24,7 +24,6 @@ #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_HVDirection, SketcherPrs_SymbolPrs); @@ -32,26 +31,27 @@ IMPLEMENT_STANDARD_RTTIEXT(SketcherPrs_HVDirection, SketcherPrs_SymbolPrs); static Handle(Image_AlienPixMap) MyPixMap; SketcherPrs_HVDirection::SketcherPrs_HVDirection(ModelAPI_Feature* theConstraint, - const std::shared_ptr& thePlane, - bool isHorisontal) - : SketcherPrs_SymbolPrs(theConstraint, thePlane), myIsHorisontal(isHorisontal) + SketchPlugin_Sketch* theSketcher, bool isHorisontal) + : SketcherPrs_SymbolPrs(theConstraint, theSketcher), + myIsHorisontal(isHorisontal) { } bool SketcherPrs_HVDirection::IsReadyToDisplay(ModelAPI_Feature* theConstraint, - const std::shared_ptr&/* thePlane*/) + const std::shared_ptr& thePlane) { bool aReadyToDisplay = false; - ObjectPtr aObj = - SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); - - aReadyToDisplay = SketcherPrs_Tools::getShape(aObj).get() != NULL; + if (thePlane.get()) { + ObjectPtr aObj = + SketcherPrs_Tools::getResult(theConstraint, SketchPlugin_Constraint::ENTITY_A()); + aReadyToDisplay = SketcherPrs_Tools::getShape(aObj).get() != NULL; + } return aReadyToDisplay; } bool SketcherPrs_HVDirection::updateIfReadyToDisplay(double theStep, bool withColor) const { - if (!IsReadyToDisplay(myConstraint, myPlane)) + if (!IsReadyToDisplay(myConstraint, plane())) return false; // Set point of the symbol @@ -66,7 +66,7 @@ bool SketcherPrs_HVDirection::updateIfReadyToDisplay(double theStep, bool withCo void SketcherPrs_HVDirection::drawLines(const Handle(Prs3d_Presentation)& thePrs, Quantity_Color theColor) const { - Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup(thePrs); + Handle(Graphic3d_Group) aGroup = thePrs->CurrentGroup(); // Draw constrained object Handle(Graphic3d_AspectLine3d) aLineAspect =