X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Angle.h;h=09167273c237dcba17e397928e2245769da84811;hb=9968ec652480079d0ca91b2040f6327a164807cf;hp=5e425d09ea274b0c1e4dd2d58631b09c3bb1ea75;hpb=a2712247ec6b1ff00fb85ce07d0fe5094be58e36;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Angle.h b/src/SketcherPrs/SketcherPrs_Angle.h
index 5e425d09e..09167273c 100644
--- a/src/SketcherPrs/SketcherPrs_Angle.h
+++ b/src/SketcherPrs/SketcherPrs_Angle.h
@@ -11,18 +11,18 @@
 #include <GeomAPI_Ax3.h>
 #include <ModelAPI_Feature.h>
 
-#include <AIS_AngleDimension.hxx>
+#include <AIS_AngleDimension_.hxx>
 #include <Standard_DefineHandle.hxx>
 
 class SketcherPrs_DimensionStyleListener;
 
-DEFINE_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension)
+DEFINE_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension_)
 
 /**
 * \ingroup GUI
 * A class for representation of angle constraint
 */
-class SketcherPrs_Angle : public AIS_AngleDimension
+class SketcherPrs_Angle : public AIS_AngleDimension_
 {
 public:
   /// Constructor
@@ -62,20 +62,31 @@ protected:
   /// \return real value
   double calculateDistanceToFlyoutPoint();
 
-  bool getPoints(gp_Pnt& theFirstPoint, gp_Pnt& theSecondPoint, gp_Pnt& theCenterPoint,
-                 double& theAngle) const;
+  static bool readyToDisplay(ModelAPI_Feature* theConstraint,
+                             const std::shared_ptr<GeomAPI_Ax3>& thePlane,
+                             gp_Pnt& theFirstPoint, gp_Pnt& theSecondPoint,
+                             gp_Pnt& theCenterPoint);
 
 private:
   /// 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;
 
   /// 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 second point for measured geometry
+  gp_Pnt myCenterPoint; ///< the dimension center point for measured geometry
+  gp_Pnt myFlyOutPoint;  ///< the dimension fly out point for measured geometry
+  double myAngle; ///< the angle value to be shown as custom value of presentation
+  bool myHasParameters; ///< true if the atrribute value has used parameters
+  std::string myValue; ///< the angle value depending on angle type
 };