X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Tools.h;h=b76e1dd4449892fedd0047668f439fcacda3d8c0;hb=b73fb7468bea81901dbeed8e229d742f788ec282;hp=b7c0a22c921efec6e030b73f6af513d872cd62cb;hpb=a94fc319f2aa64b43c9a73b5ff7063923648faec;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_Tools.h b/src/PartSet/PartSet_Tools.h
index b7c0a22c9..b76e1dd44 100755
--- a/src/PartSet/PartSet_Tools.h
+++ b/src/PartSet/PartSet_Tools.h
@@ -167,12 +167,14 @@ public:
   /// \param theObject a selected result object
   /// \param theSketch a sketch feature
   /// \param theTemporary the created external object is temporary, execute is not performed for it
+  /// \param theCreatedFeature a new projection feature
   /// \return result of created feature
   static std::shared_ptr<ModelAPI_Result> createFixedObjectByExternal(
-                                               const TopoDS_Shape& theShape,
+                                               const std::shared_ptr<GeomAPI_Shape>& theShape,
                                                const ObjectPtr& theObject,
                                                CompositeFeaturePtr theSketch,
-                                               const bool theTemporary = false);
+                                               const bool theTemporary,
+                                               FeaturePtr& theCreatedFeature);
 
     /// Checks whether the list of selected presentations contains the given one
   /// \param theSelected a list of presentations
@@ -181,31 +183,6 @@ public:
   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 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 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
-  /// \param theSketch the sketch feature
-  /// \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 std::shared_ptr<ModuleBase_ViewerPrs>& thePrs,
-                             FeaturePtr theSketch,
-                             Handle(V3d_View) theView, double& theX, double& theY);
-
-
   /**
   * Find attribute of object which corresponds to the given shape
   * \param theObj - an object
@@ -264,6 +241,27 @@ public:
                                QList<FeaturePtr>& theCoincidencies,
                                std::string theAttr, QList<bool>& theIsAttributes);
 
+  /*
+  * Finds and returns feature reerenced to the paramenter feature with the given name if found
+  * \param theFeature a source feature where refsToMe is obtained
+  * \param theFeatureId an indentifier of the searched feature
+  */
+  static FeaturePtr findRefsToMeFeature(FeaturePtr theFeature, const std::string& theFeatureId)
+  {
+    if (!theFeature.get())
+      return FeaturePtr();
+
+    // find first projected feature and edit it
+    const std::set<AttributePtr>& aRefsList = theFeature->data()->refsToMe();
+    std::set<AttributePtr>::const_iterator anIt;
+    for (anIt = aRefsList.cbegin(); anIt != aRefsList.cend(); ++anIt) {
+      FeaturePtr aRefFeature = std::dynamic_pointer_cast<ModelAPI_Feature>((*anIt)->owner());
+      if (aRefFeature && aRefFeature->getKind() == theFeatureId)
+        return aRefFeature;
+    }
+    return FeaturePtr();
+  }
+
   /**
   * Returns point of a coincedence
   * \param theStartCoin the coincedence feature
@@ -275,17 +273,24 @@ public:
                                    const Events_ID theId);
 
   /**
-   * Returns true if the object is a sketch entity, where auxiliary attribute has true vlaue
+   * Returns true if the object is a sketch entity, where auxiliary attribute has true value
    * \param theObject a result or feature
    * \return boolean result
    */
   static bool isAuxiliarySketchEntity(const ObjectPtr& theObject);
 
+  /**
+   * Returns true if the object is a sketch entity produced by projection or intersection feature
+   * and if it should not be included into the sketch result
+   */
+  static bool isIncludeIntoSketchResult(const ObjectPtr& theObject);
+
   static ResultPtr createFixedByExternalCenter(const ObjectPtr& theObject,
                                                const std::shared_ptr<GeomAPI_Edge>& theEdge,
                                                ModelAPI_AttributeSelection::CenterType theType,
                                                const CompositeFeaturePtr& theSketch,
-                                               bool theTemporary = false);
+                                               bool theTemporary,
+                                               FeaturePtr& theCreatedFeature);
 
 };