2.3.4 Point creation: by intersection

[modules/shaper.git] / src / ConstructionAPI / ConstructionAPI_Point.h

diff --git a/src/ConstructionAPI/ConstructionAPI_Point.h b/src/ConstructionAPI/ConstructionAPI_Point.h
index 7e412a2f499a78ea2fd0f57fe0df931f63ae8d90..247a5c22bc6243291396ba6de1e6a2fcf1f9fc44 100644 (file)
--- a/src/ConstructionAPI/ConstructionAPI_Point.h
+++ b/src/ConstructionAPI/ConstructionAPI_Point.h
@@ -63,20 +63,39 @@ public:
                         const ModelHighAPI_Selection& theObject1,
                         const ModelHighAPI_Selection& theObject2);
 
+  /// Constructor with values: intersected objects.
+  CONSTRUCTIONAPI_EXPORT
+  ConstructionAPI_Point(const std::shared_ptr<ModelAPI_Feature>& theFeature,
+                        const ModelHighAPI_Selection& theObject1,
+                        const ModelHighAPI_Selection& theObject2,
+                        const ModelHighAPI_Selection& theObject3);
+
   /// Destructor.
   CONSTRUCTIONAPI_EXPORT
   virtual ~ConstructionAPI_Point();
 
-  INTERFACE_16(ConstructionPlugin_Point::ID(),
+  INTERFACE_24(ConstructionPlugin_Point::ID(),
                x, ConstructionPlugin_Point::X(), ModelAPI_AttributeDouble, /** X attribute */,
                y, ConstructionPlugin_Point::Y(), ModelAPI_AttributeDouble, /** Y attribute */,
                z, ConstructionPlugin_Point::Z(), ModelAPI_AttributeDouble, /** Z attribute */,
                creationMethod, ConstructionPlugin_Point::CREATION_METHOD(),
                ModelAPI_AttributeString, /** Creation method */,
+               intersectionType, ConstructionPlugin_Point::INTERSECTION_TYPE(),
+               ModelAPI_AttributeString, /** Type of the intersection */,
+               intersectionLine1, ConstructionPlugin_Point::INTERSECTION_LINE_1(),
+               ModelAPI_AttributeSelection, /** Line for intersection */,
+               intersectionLine2, ConstructionPlugin_Point::INTERSECTION_LINE_2(),
+               ModelAPI_AttributeSelection, /** Line for intersection */,
                intersectionLine, ConstructionPlugin_Point::INTERSECTION_LINE(),
                ModelAPI_AttributeSelection, /** Line for intersection */,
                intersectionPlane, ConstructionPlugin_Point::INTERSECTION_PLANE(),
                ModelAPI_AttributeSelection, /** Plane for intersection */,
+               intersectionPlane1, ConstructionPlugin_Point::INTERSECTION_PLANE_1(),
+               ModelAPI_AttributeSelection, /** Plane for intersection */,
+               intersectionPlane2, ConstructionPlugin_Point::INTERSECTION_PLANE_2(),
+               ModelAPI_AttributeSelection, /** Plane for intersection */,
+               intersectionPlane3, ConstructionPlugin_Point::INTERSECTION_PLANE_3(),
+               ModelAPI_AttributeSelection, /** Plane for intersection */,
                useOffset, ConstructionPlugin_Point::USE_OFFSET(),
                ModelAPI_AttributeString, /** Use offset */,
                offset, ConstructionPlugin_Point::OFFSET(),
@@ -93,10 +112,14 @@ public:
                ModelAPI_AttributeDouble, /** Ratio */,
                reverse, ConstructionPlugin_Point::REVERSE(),
                ModelAPI_AttributeBoolean, /** Reverse */,
-               poinToProjectOnFace, ConstructionPlugin_Point::POINT_TO_PROJECT_ON_FACE(),
-               ModelAPI_AttributeSelection, /** Point to project on face */,
+               poinToProject, ConstructionPlugin_Point::POINT_TO_PROJECT(),
+               ModelAPI_AttributeSelection, /** Point to project*/,
+               projectionType, ConstructionPlugin_Point::PROJECTION_TYPE(),
+               ModelAPI_AttributeString, /** Type of the point projection */,
                faceForPointProjection, ConstructionPlugin_Point::FACE_FOR_POINT_PROJECTION(),
-               ModelAPI_AttributeSelection, /** Face for point projection */)
+               ModelAPI_AttributeSelection, /** Point to project on edge */,
+               edgeForPointProjection, ConstructionPlugin_Point::EDGE_FOR_POINT_PROJECTION(),
+               ModelAPI_AttributeSelection, /** Edge for point projection */)
 
 
   /// Set point values.
@@ -112,23 +135,32 @@ public:
                          const bool theUseRatio = false,
                          const bool theReverse = false);
 
-  /// Set point and plane for projection.
+  /// Set point and edge for projection.
+  CONSTRUCTIONAPI_EXPORT
+  void setByProjectionOnEdge(const ModelHighAPI_Selection& theVertex,
+                             const ModelHighAPI_Selection& theEdge);
+
+  /// Set point and face for projection.
   CONSTRUCTIONAPI_EXPORT
   void setByProjectionOnFace(const ModelHighAPI_Selection& theVertex,
                              const ModelHighAPI_Selection& theFace);
 
-  /*
   /// Set lines for intersections.
   CONSTRUCTIONAPI_EXPORT
   void setByLinesIntersection(const ModelHighAPI_Selection& theEdge1,
                               const ModelHighAPI_Selection& theEdge2);
-  */
 
   /// Set line and plane for intersections.
   CONSTRUCTIONAPI_EXPORT
   void setByLineAndPlaneIntersection(const ModelHighAPI_Selection& theEdge,
                                      const ModelHighAPI_Selection& theFace);
 
+  /// Set faces for intersections.
+  CONSTRUCTIONAPI_EXPORT
+  void setByPlanesIntersection(const ModelHighAPI_Selection& theFace1,
+                               const ModelHighAPI_Selection& theFace2,
+                               const ModelHighAPI_Selection& theFace3);
+
   /// Dump wrapped feature
   CONSTRUCTIONAPI_EXPORT
   virtual void dump(ModelHighAPI_Dumper& theDumper) const;
@@ -171,4 +203,12 @@ PointPtr addPoint(const std::shared_ptr<ModelAPI_Document> & thePart,
                   const ModelHighAPI_Double& theDistanceValue,
                   const bool theReverse = false);
 
+/// \ingroup CPPHighAPI
+/// \brief Create Point feature as an intersection of selected planes
+CONSTRUCTIONAPI_EXPORT
+PointPtr addPoint(const std::shared_ptr<ModelAPI_Document> & thePart,
+                  const ModelHighAPI_Selection& theObject1,
+                  const ModelHighAPI_Selection& theObject2,
+                  const ModelHighAPI_Selection& theObject3);
+
 #endif /* SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_POINT_H_ */