const double PI =3.141592653589793238463;
-static const std::string& INVERSED_ID()
-{
- static const std::string MY_INVERSED_ID("InversedArc");
- return MY_INVERSED_ID;
-}
-
SketchPlugin_Arc::SketchPlugin_Arc()
: SketchPlugin_SketchEntity()
{
myParamBefore = 0;
}
-void SketchPlugin_Arc::initAttributes()
+void SketchPlugin_Arc::initDerivedClassAttributes()
{
- SketchPlugin_SketchEntity::initAttributes();
-
data()->addAttribute(CENTER_ID(), GeomDataAPI_Point2D::typeId());
data()->addAttribute(START_ID(), GeomDataAPI_Point2D::typeId());
std::shared_ptr<GeomDataAPI_Point2D> anEndAttr = std::dynamic_pointer_cast<
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) {
+ if(0 <= myParamBefore && myParamBefore <= PI / 2.0
+ && PI * 1.5 <= aParameterNew && aParameterNew <= PI * 2.0) {
isInversed->setValue(true);
- } else if(PI * 1.5 < myParamBefore && myParamBefore <= PI * 2.0
- && 0 < aParameterNew && aParameterNew <= PI / 2.0) {
+ } else if(PI * 1.5 <= myParamBefore && myParamBefore <= PI * 2.0
+ && 0 <= aParameterNew && aParameterNew <= PI / 2.0) {
isInversed->setValue(false);
}
}
new GeomAPI_Circ2d(aCenterAttr->pnt(), aStartAttr->pnt()));
std::shared_ptr<GeomAPI_Pnt2d> aProjection = aCircleForArc->project(anEndAttr->pnt());
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());
+ if (!isStable()) { // issue #855: trying to update only not-updated coordinate if it is possible
+ if (fabs(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 (fabs(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);
}
myEndUpdate = false;
}
}
+
+void SketchPlugin_Arc::setReversed(bool isReversed)
+{
+ std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(attribute(INVERSED_ID()))->setValue(isReversed);
+ myParamBefore = 0.0;
+}
+
+bool SketchPlugin_Arc::isReversed()
+{
+ return std::dynamic_pointer_cast<ModelAPI_AttributeBoolean>(attribute(INVERSED_ID()))->value();
+}