X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.h;h=773a9c5ea2415224976e3446857ca494a90354f8;hb=4f565b2204d3fba046aa8c851abada2a5a17bf6c;hp=baad5e7fd71671fe6549be75f9d840ab2d252726;hpb=4a230167f3242b22231d699f5c5a2a1787a51e71;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Coincident.h b/src/SketcherPrs/SketcherPrs_Coincident.h
index baad5e7fd..773a9c5ea 100644
--- a/src/SketcherPrs/SketcherPrs_Coincident.h
+++ b/src/SketcherPrs/SketcherPrs_Coincident.h
@@ -27,17 +27,26 @@ public:
   /// Constructor
   /// \param theConstraint a constraint object
   /// \param thePlane plane of a sketch
-  Standard_EXPORT SketcherPrs_Coincident(ModelAPI_Feature* theConstraint, 
+  Standard_EXPORT SketcherPrs_Coincident(ModelAPI_Feature* theConstraint,
                                          const std::shared_ptr<GeomAPI_Ax3>& thePlane);
 
   /// Defines color for the presentation
   /// \param aColor a color object
   Standard_EXPORT virtual void SetColor(const Quantity_Color& aColor);
-  
+
   /// Defines color for the presentation
   /// \param aColor a color name
   Standard_EXPORT virtual void SetColor(const Quantity_NameOfColor aColor);
 
+  /// Set state of the presentation, in case of conflicting state, the icon of the presentation is
+  /// visualized in error color.
+  /// The state is stored in an internal field, so should be changed when
+  /// constraint become not conflicting
+  /// \param theConflicting a state
+  /// \param theColor a color for conflicting object
+  Standard_EXPORT void SetConflictingConstraint(const bool& theConflicting,
+                                                const std::vector<int>& theColor);
+
   /// 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
@@ -45,20 +54,28 @@ public:
   static bool IsReadyToDisplay(ModelAPI_Feature* theConstraint,
                                const std::shared_ptr<GeomAPI_Ax3>& thePlane);
 
-  DEFINE_STANDARD_RTTI(SketcherPrs_Coincident)
+  DEFINE_STANDARD_RTTIEXT(SketcherPrs_Coincident, AIS_InteractiveObject)
 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
   Standard_EXPORT virtual void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
     const Standard_Integer aMode) ;
 
+private:
+  static bool readyToDisplay(ModelAPI_Feature* theConstraint,
+                      const std::shared_ptr<GeomAPI_Ax3>& thePlane,
+                      gp_Pnt& thePoint);
+
 private:
   ModelAPI_Feature* myConstraint;
   std::shared_ptr<GeomAPI_Ax3> mySketcherPlane;
   gp_Pnt myPoint;
+  bool myIsConflicting; /// state if the presentation is visualized in error state
+  Quantity_Color myConflictingColor; /// the color of mid ring if there is a conflict
 };