X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintDistance.cpp;h=bdd410ec06de64bf7fb35e2f163e16f8c3de869b;hb=c685af45eca598fce4a5d40837f6b7d203c60976;hp=65c6cf9cee8a0fdb5e2b5f7d5bbb245bc45a6933;hpb=f0b06ecd8aa266c1a8731c0e81226f0221497302;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp b/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp index 65c6cf9ce..bdd410ec0 100644 --- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp +++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: SketchPlugin_ConstraintDistance.cpp // Created: 23 May 2014 // Author: Artem ZHIDKOV @@ -32,35 +34,14 @@ void SketchPlugin_ConstraintDistance::initAttributes() //************************************************************************************* void SketchPlugin_ConstraintDistance::execute() { - boost::shared_ptr aData = data(); - AttributeDoublePtr anAttrValue = boost::dynamic_pointer_cast( + std::shared_ptr aData = data(); + AttributeDoublePtr anAttrValue = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Constraint::VALUE())); if(anAttrValue->isInitialized()) return; - boost::shared_ptr aPointA = - getFeaturePoint(aData, SketchPlugin_Constraint::ENTITY_A()); - boost::shared_ptr aPointB = - getFeaturePoint(aData, SketchPlugin_Constraint::ENTITY_B()); - double aDistance = -1.; - if (aPointA && aPointB) { // both points - aDistance = aPointA->pnt()->distance(aPointB->pnt()); - } else { - if (!aPointA && aPointB) { //Line and point - boost::shared_ptr aLine = - getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_A()); - if (aLine) { - aDistance = aLine->distanceToPoint(aPointB->pnt()); - } - } else if (aPointA && !aPointB) { // Point and line - boost::shared_ptr aLine = - getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_B()); - if (aLine) { - aDistance = aLine->distanceToPoint(aPointA->pnt()); - } - } - } + double aDistance = calculateCurrentDistance(); if(aDistance >= 0) { anAttrValue->setValue(aDistance); } @@ -72,29 +53,29 @@ AISObjectPtr SketchPlugin_ConstraintDistance::getAISObject(AISObjectPtr thePrevi if (!sketch()) return thePrevious; - boost::shared_ptr aPlane = sketch()->plane(); + std::shared_ptr aPlane = sketch()->plane(); DataPtr aData = data(); - boost::shared_ptr aPoint_A = getFeaturePoint( + std::shared_ptr aPoint_A = getFeaturePoint( aData, SketchPlugin_Constraint::ENTITY_A()); - boost::shared_ptr aPoint_B = getFeaturePoint( + std::shared_ptr aPoint_B = getFeaturePoint( aData, SketchPlugin_Constraint::ENTITY_B()); - boost::shared_ptr aPnt_A; - boost::shared_ptr aPnt_B; + std::shared_ptr aPnt_A; + std::shared_ptr aPnt_B; if (aPoint_A && aPoint_B) { aPnt_A = aPoint_A->pnt(); aPnt_B = aPoint_B->pnt(); } else if (!aPoint_A && aPoint_B) { - boost::shared_ptr aLine = getFeatureLine( + std::shared_ptr aLine = getFeatureLine( aData, SketchPlugin_Constraint::ENTITY_A()); if (aLine) { aPnt_B = aPoint_B->pnt(); aPnt_A = getProjectionPoint(aLine, aPnt_B); } } else if (aPoint_A && !aPoint_B) { - boost::shared_ptr aLine = getFeatureLine( + std::shared_ptr aLine = getFeatureLine( aData, SketchPlugin_Constraint::ENTITY_B()); if (aLine) { aPnt_A = aPoint_A->pnt(); @@ -102,27 +83,32 @@ AISObjectPtr SketchPlugin_ConstraintDistance::getAISObject(AISObjectPtr thePrevi } } if (!aPnt_A || !aPnt_B) - return thePrevious; + return AISObjectPtr(); - boost::shared_ptr aFlyOutAttr = boost::dynamic_pointer_cast< + std::shared_ptr aFlyOutAttr = std::dynamic_pointer_cast< GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - boost::shared_ptr aPoint1 = sketch()->to3D(aPnt_A->x(), aPnt_A->y()); - boost::shared_ptr aPoint2 = sketch()->to3D(aPnt_B->x(), aPnt_B->y()); - boost::shared_ptr aFlyoutPnt = boost::shared_ptr(); + std::shared_ptr aPoint1 = sketch()->to3D(aPnt_A->x(), aPnt_A->y()); + std::shared_ptr aPoint2 = sketch()->to3D(aPnt_B->x(), aPnt_B->y()); + std::shared_ptr aFlyoutPnt = std::shared_ptr(); if(aFlyOutAttr->isInitialized()) { aFlyoutPnt = sketch()->to3D(aFlyOutAttr->x(), aFlyOutAttr->y()); } else { - boost::shared_ptr aLine = boost::shared_ptr(new GeomAPI_Lin2d(aPnt_A, aPnt_B)); + std::shared_ptr aLine = std::shared_ptr(new GeomAPI_Lin2d(aPnt_A, aPnt_B)); double aDist = aPoint1->distance(aPoint2)/5.; - boost::shared_ptr aFPnt = aLine->shiftedLocation(aDist); + std::shared_ptr aFPnt = aLine->shiftedLocation(aDist); aFlyOutAttr->setValue(aFPnt); aFlyoutPnt = sketch()->to3D(aFPnt->x(), aFPnt->y()); } // value calculation - boost::shared_ptr aValueAttr = boost::dynamic_pointer_cast< + std::shared_ptr aValueAttr = std::dynamic_pointer_cast< ModelAPI_AttributeDouble>(aData->attribute(SketchPlugin_Constraint::VALUE())); - double aValue = aValueAttr->value(); + double aValue = 0; + // Issue #196: checking the positivity of the distance constraint + // there is a validator for a distance constraint, that the value should be positive + // in case if an invalid value is set, the current distance value is shown + if (aValueAttr->isInitialized()) + aValue = aValueAttr->value(); AISObjectPtr anAIS = thePrevious; if (!anAIS) @@ -139,70 +125,115 @@ AISObjectPtr SketchPlugin_ConstraintDistance::getAISObject(AISObjectPtr thePrevi //************************************************************************************* void SketchPlugin_ConstraintDistance::move(double theDeltaX, double theDeltaY) { - boost::shared_ptr aData = data(); + std::shared_ptr aData = data(); if (!aData->isValid()) return; - boost::shared_ptr aPoint1 = boost::dynamic_pointer_cast( + std::shared_ptr aPoint = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT())); - aPoint1->setValue(aPoint1->x() + theDeltaX, aPoint1->y() + theDeltaY); + aPoint->move(theDeltaX, theDeltaY); +} + +double SketchPlugin_ConstraintDistance::calculateCurrentDistance() const +{ + double aDistance = -1.; + + std::shared_ptr aData = data(); + std::shared_ptr aPointA = + getFeaturePoint(aData, SketchPlugin_Constraint::ENTITY_A()); + std::shared_ptr aPointB = + getFeaturePoint(aData, SketchPlugin_Constraint::ENTITY_B()); + + if (aPointA && aPointB) { // both points + aDistance = aPointA->pnt()->distance(aPointB->pnt()); + } else { + if (!aPointA && aPointB) { //Line and point + std::shared_ptr aLine = + getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_A()); + if (aLine) { + aDistance = aLine->distanceToPoint(aPointB->pnt()); + } + } else if (aPointA && !aPointB) { // Point and line + std::shared_ptr aLine = + getFeatureLine(aData, SketchPlugin_Constraint::ENTITY_B()); + if (aLine) { + aDistance = aLine->distanceToPoint(aPointA->pnt()); + } + } + } + return aDistance; +} + +void SketchPlugin_ConstraintDistance::attributeChanged(const std::string& theID) { + if (theID == SketchPlugin_Constraint::ENTITY_A() || + theID == SketchPlugin_Constraint::ENTITY_B()) + { + 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 + double aDistance = calculateCurrentDistance(); + if (aDistance > 0) { // set as value the length of updated references + aValueAttr->setValue(aDistance); + } + } + } } //************************************************************************************* -boost::shared_ptr getFeaturePoint(DataPtr theData, +std::shared_ptr getFeaturePoint(DataPtr theData, const std::string& theAttribute) { - boost::shared_ptr aPointAttr; + std::shared_ptr aPointAttr; if (!theData) return aPointAttr; FeaturePtr aFeature; - boost::shared_ptr anAttr = boost::dynamic_pointer_cast< + std::shared_ptr anAttr = std::dynamic_pointer_cast< ModelAPI_AttributeRefAttr>(theData->attribute(theAttribute)); if (anAttr) aFeature = ModelAPI_Feature::feature(anAttr->object()); if (aFeature && aFeature->getKind() == SketchPlugin_Point::ID()) - aPointAttr = boost::dynamic_pointer_cast( + aPointAttr = std::dynamic_pointer_cast( aFeature->data()->attribute(SketchPlugin_Point::COORD_ID())); else if (aFeature && aFeature->getKind() == SketchPlugin_Circle::ID()) - aPointAttr = boost::dynamic_pointer_cast( + aPointAttr = std::dynamic_pointer_cast( aFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID())); else if (anAttr->attr()) { - aPointAttr = boost::dynamic_pointer_cast(anAttr->attr()); + aPointAttr = std::dynamic_pointer_cast(anAttr->attr()); } return aPointAttr; } //************************************************************************************* -boost::shared_ptr getFeatureLine(DataPtr theData, +std::shared_ptr getFeatureLine(DataPtr theData, const std::string& theAttribute) { - boost::shared_ptr aLine; + std::shared_ptr aLine; if (!theData) return aLine; - boost::shared_ptr anAttr = boost::dynamic_pointer_cast< + std::shared_ptr anAttr = std::dynamic_pointer_cast< ModelAPI_AttributeRefAttr>(theData->attribute(theAttribute)); if (anAttr) { FeaturePtr aFeature = ModelAPI_Feature::feature(anAttr->object()); if (aFeature && aFeature->getKind() == SketchPlugin_Line::ID()) { - aLine = boost::dynamic_pointer_cast(aFeature); + aLine = std::dynamic_pointer_cast(aFeature); } } return aLine; } //************************************************************************************* -boost::shared_ptr getProjectionPoint( - const boost::shared_ptr& theLine, - const boost::shared_ptr& thePoint) +std::shared_ptr getProjectionPoint( + const std::shared_ptr& theLine, + const std::shared_ptr& thePoint) { - boost::shared_ptr aData = theLine->data(); - boost::shared_ptr aPoint1 = boost::dynamic_pointer_cast( + std::shared_ptr aData = theLine->data(); + std::shared_ptr aPoint1 = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Line::START_ID())); - boost::shared_ptr aPoint2 = boost::dynamic_pointer_cast( + std::shared_ptr aPoint2 = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Line::END_ID())); GeomAPI_Lin2d aLin2d(aPoint1->x(), aPoint1->y(), aPoint2->x(), aPoint2->y());