X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.h;h=458f860a74cb34fc97c5ca8a6cbe46aea4b4f80e;hb=f98f887290d4e2b4bd6618389911e82b6b9674f3;hp=d03bb437bf8ab04024079e349cc91f078214c786;hpb=98713097930edb46d37ffb835d685ec2ef9439dc;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.h b/src/SketcherPrs/SketcherPrs_SymbolPrs.h
index d03bb437b..458f860a7 100644
--- a/src/SketcherPrs/SketcherPrs_SymbolPrs.h
+++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.h
@@ -44,11 +44,6 @@ public:
   
   virtual ~SketcherPrs_SymbolPrs();
 
-  //! Method which clear all selected owners belonging
-  //! to this selectable object ( for fast presentation draw )
-  Standard_EXPORT virtual void ClearSelected();
-
-
   //! Method which draws selected owners ( for fast presentation draw )
   Standard_EXPORT virtual void HilightSelected(const Handle(PrsMgr_PresentationManager3d)& thePM, 
                                                const SelectMgr_SequenceOfOwner& theOwners);
@@ -65,7 +60,14 @@ public:
   Standard_EXPORT ModelAPI_Feature* feature() const { return myConstraint; }
 
   /// Return array of points where symbols will be placed
-  Handle(Graphic3d_ArrayOfPoints) pointsArray() const { return myPntArray; }
+  const Handle(Graphic3d_ArrayOfPoints)& pointsArray() const { return myPntArray; }
+
+  /// 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);
 
   /// Render of the presentation
   /// \param theWorkspace is OpenGl workspace
@@ -75,6 +77,10 @@ public:
   /// \param theContext is an OpenGL context
   void Release (OpenGl_Context* theContext);
 
+  /// Add a bounding box of the presentation to common bounding box
+  /// \param theBndBox the common bounding box to update
+  Standard_EXPORT virtual void BoundingBox (Bnd_Box& theBndBox) Standard_OVERRIDE;
+
   DEFINE_STANDARD_RTTI(SketcherPrs_SymbolPrs)
 
 protected:
@@ -83,6 +89,8 @@ protected:
     const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode = 0);
 
   /// Redefinition of virtual function
+  /// \param aSelection selection
+  /// \param aMode compute mode
   Standard_EXPORT virtual void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,
     const Standard_Integer aMode);
 
@@ -108,7 +116,7 @@ protected:
 
   /// Update myPntArray according to presentation positions
   /// \return true in case of success
-  virtual bool updatePoints(double theStep) const { return true; }
+  virtual bool updateIfReadyToDisplay(double theStep) const { return true; }
 
   /// Draw a shape into the given presentation scene
   /// \param theShape the shape to draw
@@ -145,6 +153,10 @@ private:
   mutable Handle(OpenGl_VertexBuffer) myVboAttribs;
 
   Select3D_EntitySequence mySPoints;
+
+  bool myIsConflicting; /// state if the presentation is visualized in error state
+  Handle(Image_AlienPixMap) myErrorIcon;
+  Handle(Graphic3d_MarkerImage) myErrorImage;
 };
 
 #endif
\ No newline at end of file