X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchAPI%2FSketchAPI_MacroArc.h;h=5ac234cc0ebbcce27225d0b803a503d4442f7214;hb=d5d78920316491975a67f76578982b401cdfe71d;hp=a4b51ccec3371c608df32034166edab32e63b50c;hpb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;p=modules%2Fshaper.git diff --git a/src/SketchAPI/SketchAPI_MacroArc.h b/src/SketchAPI/SketchAPI_MacroArc.h index a4b51ccec..5ac234cc0 100644 --- a/src/SketchAPI/SketchAPI_MacroArc.h +++ b/src/SketchAPI/SketchAPI_MacroArc.h @@ -88,7 +88,7 @@ public: SKETCHAPI_EXPORT virtual ~SketchAPI_MacroArc(); - INTERFACE_12(SketchPlugin_MacroArc::ID(), + INTERFACE_14(SketchPlugin_MacroArc::ID(), arcType, SketchPlugin_MacroArc::ARC_TYPE(), ModelAPI_AttributeString, /** Arc type */, center, SketchPlugin_MacroArc::CENTER_POINT_ID(), @@ -107,6 +107,10 @@ public: ModelAPI_AttributeRefAttr, /** Tangent point */, endPoint3, SketchPlugin_MacroArc::END_POINT_3_ID(), GeomDataAPI_Point2D, /** End point */, + transversalPoint, SketchPlugin_MacroArc::TRANSVERSAL_POINT_ID(), + ModelAPI_AttributeRefAttr, /** Transversal point */, + endPoint4, SketchPlugin_MacroArc::END_POINT_4_ID(), + GeomDataAPI_Point2D, /** End point */, reversed, SketchPlugin_MacroArc::REVERSED_ID(), ModelAPI_AttributeBoolean, /** Reversed flag */, radius, SketchPlugin_MacroArc::RADIUS_ID(), @@ -114,8 +118,6 @@ public: angle, SketchPlugin_MacroArc::ANGLE_ID(), ModelAPI_AttributeDouble, /** Angle */) -private: - /// Set by center and start, end point. SKETCHAPI_EXPORT void setByCenterStartEnd(double theCenterX, double theCenterY, @@ -153,6 +155,18 @@ private: void setByTangent(const ModelHighAPI_RefAttr& theTangentPoint, const std::shared_ptr& theEnd, bool theInversed); + + /// Set by tangent and end point. + SKETCHAPI_EXPORT + void setByTransversal(const ModelHighAPI_RefAttr& theTransversalPoint, + double theEndX, double theEndY, + bool theInversed); + + /// Set by tangent and end point. + SKETCHAPI_EXPORT + void setByTransversal(const ModelHighAPI_RefAttr& theTransversalPoint, + const std::shared_ptr& theEnd, + bool theInversed); }; /// Pointer on Arc object.