X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FPartSet%2FPartSet_Tools.h;h=3bbebc781b5dbd17262dccfa6d3e79cb0d36e93d;hb=09dabb6acd9664f589a0bd9415d804d7a37ab801;hp=489fa661577b729d14f4d39151aef766377668ba;hpb=21aab68742ce06e6bdbbb45e55a6366a07f8db66;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_Tools.h b/src/PartSet/PartSet_Tools.h
index 489fa6615..3bbebc781 100755
--- a/src/PartSet/PartSet_Tools.h
+++ b/src/PartSet/PartSet_Tools.h
@@ -9,7 +9,6 @@
 
 #include "PartSet.h"
 
-#include <ModuleBase_ViewerPrs.h>
 #include <gp_Pnt.hxx>
 
 #include <QPoint>
@@ -29,11 +28,13 @@ class Handle_V3d_View;
 class ModuleBase_ViewerPrs;
 class ModuleBase_IWorkshop;
 class GeomDataAPI_Point2D;
+class GeomAPI_Shape;
 class GeomAPI_Pln;
 class GeomAPI_Pnt2d;
 class GeomAPI_Pnt;
 class GeomAPI_Edge;
 class GeomAPI_Vertex;
+class ModelAPI_Result;
 
 /*!
  * \class PartSet_Tools
@@ -159,7 +160,8 @@ public:
   /// \param theObject a selected result object
   /// \param theSketch a sketch feature
   /// \return result of found feature or NULL
-  static ResultPtr findFixedObjectByExternal(const TopoDS_Shape& theShape, 
+  static std::shared_ptr<ModelAPI_Result> findFixedObjectByExternal(
+                                             const TopoDS_Shape& theShape,
                                              const ObjectPtr& theObject, 
                                              CompositeFeaturePtr theSketch);
 
@@ -170,7 +172,8 @@ public:
   /// \param theSketch a sketch feature
   /// \param theTemporary the created external object is temporary, execute is not performed for it
   /// \return result of created feature
-  static ResultPtr createFixedObjectByExternal(const TopoDS_Shape& theShape, 
+  static std::shared_ptr<ModelAPI_Result> createFixedObjectByExternal(
+                                               const TopoDS_Shape& theShape, 
                                                const ObjectPtr& theObject, 
                                                CompositeFeaturePtr theSketch,
                                                const bool theTemporary = false);
@@ -179,20 +182,22 @@ public:
   /// \param theSelected a list of presentations
   /// \param thePrs a presentation to be found
   /// \return - result of check, true if the list contains the prs
-  static bool isContainPresentation(const QList<ModuleBase_ViewerPrs>& theSelected,
-                                    const ModuleBase_ViewerPrs& thePrs);
+  static bool isContainPresentation(const QList<std::shared_ptr<ModuleBase_ViewerPrs>>& theSelected,
+                                    const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs);
 
   /// Returns Result object if the given skietch contains external edge equal to the given
   /// \param theSketch - the sketch feature
   /// \param theEdge - the edge
   /// \return result object with external edge if it is found
-  static ResultPtr findExternalEdge(CompositeFeaturePtr theSketch, std::shared_ptr<GeomAPI_Edge> theEdge);
+  static std::shared_ptr<ModelAPI_Result> findExternalEdge(CompositeFeaturePtr theSketch,
+                                                           std::shared_ptr<GeomAPI_Edge> theEdge);
 
   /// Returns Result object if the given sketch contains external vertex equal to the given
   /// \param theSketch - the sketch feature
   /// \param theVert - the vertex
   /// \return result object with external vertex if it is found
-  static ResultPtr findExternalVertex(CompositeFeaturePtr theSketch, std::shared_ptr<GeomAPI_Vertex> theVert);
+  static std::shared_ptr<ModelAPI_Result> findExternalVertex(CompositeFeaturePtr theSketch,
+                                                        std::shared_ptr<GeomAPI_Vertex> theVert);
 
   /// Returns whether the selected presentation has a shape with the vertex type
   /// \param thePrs a selected presentation
@@ -200,7 +205,7 @@ public:
   /// \param theView a 3D view
   /// \param theX the output horizontal coordinate of the point
   /// \param theY the output vertical coordinate of the point
-  static bool hasVertexShape(const ModuleBase_ViewerPrs& thePrs, FeaturePtr theSketch,
+  static bool hasVertexShape(const std::shared_ptr<ModuleBase_ViewerPrs>& thePrs, FeaturePtr theSketch,
                              Handle_V3d_View theView, double& theX, double& theY);
 
 
@@ -219,7 +224,7 @@ public:
   * \param theWorkshop a reference to workshop
   * \return a geometry shape
   */
-  static GeomShapePtr findShapeBy2DPoint(const AttributePtr& theAttribute,
+  static std::shared_ptr<GeomAPI_Shape> findShapeBy2DPoint(const AttributePtr& theAttribute,
                                          ModuleBase_IWorkshop* theWorkshop);
 
   /**
@@ -234,8 +239,8 @@ public:
   * Gets all references to the feature, take coincidence constraint features, get point 2d attributes
   * and compare the point value to be equal with the given. Returns the first feature, which has
   * equal points.
-  * \param theSearchInResults a flag whether the conicidence feature shoudl be searched in
-  * references of the feature results.
+  * \param theFeature the coincidence feature
+  * \param thePoint a 2d point
   * \return the coincidence feature or null
   */
   static FeaturePtr findFirstCoincidence(const FeaturePtr& theFeature,
@@ -245,6 +250,7 @@ public:
   * Returns list of features connected in a councedence feature point
   * \param theStartCoin the coincidence feature
   * \param theList a list which collects lines features
+  * \param theCoincidencies a list of coincidence features
   * \param theAttr the attribute name
   */
   static void findCoincidences(FeaturePtr theStartCoin, QList<FeaturePtr>& theList,