Issue #3086: Avoid crash when FeatureInfo is null.

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_SymbolPrs.h

diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.h b/src/SketcherPrs/SketcherPrs_SymbolPrs.h
index b552bf612df2920d3e3668f2544727fcd5f2d775..a08d98b5604e9da89deb2ece54c9c2164a07d66e 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_SymbolPrs.h
+++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// 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
@@ -12,10 +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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #ifndef SketcherPrs_SymbolPrs_H
@@ -71,7 +70,10 @@ public:
     const Handle(SelectMgr_EntityOwner)& theOwner);
 
   /// Returns sketcher plane
-  Standard_EXPORT std::shared_ptr<GeomAPI_Ax3> plane() const { return myPlane; }
+  Standard_EXPORT std::shared_ptr<GeomAPI_Ax3> plane() const
+  {
+    return mySketcher->coordinatePlane();
+  }
 
   /// Returns feature object
   Standard_EXPORT ModelAPI_Feature* feature() const { return myConstraint; }
@@ -147,10 +149,7 @@ protected:
   ModelAPI_Feature* myConstraint;
 
   /// Sketcher feature
-  ModelAPI_CompositeFeature* mySketcher;
-
-  /// Plane of the current sketcher
-  std::shared_ptr<GeomAPI_Ax3> myPlane;
+  SketchPlugin_Sketch* mySketcher;
 
   /// Aspect for entities drawing
   Handle(Graphic3d_AspectMarker3d) myAspect;