X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Circle.cpp;h=635214f42fa39c3b70a7b92fcc0ce11aee90397e;hb=53df1b33d7d3787a433f8e4f3936eed28850c48b;hp=a99677bf870d14cbb594bafd482c1e38e69eb01b;hpb=82f94d044ced40be786427ddee839e3c263fe277;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Circle.cpp b/src/SketchPlugin/SketchPlugin_Circle.cpp index a99677bf8..635214f42 100644 --- a/src/SketchPlugin/SketchPlugin_Circle.cpp +++ b/src/SketchPlugin/SketchPlugin_Circle.cpp @@ -16,14 +16,14 @@ #include SketchPlugin_Circle::SketchPlugin_Circle() - : SketchPlugin_Feature() + : SketchPlugin_Feature() { } void SketchPlugin_Circle::initAttributes() { - data()->addAttribute(CIRCLE_ATTR_CENTER, GeomDataAPI_Point2D::type()); - data()->addAttribute(CIRCLE_ATTR_RADIUS, ModelAPI_AttributeDouble::type()); + data()->addAttribute(SketchPlugin_Circle::CENTER_ID(), GeomDataAPI_Point2D::type()); + data()->addAttribute(SketchPlugin_Circle::RADIUS_ID(), ModelAPI_AttributeDouble::type()); } void SketchPlugin_Circle::execute() @@ -33,35 +33,49 @@ void SketchPlugin_Circle::execute() std::list > aShapes; // compute a circle point in 3D view - boost::shared_ptr aCenterAttr = - boost::dynamic_pointer_cast(data()->attribute(CIRCLE_ATTR_CENTER)); - AttributeDoublePtr aRadiusAttr = - boost::dynamic_pointer_cast(data()->attribute(CIRCLE_ATTR_RADIUS)); + boost::shared_ptr aCenterAttr = boost::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(SketchPlugin_Circle::CENTER_ID())); + AttributeDoublePtr aRadiusAttr = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Circle::RADIUS_ID())); if (aCenterAttr->isInitialized() && aRadiusAttr->isInitialized()) { boost::shared_ptr aCenter(aSketch->to3D(aCenterAttr->x(), aCenterAttr->y())); // make a visible point boost::shared_ptr aCenterPointShape = GeomAlgoAPI_PointBuilder::point(aCenter); - aShapes.push_back(aCenterPointShape); + //aShapes.push_back(aCenterPointShape); + boost::shared_ptr aConstr1 = document()->createConstruction( + data(), 0); + aConstr1->setShape(aCenterPointShape); + aConstr1->setIsInHistory(false); + setResult(aConstr1, 0); // make a visible circle - boost::shared_ptr aNDir = - boost::dynamic_pointer_cast(aSketch->data()->attribute(SKETCH_ATTR_NORM)); + boost::shared_ptr aNDir = boost::dynamic_pointer_cast( + aSketch->data()->attribute(SketchPlugin_Sketch::NORM_ID())); bool aHasPlane = aNDir && !(aNDir->x() == 0 && aNDir->y() == 0 && aNDir->z() == 0); if (aHasPlane) { boost::shared_ptr aNormal(new GeomAPI_Dir(aNDir->x(), aNDir->y(), aNDir->z())); // compute the circle radius double aRadius = aRadiusAttr->value(); - boost::shared_ptr aCircleShape = - GeomAlgoAPI_EdgeBuilder::lineCircle(aCenter, aNormal, aRadius); + boost::shared_ptr aCircleShape = GeomAlgoAPI_EdgeBuilder::lineCircle( + aCenter, aNormal, aRadius); aShapes.push_back(aCircleShape); + boost::shared_ptr aConstr2 = document()->createConstruction( + data(), 1); + aConstr2->setShape(aCircleShape); + aConstr2->setIsInHistory(false); + setResult(aConstr2, 1); } } - boost::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aShapes); - // store the result - boost::shared_ptr aConstr = document()->createConstruction(); - aConstr->setShape(aCompound); - setResult(aConstr); + /* + boost::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aShapes); + // store the result + boost::shared_ptr aConstr = + document()->createConstruction(data()); + aConstr->setShape(aCompound); + aConstr->setIsInHistory(false); + setResult(aConstr); + */ } } @@ -71,16 +85,16 @@ void SketchPlugin_Circle::move(double theDeltaX, double theDeltaY) if (!aData->isValid()) return; - boost::shared_ptr aPoint1 = - boost::dynamic_pointer_cast(aData->attribute(CIRCLE_ATTR_CENTER)); + boost::shared_ptr aPoint1 = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Circle::CENTER_ID())); aPoint1->setValue(aPoint1->x() + theDeltaX, aPoint1->y() + theDeltaY); } double SketchPlugin_Circle::distanceToPoint(const boost::shared_ptr& thePoint) { boost::shared_ptr aData = data(); - boost::shared_ptr aPoint = - boost::dynamic_pointer_cast(aData->attribute(CIRCLE_ATTR_CENTER)); + boost::shared_ptr aPoint = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Circle::CENTER_ID())); return aPoint->pnt()->distance(thePoint); }