X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_Coincident.h;h=9890cc35ecd11c5501340157be75c18e73c8cd90;hb=449259f5540f1e1d7e5e0595e10f80e18a15e038;hp=773a9c5ea2415224976e3446857ca494a90354f8;hpb=5b6031b015602aa07f5a6fc668c13ac3faf7a8a9;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_Coincident.h b/src/SketcherPrs/SketcherPrs_Coincident.h
index 773a9c5ea..9890cc35e 100644
--- a/src/SketcherPrs/SketcherPrs_Coincident.h
+++ b/src/SketcherPrs/SketcherPrs_Coincident.h
@@ -1,13 +1,27 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        SketcherPrs_Coincident.h
-// Created:     12 February 2015
-// Author:      Vitaly SMETANNIKOV
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #ifndef SketcherPrs_Coincident_H
 #define SketcherPrs_Coincident_H
 
 #include <GeomAPI_Ax3.h>
+#include <SketchPlugin_Sketch.h>
 #include <ModelAPI_Feature.h>
 
 #include <AIS_InteractiveObject.hxx>
@@ -28,7 +42,7 @@ public:
   /// \param theConstraint a constraint object
   /// \param thePlane plane of a sketch
   Standard_EXPORT SketcherPrs_Coincident(ModelAPI_Feature* theConstraint,
-                                         const std::shared_ptr<GeomAPI_Ax3>& thePlane);
+    SketchPlugin_Sketch* theSketch);
 
   /// Defines color for the presentation
   /// \param aColor a color object
@@ -38,14 +52,10 @@ public:
   /// \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
+  /// Set state of the presentation, in case of custom color, 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);
+  /// \param theColor a custom color for object presentation
+  Standard_EXPORT void SetCustomColor(const std::vector<int>& theColor);
 
   /// Returns true if the constraint feature arguments are correcly filled to build AIS presentation
   /// \param theConstraint a constraint feature
@@ -72,10 +82,10 @@ private:
 
 private:
   ModelAPI_Feature* myConstraint;
-  std::shared_ptr<GeomAPI_Ax3> mySketcherPlane;
+  SketchPlugin_Sketch* mySketch;
   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
+  bool myIsCustomColor; /// state if the presentation is visualized in custom color
+  Quantity_Color myCustomColor; /// the color of mid ring if there is a conflict
 };