From d0e7a11bea234e6c22ecedb1d40ed99f71e56f38 Mon Sep 17 00:00:00 2001 From: azv Date: Mon, 1 Feb 2016 16:25:36 +0300 Subject: [PATCH] Creating a circle by 3 points --- src/PartSet/PartSet_icons.qrc | 2 + src/PartSet/icons/circle_3pt_32x32.png | Bin 0 -> 1438 bytes src/PartSet/icons/circle_pt_rad_32x32.png | Bin 0 -> 1278 bytes src/SketchPlugin/SketchPlugin_Circle.cpp | 205 ++++++++++++++++++++++ src/SketchPlugin/SketchPlugin_Circle.h | 6 +- src/SketchPlugin/plugin-Sketch.xml | 26 ++- 6 files changed, 232 insertions(+), 7 deletions(-) create mode 100644 src/PartSet/icons/circle_3pt_32x32.png create mode 100644 src/PartSet/icons/circle_pt_rad_32x32.png diff --git a/src/PartSet/PartSet_icons.qrc b/src/PartSet/PartSet_icons.qrc index 826d7fd11..c6e632420 100644 --- a/src/PartSet/PartSet_icons.qrc +++ b/src/PartSet/PartSet_icons.qrc @@ -6,6 +6,8 @@ icons/angle_down.png icons/arc.png icons/circle.png + icons/circle_pt_rad_32x32.png + icons/circle_3pt_32x32.png icons/color.png icons/point.png icons/plane.png diff --git a/src/PartSet/icons/circle_3pt_32x32.png b/src/PartSet/icons/circle_3pt_32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1fc490728139983d36888a4b1584c7bef35cf6 GIT binary patch literal 1438 zcmV;P1!4M$P)*VLjy8EFbt2o>-VA_?t)#Hek6g+gL9VL>#a#)S(u zhJ*z+kwg}*FhL+8J_-vGn~I@eElIU1LJF;eRA4%_Fm(E$v@>&$i+;Dg3~eE{_$4=U z&&-|s|9}7Uy^ac2ZNiX70cb_6{#z!qV7SJ)3_0!<5RrS+-B8Dan%kHZD1`yAtf_!Q zKn3t5kOO1`1@cG_&<7-d^TBXUD-h{!r~{?k7?YZmfU>~>GpfTxz#Dkg6Ew-Z0U(+@4V7}8fXUM;<1q{(+ptRv$B(3s57HmHfHTU zzxh6|a0w7{l5i4G*4=Bo#+Yr_I};yXzL<7^n)_S~xIG6Ad~RUCz(~yP?Wzrx#jgAO z>m{zn2?W}R27!u5ocGU8I0Z-46^b>7GYECMd@+F6d zlret0hW{_tcIrgHmr8!BVQU&ZfB3WKo|~5!vIz`IBMAtp)J&@oNF{f>;VpZ;da$ps ze6W9ymPw{h0Q05a&!{#2bkd{YrOfZMFiY(i=oQcBixM+wsy!=^HlqzK)B0@!Et03J zfX4xsql!)2wl7<4bo|aPF1zdEDThlGW0II&A zXwK=}!jen=ti^H9tn1pauOK;czz)KQRKW^hom8tvM@=x(0SA27eEyZ!eEy})x%mli zI{igwcalwe(GZBdjt-vuL7uXEE0W6i&R1*+U6DVZg z`+()Z4&Y^Z$1%aM@$RXF5uje~w+e}Tpg|_$o02V4nHMMoo)fRv3HV`ocVzOheEcv{ z32YDoUf{Bv2b!g&#$~JQlY~b+4g!mT7l3DhMbcxw7Vwi!?~|p$ zldfhrvqInzk-Zogk@|92WRC!(JQ{b>8l5=JBm^=Jq9I_5NLdQZk=W^XY=>VCCYF%8 z1pFYG6>-K{QMhI-rxjBWn1o1$s8I}L2^nNN21KD2r^lI+XC6%MOJEWrwk?#;D;a@2 sT5fL-(s#avk;M44Ulgt$KLi`azh(aJq($zE_W%F@07*qoM6N<$f+8uBO8@`> literal 0 HcmV?d00001 diff --git a/src/PartSet/icons/circle_pt_rad_32x32.png b/src/PartSet/icons/circle_pt_rad_32x32.png new file mode 100644 index 0000000000000000000000000000000000000000..d7621a943cbf8d1354e8e59353f22cae6a1029a2 GIT binary patch literal 1278 zcmVHYzp^3$Y4bQYk^J(dZZ>hElLgDQ-*K-5nqLopK!aGAJi$+Ud+W-|z4H zyB_1E4iHen062z=BkxmfdFibEn6&;jfUm!UspB6Icez1O1Y-yQ%H>+XNuU$h4y*&# z0vq+oWndP#3QTzE>^R`ZA>x`490-xJOMliB!B=Y0dx9vo1OudfbW4(FP$B( zN5m~U4K$QXU<{^M(c(U!8z=))z$xGgFbOQ^oYhjJ1K17h0(NTua4khl5CoO1-UmDm z^a8EG&%md^H^6zxeciI!1y%vK0h>jj2e==Y20j5k15QLq{DVLQ{5fqN5%>f!BPEa< zhy)@)18_U=FtAq&wg3Z_NVt(hk`eHCfnnfx`8KHL%gNl(Az)4Tyx=sr7ZQoqA6nO4 zKA&jW_U6{@{d)DAm(H%Z!;M(q2|R6q4+57298|F!00({oJ_?_k%O#R?1(I_GUVC82 zJ95i2Qqo`9=RKLB{YKCokk3bCxeXrFQou`PJ{CwfaKwJMduI9z;3Tj?7|F1vI8M1C zJhe{>OaP;jy)JNMeG5DU9Jc@2o&WO>AP4*kJR+=R0+YF;q4oO}NTa}amd|5>PvwSO z;C0|_D;ACbtS>Gu0cRA1&B980=`4=r`@5CfA?FYDu2{S@$m4(qkS zRW0#SnKM(lp&qM7JpoXZTjqti5(EEtEdW1ysm$!nZVU+&)JWFIEvC-C zw`576*!fUtR%;oZy;@j>kbtl57N}As>aq4xnPb2~mFvU6%U&vTDTcu1!Kz7F5oV;RARW|W>yn$uiA7$m^f;S;~Jwj1AElZ zZw0uqes2UG12ze3+*ZI>6*L+mc3L@ZZUK0+4C_|LoDN&E10WR!fzLH~?o)wsEE48F zf;VbtO#$}^V=%wpg&)uh|2zP(BDU>|7e07t>M0MCm+UKoC~4q(N?kYeB<@S^&A zqQc>oe(ZP6zz*OgO<4(@J#OLsYbNwH4FU9v#0KEFCgN#jOTB1s10I#tdj&qAv;DYZ z`F;^-(j;>V_);x3FIVX%L8C18fcrGq?vc;0sd0?}Cv5905~y%7=~sOS)XC0?z(qBc zu$i?1cS!aQU{Sd~AlZF@Vxxn*RE8jcpbCM=MKlRKD=D|CoI0{>$s({y6>gs83HhX= z-M8bcJ)K=?wT2o5su1av8XcORTl8)Y_)7|n*%n77kKC~96R1KYTwB7+MkJ5{D9sg^ oofu>B>Xnt3?di;oOK@QL8w@Itjgr`3pa1{>07*qoM6N<$f`bG<6aWAK literal 0 HcmV?d00001 diff --git a/src/SketchPlugin/SketchPlugin_Circle.cpp b/src/SketchPlugin/SketchPlugin_Circle.cpp index 5dd78c10c..858c2e7ef 100644 --- a/src/SketchPlugin/SketchPlugin_Circle.cpp +++ b/src/SketchPlugin/SketchPlugin_Circle.cpp @@ -11,16 +11,70 @@ #include #include #include +#include #include #include #include +#include #include #include #include #include #include +namespace { + static const std::string& CIRCLE_TYPE() + { + static const std::string TYPE("CircleType"); + return TYPE; + } + static const std::string CIRCLE_TYPE_CENTER_AND_RADIUS() + { + static const std::string TYPE("CenterRadius"); + return TYPE; + } + static const std::string CIRCLE_TYPE_THREE_POINTS() + { + static const std::string TYPE("ThreePoints"); + return TYPE; + } + + static const std::string& FIRST_POINT_ID() + { + static const std::string FIRST_PNT("FirstPoint"); + return FIRST_PNT; + } + static const std::string& SECOND_POINT_ID() + { + static const std::string SECOND_PNT("SecondPoint"); + return SECOND_PNT; + } + static const std::string& THIRD_POINT_ID() + { + static const std::string THIRD_PNT("ThirdPoint"); + return THIRD_PNT; + } + static const std::string& POINT_ID(int theIndex) + { + switch (theIndex) { + case 1: return FIRST_POINT_ID(); + case 2: return SECOND_POINT_ID(); + case 3: return THIRD_POINT_ID(); + } + + static const std::string DUMMY; + return DUMMY; + } +} + +static void calculateCircleOnThreePoints(const std::shared_ptr& theFirstPnt, + const std::shared_ptr& theSecondPnt, + const std::shared_ptr& theThirdPnt, + std::shared_ptr& theCenter, + double& theRadius); + + SketchPlugin_Circle::SketchPlugin_Circle() : SketchPlugin_SketchEntity() { @@ -32,6 +86,13 @@ void SketchPlugin_Circle::initDerivedClassAttributes() data()->addAttribute(RADIUS_ID(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId()); ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID()); + + data()->addAttribute(CIRCLE_TYPE(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(FIRST_POINT_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(SECOND_POINT_ID(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(THIRD_POINT_ID(), GeomDataAPI_Point2D::typeId()); + std::dynamic_pointer_cast( + data()->attribute(CIRCLE_TYPE()))->setValue(CIRCLE_TYPE_CENTER_AND_RADIUS()); } void SketchPlugin_Circle::execute() @@ -70,6 +131,46 @@ void SketchPlugin_Circle::execute() } } +AISObjectPtr SketchPlugin_Circle::getAISObject(AISObjectPtr thePrevious) +{ + SketchPlugin_Sketch* aSketch = sketch(); + if (aSketch) { + // compute a circle point in 3D view + std::shared_ptr aCenterAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(CENTER_ID())); + AttributeDoublePtr aRadiusAttr = + std::dynamic_pointer_cast(attribute(RADIUS_ID())); + if (aCenterAttr->isInitialized() && aRadiusAttr->isInitialized()) { + std::shared_ptr aCenter(aSketch->to3D(aCenterAttr->x(), aCenterAttr->y())); + + // make a visible circle + std::shared_ptr aNDir = std::dynamic_pointer_cast( + aSketch->data()->attribute(SketchPlugin_Sketch::NORM_ID())); + std::shared_ptr aNormal = aNDir->dir(); + + double aRadius = aRadiusAttr->value(); + std::shared_ptr aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircle( + aCenter, aNormal, aRadius); + if (aCircleShape && aRadius != 0) { + std::list > aShapes; + // make a visible point + std::shared_ptr aCenterPointShape = GeomAlgoAPI_PointBuilder::point(aCenter); + aShapes.push_back(aCenterPointShape); + aShapes.push_back(aCircleShape); + + std::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aShapes); + AISObjectPtr anAIS = thePrevious; + if (!anAIS) + anAIS = AISObjectPtr(new GeomAPI_AISObject); + anAIS->createShape(aCompound); + anAIS->setWidth(3); + return anAIS; + } + } + } + return AISObjectPtr(); +} + void SketchPlugin_Circle::move(double theDeltaX, double theDeltaY) { std::shared_ptr aData = data(); @@ -99,4 +200,108 @@ void SketchPlugin_Circle::attributeChanged(const std::string& theID) { real(RADIUS_ID())->setValue(aCirc->radius()); } } + else if (theID == CENTER_ID() || theID == RADIUS_ID()) { + std::string aType = std::dynamic_pointer_cast( + data()->attribute(CIRCLE_TYPE()))->value(); + if (aType == CIRCLE_TYPE_THREE_POINTS()) + return; + + std::shared_ptr aCenterAttr = + std::dynamic_pointer_cast(attribute(CENTER_ID())); + if (!aCenterAttr->isInitialized()) + return; + AttributeDoublePtr aRadiusAttr = + std::dynamic_pointer_cast(attribute(RADIUS_ID())); + if (!aRadiusAttr->isInitialized()) + return; + + // check the execute() was called and the shape was built + if (!lastResult()) + return; + + data()->blockSendAttributeUpdated(true); + std::shared_ptr aFirstPnt = + std::dynamic_pointer_cast(attribute(FIRST_POINT_ID())); + std::shared_ptr aSecondPnt = + std::dynamic_pointer_cast(attribute(SECOND_POINT_ID())); + std::shared_ptr aThirdPnt = + std::dynamic_pointer_cast(attribute(THIRD_POINT_ID())); + double aRadius = aRadiusAttr->value(); + aFirstPnt->setValue(aCenterAttr->x() + aRadius, aCenterAttr->y()); + aSecondPnt->setValue(aCenterAttr->x(), aCenterAttr->y() + aRadius); + aThirdPnt->setValue(aCenterAttr->x() - aRadius, aCenterAttr->y()); + data()->blockSendAttributeUpdated(false); + } + else if (theID == FIRST_POINT_ID() || theID == SECOND_POINT_ID() || theID == THIRD_POINT_ID()) { + std::string aType = std::dynamic_pointer_cast( + data()->attribute(CIRCLE_TYPE()))->value(); + if (aType == CIRCLE_TYPE_CENTER_AND_RADIUS()) + return; + + data()->blockSendAttributeUpdated(true); + + std::shared_ptr aPoints[3]; + int aNbInitialized = 0; + for (int i = 1; i <= 3; ++i) { + std::shared_ptr aCurPnt = + std::dynamic_pointer_cast(attribute(POINT_ID(i))); + if (aCurPnt->isInitialized()) + aPoints[aNbInitialized++] = aCurPnt->pnt(); + } + + std::shared_ptr aCenterAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(CENTER_ID())); + AttributeDoublePtr aRadiusAttr = + std::dynamic_pointer_cast(data()->attribute(RADIUS_ID())); + + if (aNbInitialized == 1) + aCenterAttr->setValue(aPoints[0]->x(), aPoints[0]->y()); + else if (aNbInitialized == 2) { + std::shared_ptr aCoord = + aPoints[0]->xy()->added(aPoints[1]->xy())->multiplied(0.5); + double aRadius = aPoints[0]->distance(aPoints[1]) * 0.5; + aCenterAttr->setValue(aCoord->x(), aCoord->y()); + aRadiusAttr->setValue(aRadius); + } else { + std::shared_ptr aCenter; + double aRadius; + calculateCircleOnThreePoints(aPoints[0], aPoints[1], aPoints[2], aCenter, aRadius); + if (aCenter) { + aCenterAttr->setValue(aCenter->x(), aCenter->y()); + aRadiusAttr->setValue(aRadius); + } + } + + data()->blockSendAttributeUpdated(false); + } +} + + + + +// ========== Auxiliary functions ========================= +void calculateCircleOnThreePoints(const std::shared_ptr& theFirstPnt, + const std::shared_ptr& theSecondPnt, + const std::shared_ptr& theThirdPnt, + std::shared_ptr& theCenter, + double& theRadius) +{ + std::shared_ptr aVec12 = theSecondPnt->xy()->decreased(theFirstPnt->xy()); + std::shared_ptr aVec23 = theThirdPnt->xy()->decreased(theSecondPnt->xy()); + std::shared_ptr aVec31 = theFirstPnt->xy()->decreased(theThirdPnt->xy()); + // square of parallelogram + double aSquare2 = aVec12->cross(aVec23); + aSquare2 *= aSquare2 * 2.0; + if (aSquare2 < 1.e-20) + return; + // coefficients to calculate center + double aCoeff1 = aVec23->dot(aVec23) / aSquare2 * aVec12->dot(aVec31->multiplied(-1.0)); + double aCoeff2 = aVec31->dot(aVec31) / aSquare2 * aVec23->dot(aVec12->multiplied(-1.0)); + double aCoeff3 = aVec12->dot(aVec12) / aSquare2 * aVec31->dot(aVec23->multiplied(-1.0)); + // center + std::shared_ptr aCenter = theFirstPnt->xy()->multiplied(aCoeff1)->added( + theSecondPnt->xy()->multiplied(aCoeff2))->added(theThirdPnt->xy()->multiplied(aCoeff3)); + theCenter = std::shared_ptr(new GeomAPI_Pnt2d(aCenter)); + // radius + theRadius = theFirstPnt->distance(theCenter); } diff --git a/src/SketchPlugin/SketchPlugin_Circle.h b/src/SketchPlugin/SketchPlugin_Circle.h index 941d90f22..fe0ca3a42 100644 --- a/src/SketchPlugin/SketchPlugin_Circle.h +++ b/src/SketchPlugin/SketchPlugin_Circle.h @@ -16,7 +16,7 @@ * \ingroup Plugins * \brief Feature for creation of the new circle in PartSet. */ -class SketchPlugin_Circle : public SketchPlugin_SketchEntity +class SketchPlugin_Circle : public SketchPlugin_SketchEntity, public GeomAPI_IPresentable { public: /// Circle feature kind @@ -58,7 +58,6 @@ class SketchPlugin_Circle : public SketchPlugin_SketchEntity SKETCHPLUGIN_EXPORT virtual const void addSub(const FeaturePtr& theFeature) { } - ; /// Moves the feature /// \param theDeltaX the delta for X coordinate is moved @@ -68,6 +67,9 @@ class SketchPlugin_Circle : public SketchPlugin_SketchEntity /// Called on change of any argument-attribute of this object SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID); + /// Returns the AIS preview + virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious); + /// Use plugin manager for features creation SketchPlugin_Circle(); diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml index 79de2c5d7..dbe93b228 100644 --- a/src/SketchPlugin/plugin-Sketch.xml +++ b/src/SketchPlugin/plugin-Sketch.xml @@ -27,13 +27,29 @@ - - - - - + + + + + + + + + + + + + + + + + -- 2.39.2