X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintLength.cpp;h=06cf90cb77f4ae0bd4a29de0bfbc8efab441f9a9;hb=a24b7e6f4d112d5e7889fd76f030298fc428cd01;hp=5799a3a1284fd0c0cf7d12b6cd2e37341ccb0436;hpb=976244bad37e04fcebaf8866d7d7a02efd2b7d35;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp index 5799a3a12..06cf90cb7 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: SketchPlugin_ConstraintLength.cpp // Created: 30 May 2014 // Author: Artem ZHIDKOV @@ -24,9 +26,9 @@ SketchPlugin_ConstraintLength::SketchPlugin_ConstraintLength() void SketchPlugin_ConstraintLength::initAttributes() { - data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::type()); - data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::type()); - data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::type()); + data()->addAttribute(SketchPlugin_Constraint::VALUE(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT(), GeomDataAPI_Point2D::typeId()); + data()->addAttribute(SketchPlugin_Constraint::ENTITY_A(), ModelAPI_AttributeRefAttr::typeId()); } void SketchPlugin_ConstraintLength::execute() @@ -48,46 +50,78 @@ void SketchPlugin_ConstraintLength::execute() //if(!aValueAttr->isInitialized()) { // aValueAttr->setValue(aLenght); //} + + // the value should to be computed here, not in the getAISObject in order to change the model value + // inside the object transaction. This is important for creating a constraint by preselection. + // The display of the presentation in this case happens after the transaction commit + AttributePtr aFlyOutAttribute = data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()); + if (!aFlyOutAttribute->isInitialized()) { + compute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()); + } } } -AISObjectPtr SketchPlugin_ConstraintLength::getAISObject(AISObjectPtr thePrevious) +bool SketchPlugin_ConstraintLength::compute(const std::string& theAttributeId) { - if (!sketch()) - return thePrevious; + if (theAttributeId != SketchPlugin_Constraint::FLYOUT_VALUE_PNT()) + return false; - std::shared_ptr aPlane = sketch()->plane(); + std::shared_ptr aPoint1, aPoint2; + std::shared_ptr aStartPoint, anEndPoint; + if (!getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) + return false; + + std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(data()->attribute(theAttributeId)); + + std::shared_ptr aLine = + std::shared_ptr(new GeomAPI_Lin2d(aStartPoint->pnt(), anEndPoint->pnt())); + double aDist = aPoint1->distance(aPoint2)/5.; + std::shared_ptr aFPnt = aLine->shiftedLocation(aDist); + aFlyOutAttr->setValue(aFPnt); + + return true; +} +bool SketchPlugin_ConstraintLength::getPoints( + std::shared_ptr& thePoint1, std::shared_ptr& thePoint2, + std::shared_ptr& theStartPoint, + std::shared_ptr& theEndPoint) +{ + if (!sketch()) + return false; + std::shared_ptr aPlane = sketch()->plane(); std::shared_ptr anAttr = std::dynamic_pointer_cast< ModelAPI_AttributeRefAttr>(data()->attribute(SketchPlugin_Constraint::ENTITY_A())); if (!anAttr) - return thePrevious; + return false; FeaturePtr aFeature = ModelAPI_Feature::feature(anAttr->object()); if (!aFeature || aFeature->getKind() != SketchPlugin_Line::ID()) - return thePrevious; - - std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< - GeomDataAPI_Point2D>(data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - + return false; DataPtr aData = aFeature->data(); - std::shared_ptr aStartPoint = std::dynamic_pointer_cast< + theStartPoint = std::dynamic_pointer_cast< GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Line::START_ID())); - std::shared_ptr anEndPoint = std::dynamic_pointer_cast< + theEndPoint = std::dynamic_pointer_cast< GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Line::END_ID())); + thePoint1 = sketch()->to3D(theStartPoint->x(), theStartPoint->y()); + thePoint2 = sketch()->to3D(theEndPoint->x(), theEndPoint->y()); + return true; +} - std::shared_ptr aPoint1 = sketch()->to3D(aStartPoint->x(), aStartPoint->y()); - std::shared_ptr aPoint2 = sketch()->to3D(anEndPoint->x(), anEndPoint->y()); - std::shared_ptr aFlyoutPnt = std::shared_ptr(); - if (aFlyOutAttr->isInitialized()) { - aFlyoutPnt = sketch()->to3D(aFlyOutAttr->x(), aFlyOutAttr->y()); - } else { - std::shared_ptr aLine = - std::shared_ptr(new GeomAPI_Lin2d(aStartPoint->pnt(), anEndPoint->pnt())); - double aDist = aPoint1->distance(aPoint2)/5.; - std::shared_ptr aFPnt = aLine->shiftedLocation(aDist); - aFlyOutAttr->setValue(aFPnt); - aFlyoutPnt = sketch()->to3D(aFPnt->x(), aFPnt->y()); +AISObjectPtr SketchPlugin_ConstraintLength::getAISObject(AISObjectPtr thePrevious) +{ + std::shared_ptr aPoint1, aPoint2; + std::shared_ptr aStartPoint, anEndPoint; + if (!getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) + return thePrevious; // not possible to show length because points are not defined + + AttributePtr aFlyOutAttribute = data()->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()); + if (!aFlyOutAttribute->isInitialized()) { + return thePrevious; // not possible to show length because points are not defined } + std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< + GeomDataAPI_Point2D>(aFlyOutAttribute); + std::shared_ptr aFlyoutPnt = sketch()->to3D(aFlyOutAttr->x(), aFlyOutAttr->y()); // value calculation // TODO: has to be calculated on definition of reference object double aDistance = aPoint1->distance(aPoint2); @@ -103,10 +137,12 @@ AISObjectPtr SketchPlugin_ConstraintLength::getAISObject(AISObjectPtr thePreviou AISObjectPtr anAIS = thePrevious; if (!anAIS) anAIS = AISObjectPtr(new GeomAPI_AISObject); + std::shared_ptr aPlane = sketch()->plane(); anAIS->createDistance(aPoint1, aPoint2, aFlyoutPnt, aPlane, aValue); // Set color from preferences - std::vector aRGB = Config_PropManager::color("Visualization", "length_color", LENGTH_COLOR); + std::vector aRGB = Config_PropManager::color("Visualization", "sketch_dimension_color", + SKETCH_DIMENSION_COLOR); anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]); return anAIS; } @@ -122,3 +158,18 @@ void SketchPlugin_ConstraintLength::move(double theDeltaX, double theDeltaY) aPoint->move(theDeltaX, theDeltaY); } +void SketchPlugin_ConstraintLength::attributeChanged(const std::string& theID) { + if (theID == SketchPlugin_Constraint::ENTITY_A()) + { + std::shared_ptr aValueAttr = std::dynamic_pointer_cast< + ModelAPI_AttributeDouble>(data()->attribute(SketchPlugin_Constraint::VALUE())); + if (!aValueAttr->isInitialized()) { // only if it is not initialized, try to compute the current value + std::shared_ptr aPoint1, aPoint2; + std::shared_ptr aStartPoint, anEndPoint; + if (getPoints(aPoint1, aPoint2, aStartPoint, anEndPoint)) { + double aLength = aPoint1->distance(aPoint2); + aValueAttr->setValue(aLength); + } + } + } +}