#include <ModelAPI_Validator.h>
#include <ModelAPI_Session.h>
+#include <GeomAPI_Ax2.h>
#include <GeomAPI_Circ2d.h>
#include <GeomAPI_Circ.h>
#include <GeomAPI_Pnt2d.h>
#include <GeomAlgoAPI_PointBuilder.h>
#include <GeomAlgoAPI_EdgeBuilder.h>
#include <GeomAlgoAPI_CompoundBuilder.h>
+// for sqrt on Linux
+#include <math.h>
const double tolerance = 1e-7;
+const double paramTolerance = 1.e-4;
+const double PI =3.141592653589793238463;
SketchPlugin_Arc::SketchPlugin_Arc()
: SketchPlugin_SketchEntity()
{
myStartUpdate = false;
myEndUpdate = false;
+ // default values
+ myXEndBefore = 0;
+ myYEndBefore = 0;
+
+ myForwardDirection = true;
+ myParamBefore = 0;
}
void SketchPlugin_Arc::initAttributes()
data()->addAttribute(CENTER_ID(), GeomDataAPI_Point2D::typeId());
data()->addAttribute(START_ID(), GeomDataAPI_Point2D::typeId());
- data()->addAttribute(END_ID(), GeomDataAPI_Point2D::typeId());
+ std::shared_ptr<GeomDataAPI_Point2D> anEndAttr = std::dynamic_pointer_cast<
+ GeomDataAPI_Point2D>(data()->addAttribute(END_ID(), GeomDataAPI_Point2D::typeId()));
data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId());
ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXTERNAL_ID());
+
+ // get the initial values
+ if (anEndAttr->isInitialized()) {
+ myXEndBefore = anEndAttr->x();
+ myYEndBefore = anEndAttr->y();
+ }
}
void SketchPlugin_Arc::execute()
*/
std::shared_ptr<GeomAPI_Pnt> aEndPoint(aSketch->to3D(anEndAttr->x(), anEndAttr->y()));
- std::shared_ptr<GeomAPI_Shape> aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircleArc(
- aCenter, aStartPoint, aEndPoint, aNormal);
+ std::shared_ptr<GeomAPI_Dir> anXDir(new GeomAPI_Dir(aStartPoint->xyz()->decreased(aCenter->xyz())));
+ std::shared_ptr<GeomAPI_Ax2> anAx2(new GeomAPI_Ax2(aCenter, aNormal, anXDir));
+ std::shared_ptr<GeomAPI_Circ> aCirc(new GeomAPI_Circ(anAx2, aCenter->distance(aStartPoint)));
+ double aParameterNew = 0.0;
+ if(aCirc->parameter(aEndPoint, paramTolerance, aParameterNew)) {
+ if(0 < myParamBefore && myParamBefore <= PI / 2.0
+ && PI * 1.5 < aParameterNew && aParameterNew <= PI * 2.0) {
+ myForwardDirection = false;
+ } else if(PI * 1.5 < myParamBefore && myParamBefore <= PI * 2.0
+ && 0 < aParameterNew && aParameterNew <= PI / 2.0) {
+ myForwardDirection = true;
+ }
+ }
+ myParamBefore = aParameterNew;
+
+ std::shared_ptr<GeomAPI_Shape> aCircleShape;
+ if(myForwardDirection) {
+ aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircleArc(aCenter, aStartPoint, aEndPoint, aNormal);
+ } else {
+ aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircleArc(aCenter, aEndPoint, aStartPoint, aNormal);
+ }
+
if (aCircleShape) {
std::shared_ptr<ModelAPI_ResultConstruction> aConstr2 = document()->createConstruction(
data(), 1);
aPoint1->move(theDeltaX, theDeltaY);
}
-double SketchPlugin_Arc::distanceToPoint(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
-{
- double aDelta = 0;
- std::shared_ptr<ModelAPI_Data> aData = data();
-
- std::shared_ptr<GeomDataAPI_Point2D> aPoint1 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aData->attribute(SketchPlugin_Arc::CENTER_ID()));
- aDelta = aPoint1->pnt()->distance(thePoint);
-
- std::shared_ptr<GeomDataAPI_Point2D> aPoint2 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aData->attribute(SketchPlugin_Arc::START_ID()));
- double aDistance = aPoint2->pnt()->distance(thePoint);
- if (aDelta < aDistance)
- aDelta = aDistance;
-
- std::shared_ptr<GeomDataAPI_Point2D> aPoint3 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aData->attribute(SketchPlugin_Arc::END_ID()));
- aDistance = aPoint3->pnt()->distance(thePoint);
- if (aDelta < aDistance)
- aDelta = aDistance;
-
- return aDelta;
-}
-
bool SketchPlugin_Arc::isFixed() {
return data()->selection(EXTERNAL_ID())->context().get() != NULL;
}
GeomDataAPI_Point2D>(data()->attribute(START_ID()));
std::shared_ptr<GeomDataAPI_Point2D> anEndAttr = std::dynamic_pointer_cast<
GeomDataAPI_Point2D>(data()->attribute(END_ID()));
- if (theID == EXTERNAL_ID()) {
+ // the second condition for unability to move external segments anywhere
+ if (theID == EXTERNAL_ID() || isFixed()) {
std::shared_ptr<GeomAPI_Shape> aSelection = data()->selection(EXTERNAL_ID())->value();
// update arguments due to the selection value
if (aSelection && !aSelection->isNull() && aSelection->isEdge()) {
std::shared_ptr<GeomAPI_Circ2d> aCircleForArc(
new GeomAPI_Circ2d(aCenterAttr->pnt(), aStartAttr->pnt()));
std::shared_ptr<GeomAPI_Pnt2d> aProjection = aCircleForArc->project(anEndAttr->pnt());
- if (aProjection && anEndAttr->pnt()->distance(aProjection) > tolerance)
+ if (aProjection && anEndAttr->pnt()->distance(aProjection) > tolerance) {
+ // issue #855: trying to update only not-updated coordinate if it is possible
+ /*
+ if (abs(myXEndBefore - anEndAttr->x()) < 1.e-10) { // keep Y unchanged
+ double aVy = aCenterAttr->y() - anEndAttr->y();
+ double aVy2 = aVy * aVy;
+ double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
+ if (aVy2 <= aR2) {
+ double aDX = sqrt(aR2 - aVy * aVy);
+ if (anEndAttr->x() > aCenterAttr->x())
+ aProjection->setX(aCenterAttr->x() + aDX);
+ else
+ aProjection->setX(aCenterAttr->x() - aDX);
+ aProjection->setY(anEndAttr->y());
+ }
+ } else if (abs(myYEndBefore - anEndAttr->y()) < 1.e-10) { // keep X unchanged
+ double aVx = aCenterAttr->x() - anEndAttr->x();
+ double aVx2 = aVx * aVx;
+ double aR2 = aCircleForArc->radius() * aCircleForArc->radius();
+ if (aVx2 <= aR2) {
+ double aDY = sqrt(aR2 - aVx * aVx);
+ if (anEndAttr->y() > aCenterAttr->y())
+ aProjection->setY(aCenterAttr->y() + aDY);
+ else
+ aProjection->setY(aCenterAttr->y() - aDY);
+ aProjection->setX(anEndAttr->x());
+ }
+ }*/
+
anEndAttr->setValue(aProjection);
+ }
+ myXEndBefore = anEndAttr->x();
+ myYEndBefore = anEndAttr->y();
myEndUpdate = false;
} else if (theID == START_ID() && !myStartUpdate) {
myStartUpdate = true;
- // compute and change the arc end point
+ // compute and change the arc start point
std::shared_ptr<GeomAPI_Circ2d> aCircleForArc(
new GeomAPI_Circ2d(aCenterAttr->pnt(), anEndAttr->pnt()));
std::shared_ptr<GeomAPI_Pnt2d> aProjection = aCircleForArc->project(aStartAttr->pnt());