Merge remote-tracking branch 'remotes/origin/HighLevelDump'

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

diff --git a/src/SketcherPrs/SketcherPrs_LengthDimension.h b/src/SketcherPrs/SketcherPrs_LengthDimension.h
index 59d302ae52d1660d526bbd3032823f3da481c19d..f505e7fff4be7dbeccadf227c6bb91403c20321b 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_LengthDimension.h
+++ b/src/SketcherPrs/SketcherPrs_LengthDimension.h
@@ -13,9 +13,11 @@
 #include <AIS_LengthDimension.hxx>
 #include <Standard_DefineHandle.hxx>
 
-#include <SketcherPrs_Tools.h>
+#include <gp_Pnt.hxx>
+#include <gp_Pln.hxx>
+#include <string>
 
-class SketcherPrs_DimensionStyleListener;
+#include <SketcherPrs_DimensionStyleListener.h>
 
 DEFINE_STANDARD_HANDLE(SketcherPrs_LengthDimension, AIS_LengthDimension)
 
@@ -54,20 +56,28 @@ protected:
     const Standard_Integer aMode);
 
 private:
-  static bool getPoints(ModelAPI_Feature* theConstraint,
-                 const std::shared_ptr<GeomAPI_Ax3>& thePlane,
-                 gp_Pnt& thePnt1, gp_Pnt& thePnt2);
+  static bool readyToDisplay(ModelAPI_Feature* theConstraint,
+                             const std::shared_ptr<GeomAPI_Ax3>& thePlane,
+                             gp_Pnt& thePnt1, gp_Pnt& thePnt2);
 
   /// Constraint feature
   ModelAPI_Feature* myConstraint;
 
   /// Plane of the current sketcher
-  std::shared_ptr<GeomAPI_Ax3> myPlane;
+  std::shared_ptr<GeomAPI_Ax3> mySketcherPlane;
 
-  Handle(Prs3d_DimensionAspect) myAspect;
+  //Handle(Prs3d_DimensionAspect) myAspect;
 
   /// Listener to update dimension visualization style
   SketcherPrs_DimensionStyleListener* myStyleListener;
+
+  /// container of values obtained from the constraint, which are necessary to fill the presentation
+  gp_Pnt myFirstPoint; ///< the dimension first point for measured geometry
+  gp_Pnt mySecondPoint; ///< the dimension first point for measured geometry
+  gp_Pln myPlane; ///< the plane(plane of the sketch) for measured geometry
+  double myDistance; ///< the flyout distance
+
+  SketcherPrs_DimensionStyleListener::DimensionValue myValue; /// the structure filled by constraint
 };
 
 #endif
\ No newline at end of file