X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintParallel.cpp;h=42ce74b78572f01ad5a9af1544e639eca8544320;hb=64fc7e4fdd63997ec7a502b233ef5f88186d5bbb;hp=15cc861adfcdc6874905818d2d48d5b69926050d;hpb=5d9f5c6e19b94b5b2c4bf8d314b7f7f1c6f49897;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintParallel.cpp b/src/SketchPlugin/SketchPlugin_ConstraintParallel.cpp index 15cc861ad..42ce74b78 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintParallel.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintParallel.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: SketchPlugin_ConstraintParallel.cpp // Created: 26 May 2014 // Author: Artem ZHIDKOV @@ -6,13 +8,20 @@ #include #include +#include #include #include +#include + #include #include #include +#include +#include + +#include SketchPlugin_ConstraintParallel::SketchPlugin_ConstraintParallel() { @@ -20,66 +29,25 @@ SketchPlugin_ConstraintParallel::SketchPlugin_ConstraintParallel() void SketchPlugin_ConstraintParallel::initAttributes() { - data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::type()); - data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefAttr::type()); - data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::type()); + data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId()); + data()->addAttribute(SketchPlugin_Constraint::ENTITY_B(), ModelAPI_AttributeRefAttr::typeId()); + //data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::typeId()); } void SketchPlugin_ConstraintParallel::execute() { } -const boost::shared_ptr& SketchPlugin_ConstraintParallel::preview() -{ - /// \todo Preview for parallel constraint - return getPreview(); -} - - -boost::shared_ptr SketchPlugin_ConstraintParallel::getAISObject( - boost::shared_ptr thePrevious) +AISObjectPtr SketchPlugin_ConstraintParallel::getAISObject(AISObjectPtr thePrevious) { if (!sketch()) return thePrevious; - boost::shared_ptr aData = data(); - boost::shared_ptr anAttr1 = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Constraint::ENTITY_A())); - boost::shared_ptr anAttr2 = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Constraint::ENTITY_B())); - if (!anAttr1 || !anAttr1->isFeature() || - !anAttr2 || !anAttr2->isFeature()) - return thePrevious; - boost::shared_ptr aLine1Feature = - boost::dynamic_pointer_cast(anAttr1->feature()); - boost::shared_ptr aLine2Feature = - boost::dynamic_pointer_cast(anAttr2->feature()); - if (!aLine1Feature || !aLine2Feature) - return thePrevious; - - boost::shared_ptr aPlane = sketch()->plane(); - boost::shared_ptr aLine1 = aLine1Feature->preview(); - boost::shared_ptr aLine2 = aLine2Feature->preview(); - - boost::shared_ptr aFlyoutAttr = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - boost::shared_ptr aFlyoutPnt = sketch()->to3D(aFlyoutAttr->x(), aFlyoutAttr->y()); - - boost::shared_ptr anAIS = thePrevious; - if (!anAIS) - anAIS = boost::shared_ptr(new GeomAPI_AISObject); - anAIS->createParallel(aLine1, aLine2, aFlyoutPnt, aPlane); + AISObjectPtr anAIS = thePrevious; + if (!anAIS) { + anAIS = SketcherPrs_Factory::parallelConstraint(this, sketch()->coordinatePlane()); + } return anAIS; } -void SketchPlugin_ConstraintParallel::move(double theDeltaX, double theDeltaY) -{ - boost::shared_ptr aData = data(); - if (!aData->isValid()) - return; - - boost::shared_ptr aPoint = - boost::dynamic_pointer_cast(aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - aPoint->setValue(aPoint->x() + theDeltaX, aPoint->y() + theDeltaY); -}