Merge branch 'Dev_2.1.0' of salome:modules/shaper into Dev_2.1.0

[modules/shaper.git] / src / PartSet / PartSet_Tools.h

diff --git a/src/PartSet/PartSet_Tools.h b/src/PartSet/PartSet_Tools.h
index 9578493085a83eee3d5be3a29de3c451a77eeb41..195de10b5f74e976c244a721d36a37559771d38c 100755 (executable)
--- a/src/PartSet/PartSet_Tools.h
+++ b/src/PartSet/PartSet_Tools.h
@@ -68,38 +68,9 @@ class PARTSET_EXPORT PartSet_Tools
   /// \param theSketch the sketch feature
   static std::shared_ptr<GeomAPI_Pnt> convertTo3D(const double theX, const double theY, FeaturePtr theSketch);
 
-  /// Returns an object that is under the mouse point. Firstly it checks the highlighting,
-  /// if it exists, the first object is returned. Secondly, there is an iteration on
-  /// the selected list to find the point. Thirdly, if the object is not found under the
-  /// the point, the first selected object is returned.
-  /// \param thePoint a screen point
-  /// \param theView a 3D view
-  /// \param theSketch the sketch feature
-  /// \param theSelected the list of selected presentations
-  /// \param theHighlighted the list of highlighted presentations
-  static ObjectPtr nearestFeature(QPoint thePoint, Handle_V3d_View theView, FeaturePtr theSketch,
-                                  const QList<ModuleBase_ViewerPrs>& theSelected,
-                                  const QList<ModuleBase_ViewerPrs>& theHighlighted);
-
   /// Returns pointer to the root document.
   static std::shared_ptr<ModelAPI_Document> document();
 
-  /// Find an attribute which corresponds to a given pont coordinates
-  /// \param theSketch the sketch feature
-  /// \param theX X coordinate
-  /// \param theY Y coordinate
-  /// \param theTolerance tolerance
-  /// \param theIgnore list of features which has to be ignored
-  //static std::shared_ptr<GeomDataAPI_Point2D> findAttributePoint(CompositeFeaturePtr theSketch, 
-  //  double theX, double theY, double theTolerance, const QList<FeaturePtr>& theIgnore = QList<FeaturePtr>());
-
-  /// Returns a point attribute of the feature by the coordinates if it is
-  /// \param theFeature the feature
-  /// \param theX the horizontal coordinate
-  /// \param theY the vertical coordinate
-  //static std::shared_ptr<GeomDataAPI_Point2D> getFeaturePoint(FeaturePtr theFeature,
-  //                                                              double theX, double theY);
-
   /// \brief Save the double to the feature. If the attribute is double, it is filled.
   /// \param theFeature the feature
   /// \param theX the horizontal coordinate
@@ -214,18 +185,29 @@ class PARTSET_EXPORT PartSet_Tools
   /**
   * Finds an attribute value in attribute reference attribute value
   * \param theAttribute - an attribure reference filled with an attribute
+  * \param theWorkshop a reference to workshop
   * \return a geometry shape
   */
   static GeomShapePtr findShapeBy2DPoint(const AttributePtr& theAttribute,
                                          ModuleBase_IWorkshop* theWorkshop);
 
-  /* Returns point of coincidence feature
+  /**
+  * Returns point of coincidence feature
   * \param theFeature the coincidence feature
   * \param theAttribute the attribute name
   */
   static std::shared_ptr<GeomAPI_Pnt2d> getPoint(std::shared_ptr<ModelAPI_Feature>& theFeature,
                                                  const std::string& theAttribute);
 
+  /**
+  * 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.
+  * \return the coincidence feature or null
+  */
+  static FeaturePtr findFirstCoincidence(const FeaturePtr& theFeature,
+                                         std::shared_ptr<GeomAPI_Pnt2d> thePoint);
+
   /**
   * Returns list of features connected in a councedence feature point
   * \param theStartCoin the coincidence feature
@@ -235,18 +217,11 @@ class PARTSET_EXPORT PartSet_Tools
   static void findCoincidences(FeaturePtr theStartCoin, QList<FeaturePtr>& theList,
                                std::string theAttr);
 
-protected:
-  /// Returns an object that is under the mouse point. Firstly it checks the highlighting,
-  /// if it exists, the first object is returned. Secondly, there is an iteration on
-  /// the selected list to find the point. Thirdly, if the object is not found under the
-  /// the point, the first selected object is returned.
-  /// \param thePoint a screen point
-  /// \param theView a 3D view
-  /// \param theSketch the sketch feature
-  /// \param thePresentations the list of presentations
-  static ObjectPtr nearestFeature(QPoint thePoint, Handle_V3d_View theView, FeaturePtr theSketch,
-                                  const QList<ModuleBase_ViewerPrs>& thePresentations);
-
+  /**
+  * Returns point of a coincedence
+  * \param theStartCoin the coincedence feature
+  */
+  static std::shared_ptr<GeomAPI_Pnt2d> getCoincedencePoint(FeaturePtr theStartCoin);
 };
 
 #endif