Issue #2169 Segmentation fault when drawing sketch line with undocked property panel

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

diff --git a/src/SketcherPrs/SketcherPrs_Radius.h b/src/SketcherPrs/SketcherPrs_Radius.h
index 3ba60e08306b7a630bfec9745e6036d812b8f978..9e431254bc048ef421aa6e11c925a0988b4fe0f9 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Radius.h
+++ b/src/SketcherPrs/SketcherPrs_Radius.h
@@ -14,7 +14,7 @@
 #include <AIS_RadiusDimension.hxx>
 #include <Standard_DefineHandle.hxx>
 
-class SketcherPrs_DimensionStyleListener;
+#include <SketcherPrs_DimensionStyleListener.h>
 
 DEFINE_STANDARD_HANDLE(SketcherPrs_Radius, AIS_RadiusDimension)
 
@@ -28,15 +28,16 @@ public:
   /// Constructor
   /// \param theConstraint a constraint feature
   /// \param thePlane a coordinate plane of current sketch
-  Standard_EXPORT SketcherPrs_Radius(ModelAPI_Feature* theConstraint, 
+  Standard_EXPORT SketcherPrs_Radius(ModelAPI_Feature* theConstraint,
                         const std::shared_ptr<GeomAPI_Ax3>& thePlane);
 
   /// Destructor
   Standard_EXPORT ~SketcherPrs_Radius();
 
-  DEFINE_STANDARD_RTTI(SketcherPrs_Radius)
+  DEFINE_STANDARD_RTTIEXT(SketcherPrs_Radius, AIS_RadiusDimension)
 
-  /// Returns true if the constraint feature arguments are correcly filled to build AIS presentation
+  /// Returns true if the constraint feature arguments are correcly filled
+  /// to build AIS presentation
   /// \param theConstraint a constraint feature
   /// \param thePlane a coordinate plane of current sketch
   /// \return boolean result value
@@ -48,15 +49,14 @@ private:
   /// \param thePlane a coordinate plane of current sketch
   /// \param theCircle a circle build on the constraint values
   /// \param thePoint an anchor point to show text value
-  /// \param theRadius a circle custom radius value to be visualized
   /// \return boolean result value
   static bool readyToDisplay(ModelAPI_Feature* theConstraint,
                              const std::shared_ptr<GeomAPI_Ax3>& thePlane,
-                             gp_Circ& theCircle, gp_Pnt& theAnchorPoint,
-                             double& theRadius);
+                             gp_Circ& theCircle, gp_Pnt& theAnchorPoint);
 protected:
   /// Redefinition of virtual function
-  Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
+  Standard_EXPORT virtual void Compute(
+    const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
     const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode = 0);
 
   /// Redefinition of virtual function
@@ -74,12 +74,10 @@ private:
   SketcherPrs_DimensionStyleListener* myStyleListener;
 
   /// container of values obtained from the constraint, which are necessary to fill the presentation
-  double myRadius; ///< the radius custom value
   gp_Circ myCircle; ///< the radius circle
   gp_Pnt myAnchorPoint; ///< an ancor for the radius value visualization
 
-  bool myHasParameters; ///< true if the atrribute value has used parameters
-  std::string myValue; ///< dimension value
+  SketcherPrs_DimensionStyleListener::DimensionValue myValue; /// the structure filled by constraint
 };
 
 #endif
\ No newline at end of file