+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
// File: SketchPlugin_Arc.cpp
// Created: 26 Apr 2014
// Author: Artem ZHIDKOV
#include <ModelAPI_Session.h>
#include <GeomAPI_Circ2d.h>
+#include <GeomAPI_Circ.h>
#include <GeomAPI_Pnt2d.h>
#include <GeomDataAPI_Point2D.h>
#include <GeomDataAPI_Dir.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;
SketchPlugin_Arc::SketchPlugin_Arc()
- : SketchPlugin_Feature()
+ : SketchPlugin_SketchEntity()
{
myStartUpdate = false;
myEndUpdate = false;
+ // default values
+ myXEndBefore = 0;
+ myYEndBefore = 0;
}
void SketchPlugin_Arc::initAttributes()
{
- data()->addAttribute(CENTER_ID(), GeomDataAPI_Point2D::type());
- data()->addAttribute(START_ID(), GeomDataAPI_Point2D::type());
- data()->addAttribute(END_ID(), GeomDataAPI_Point2D::type());
- data()->addAttribute(EXTERNAL_ID(), ModelAPI_AttributeSelection::type());
+ 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<
+ 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()
if (!anAIS)
anAIS = AISObjectPtr(new GeomAPI_AISObject);
anAIS->createShape(aCompound);
+ anAIS->setWidth(3);
return anAIS;
}
}
if (!aData->isValid())
return;
- std::shared_ptr<GeomDataAPI_Point2D> aPoint1 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aData->attribute(SketchPlugin_Arc::CENTER_ID()));
- aPoint1->move(theDeltaX, theDeltaY);
-
myStartUpdate = true;
myEndUpdate = true;
std::shared_ptr<GeomDataAPI_Point2D> aPoint2 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
aPoint3->move(theDeltaX, theDeltaY);
myStartUpdate = false;
myEndUpdate = false;
+
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint1 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aData->attribute(SketchPlugin_Arc::CENTER_ID()));
+ aPoint1->move(theDeltaX, theDeltaY);
}
double SketchPlugin_Arc::distanceToPoint(const std::shared_ptr<GeomAPI_Pnt2d>& thePoint)
}
bool SketchPlugin_Arc::isFixed() {
- return data()->selection(EXTERNAL_ID())->context();
+ return data()->selection(EXTERNAL_ID())->context().get() != NULL;
}
bool SketchPlugin_Arc::isFeatureValid()
{
std::shared_ptr<GeomDataAPI_Point2D> aCenterAttr = std::dynamic_pointer_cast<
GeomDataAPI_Point2D>(data()->attribute(CENTER_ID()));
- if (!aCenterAttr->isInitialized())
- return;
std::shared_ptr<GeomDataAPI_Point2D> aStartAttr = std::dynamic_pointer_cast<
GeomDataAPI_Point2D>(data()->attribute(START_ID()));
- if (!aStartAttr->isInitialized())
- return;
std::shared_ptr<GeomDataAPI_Point2D> anEndAttr = std::dynamic_pointer_cast<
GeomDataAPI_Point2D>(data()->attribute(END_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_Edge> anEdge( new GeomAPI_Edge(aSelection));
+ std::shared_ptr<GeomAPI_Circ> aCirc = anEdge->circle();
+ if (aCirc.get()) {
+ aStartAttr->setValue(sketch()->to2D(anEdge->firstPoint()));
+ anEndAttr->setValue(sketch()->to2D(anEdge->lastPoint()));
+ aCenterAttr->setValue(sketch()->to2D(aCirc->center()));
+ }
+ }
+ return;
+ }
+ if (!aCenterAttr->isInitialized())
+ return;
+ if (!aStartAttr->isInitialized())
+ return;
if (!anEndAttr->isInitialized())
return;
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());
if (aProjection && aStartAttr->pnt()->distance(aProjection) > tolerance)
aStartAttr->setValue(aProjection);
myStartUpdate = false;
+ } else if (theID == CENTER_ID() && !myEndUpdate) {
+ myEndUpdate = true;
+ // compute and change the arc end point
+ 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)
+ anEndAttr->setValue(aProjection);
+ myEndUpdate = false;
}
}
