X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_SymbolPrs.h;h=1f8894f174c0da0f48c0300737aeadd8a6775a4f;hb=8ebc9a7d5f87057b61b174e7568e01e44571549d;hp=9145705f520bb787310682d5e9a940d17ac6ebee;hpb=87aaa6244dbdd6e4fb6440d7516df672679f8701;p=modules%2Fshaper.git

diff --git a/src/SketcherPrs/SketcherPrs_SymbolPrs.h b/src/SketcherPrs/SketcherPrs_SymbolPrs.h
index 9145705f5..1f8894f17 100644
--- a/src/SketcherPrs/SketcherPrs_SymbolPrs.h
+++ b/src/SketcherPrs/SketcherPrs_SymbolPrs.h
@@ -8,6 +8,8 @@
 #define SketcherPrs_SymbolPrs_H
 
 #include "SketcherPrs_SensitivePoint.h"
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_AttributeRefList.h>
 
 #include <AIS_InteractiveObject.hxx>
 #include <GeomAPI_Ax3.h>
@@ -15,14 +17,13 @@
 #include <Graphic3d_AspectMarker3d.hxx>
 #include <Image_AlienPixMap.hxx>
 #include <SelectMgr_EntityOwner.hxx>
-#include <Select3D_SensitiveEntitySequence.hxx>
+#include <Select3D_EntitySequence.hxx>
 
 #include <Standard_DefineHandle.hxx>
 #include <map>
 
 #include <OpenGl_Workspace.hxx>
 
-class SketchPlugin_Constraint;
 class OpenGl_Context;
 
 
@@ -38,7 +39,7 @@ public:
   /// Constructor
   /// \param theConstraint a constraint feature
   /// \param thePlane a coordinate plane of current sketch
-  Standard_EXPORT SketcherPrs_SymbolPrs(SketchPlugin_Constraint* theConstraint, 
+  Standard_EXPORT SketcherPrs_SymbolPrs(ModelAPI_Feature* theConstraint, 
                         const std::shared_ptr<GeomAPI_Ax3>& thePlane);
   
   virtual ~SketcherPrs_SymbolPrs();
@@ -57,17 +58,25 @@ public:
   Standard_EXPORT virtual void HilightOwnerWithColor(const Handle(PrsMgr_PresentationManager3d)& thePM, 
                                                      const Quantity_NameOfColor theColor, const Handle(SelectMgr_EntityOwner)& theOwner);
 
+  /// Returns sketcher plane
   Standard_EXPORT std::shared_ptr<GeomAPI_Ax3> plane() const { return myPlane; }
 
-  Standard_EXPORT SketchPlugin_Constraint* feature() const { return myConstraint; }
+  /// Returns feature object
+  Standard_EXPORT ModelAPI_Feature* feature() const { return myConstraint; }
 
+  /// Return array of points where symbols will be placed
+  const Handle(Graphic3d_ArrayOfPoints)& pointsArray() const { return myPntArray; }
 
-  Handle(Graphic3d_ArrayOfPoints) pointsArray() const { return myPntArray; }
-
+  /// Render of the presentation
+  /// \param theWorkspace is OpenGl workspace
   void Render(const Handle(OpenGl_Workspace)& theWorkspace) const;
 
+  /// Release used OpenGl resources
+  /// \param theContext is an OpenGL context
   void Release (OpenGl_Context* theContext);
 
+  Standard_EXPORT virtual void BoundingBox (Bnd_Box& theBndBox) Standard_OVERRIDE;
+
   DEFINE_STANDARD_RTTI(SketcherPrs_SymbolPrs)
 
 protected:
@@ -103,9 +112,21 @@ protected:
   /// \return true in case of success
   virtual bool updatePoints(double theStep) const { return true; }
 
+  /// Draw a shape into the given presentation scene
+  /// \param theShape the shape to draw
+  /// \param thePrs the presentation scene
+  void drawShape(const std::shared_ptr<GeomAPI_Shape>& theShape, 
+    const Handle(Prs3d_Presentation)& thePrs) const;
+
+  /// Draw a list of shapes stored in a RefListAttribute
+  /// \param theListAttr the attribute of reference3s list
+  /// \param thePrs the presentation scene
+  void drawListOfShapes(const std::shared_ptr<ModelAPI_AttributeRefList>& theListAttr, 
+                        const Handle(Prs3d_Presentation)& thePrs) const;
+
 protected:
   /// Constraint feature
-  SketchPlugin_Constraint* myConstraint;
+  ModelAPI_Feature* myConstraint;
 
   /// Plane of the current sketcher
   std::shared_ptr<GeomAPI_Ax3> myPlane;
@@ -116,6 +137,7 @@ protected:
   /// Array of symbols positions
   mutable Handle(Graphic3d_ArrayOfPoints) myPntArray;
 
+  /// An owner object of the presentation
   Handle(SelectMgr_EntityOwner) myOwner;
 
 private: 
@@ -124,7 +146,7 @@ private:
 
   mutable Handle(OpenGl_VertexBuffer) myVboAttribs;
 
-  Select3D_SensitiveEntitySequence mySPoints;
+  Select3D_EntitySequence mySPoints;
 };
 
 #endif
\ No newline at end of file