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

diff --git a/src/SketcherPrs/SketcherPrs_Angle.h b/src/SketcherPrs/SketcherPrs_Angle.h
index 0d87c02e3..09167273c 100644
--- a/src/SketcherPrs/SketcherPrs_Angle.h
+++ b/src/SketcherPrs/SketcherPrs_Angle.h
@@ -11,16 +11,18 @@
 #include <GeomAPI_Ax3.h>
 #include <ModelAPI_Feature.h>
 
-#include <AIS_AngleDimension.hxx>
+#include <AIS_AngleDimension_.hxx>
 #include <Standard_DefineHandle.hxx>
 
-DEFINE_STANDARD_HANDLE(SketcherPrs_Angle, AIS_AngleDimension)
+class SketcherPrs_DimensionStyleListener;
+
+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
@@ -29,6 +31,9 @@ public:
   Standard_EXPORT SketcherPrs_Angle(ModelAPI_Feature* theConstraint, 
                         const std::shared_ptr<GeomAPI_Ax3>& thePlane);
 
+  /// Destructor
+  Standard_EXPORT ~SketcherPrs_Angle();
+
   DEFINE_STANDARD_RTTI(SketcherPrs_Angle)
 
   /// Returns true if the constraint feature arguments are correcly filled to build AIS presentation
@@ -46,14 +51,42 @@ protected:
   Standard_EXPORT virtual void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
     const Standard_Integer aMode);
 
+  /// Checks is the angle plane has inverted direction of normal to the plane of current sketcher
+  /// Returns true if crossed product is negative.
+  /// \return bolean value
+  bool isAnglePlaneReversedToSketchPlane();
+
+  /// Calculates a distance between center of the angle presentation and the value of flyout point
+  /// attribute. It should be used after setting measured geometry for the angle presentation as
+  /// it uses calculated center/first/second point coordinates
+  /// \return real value
+  double calculateDistanceToFlyoutPoint();
+
+  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
 };