From: azv Date: Mon, 1 Feb 2016 13:25:36 +0000 (+0300) Subject: Creating a circle by 3 points X-Git-Tag: V_2.2.0~169 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cba7009cf317edc3f92cf2ae3f5d729c171dea3a;p=modules%2Fshaper.git Creating a circle by 3 points --- 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 000000000..7c1fc4907 Binary files /dev/null and b/src/PartSet/icons/circle_3pt_32x32.png differ 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 000000000..d7621a943 Binary files /dev/null and b/src/PartSet/icons/circle_pt_rad_32x32.png differ 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 @@ - - - - - + + + + + + + + + + + + + + + + +