X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FSketchAPI%2FSketchAPI_Sketch.cpp;h=a93c26e05a1f586beb5f48ff95fd9ec369ea28c7;hb=bb4ab20a1f03f936d4d8511eb9e9733ee965bb72;hp=b3b26c0d0dce7468c026f8837b7d5bf6bb5c61e7;hpb=5a67842979db286af5bb5015fe413d8b06c6587e;p=modules%2Fshaper.git diff --git a/src/SketchAPI/SketchAPI_Sketch.cpp b/src/SketchAPI/SketchAPI_Sketch.cpp index b3b26c0d0..a93c26e05 100644 --- a/src/SketchAPI/SketchAPI_Sketch.cpp +++ b/src/SketchAPI/SketchAPI_Sketch.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SketchAPI_Sketch.h" @@ -25,6 +24,8 @@ #include #include #include +#include +#include #include #include #include @@ -41,6 +42,7 @@ #include #include //-------------------------------------------------------------------------------------- +#include #include #include #include @@ -51,11 +53,16 @@ #include //-------------------------------------------------------------------------------------- #include "SketchAPI_Arc.h" -#include "SketchAPI_MacroArc.h" +#include "SketchAPI_BSpline.h" #include "SketchAPI_Circle.h" +#include "SketchAPI_Ellipse.h" +#include "SketchAPI_EllipticArc.h" #include "SketchAPI_IntersectionPoint.h" #include "SketchAPI_Line.h" +#include "SketchAPI_MacroArc.h" #include "SketchAPI_MacroCircle.h" +#include "SketchAPI_MacroEllipse.h" +#include "SketchAPI_MacroEllipticArc.h" #include "SketchAPI_Mirror.h" #include "SketchAPI_Point.h" #include "SketchAPI_Projection.h" @@ -63,6 +70,16 @@ #include "SketchAPI_Rotation.h" #include "SketchAPI_Translation.h" //-------------------------------------------------------------------------------------- +#include +#include +#include +#include +#include +#include + +#include +#include +//-------------------------------------------------------------------------------------- SketchAPI_Sketch::SketchAPI_Sketch( const std::shared_ptr & theFeature) : ModelHighAPI_Interface(theFeature) @@ -121,6 +138,25 @@ void SketchAPI_Sketch::setPlane(const std::shared_ptr & thePlane) execute(); } +void SketchAPI_Sketch::setPlane(const ModelHighAPI_Selection & thePlane, + bool theRemoveExternalDependency) +{ + FeaturePtr aSketch = feature(); + + DocumentPtr aDoc = aSketch->document(); + bool useVisible = false; + FeaturePtr aCurFeatureBefore = aDoc->currentFeature(useVisible); + aDoc->setCurrentFeature(aSketch, useVisible); + + if (theRemoveExternalDependency) + aSketch->customAction(SketchPlugin_Sketch::ACTION_REMOVE_EXTERNAL()); + + setExternal(thePlane); + + aDoc->setCurrentFeature(aCurFeatureBefore, useVisible); +} + +//-------------------------------------------------------------------------------------- void SketchAPI_Sketch::setExternal(const ModelHighAPI_Selection & theExternal) { fillAttribute(theExternal, myexternal); @@ -197,6 +233,78 @@ SketchPtr addSketch(const std::shared_ptr & thePart, } +//-------------------------------------------------------------------------------------- +std::list< std::shared_ptr > SketchAPI_Sketch::getFreePoints() +{ + std::list< std::shared_ptr > aFreePoints; + std::list aPoints = SketcherPrs_Tools::getFreePoints(compositeFeature()); + for (std::list::iterator anIt = aPoints.begin(); anIt != aPoints.end(); ++anIt) { + FeaturePtr aFeature = ModelAPI_Feature::feature(*anIt); + PointPtr aPoint(new SketchAPI_Point(aFeature)); + aFreePoints.push_back(aPoint); + } + return aFreePoints; +} + +//-------------------------------------------------------------------------------------- +static GeomCurvePtr untrimmedCurve(GeomShapePtr theShape) +{ + GeomCurvePtr aCurve(new GeomAPI_Curve(theShape)); + if (aCurve->isTrimmed()) + aCurve = aCurve->basisCurve(); + return aCurve; +} + +void SketchAPI_Sketch::changeFacesOrder( + const std::list >& theFaces) +{ + // collect faces of the sketch + ResultConstructionPtr aSketchResult = + std::dynamic_pointer_cast(feature()->lastResult()); + if (!aSketchResult) { + // sketch is nested to a boolean operation, thus, it has no result yet. + feature()->execute(); + aSketchResult = + std::dynamic_pointer_cast(feature()->lastResult()); + } + std::list aFaces; + int aFacesNum = aSketchResult->facesNum(); + for (int i = 0; i < aFacesNum; ++i) + aFaces.push_back(aSketchResult->face(i)); + // find new faces order according to the given lists of edges + std::list aNewFacesOrder; + std::list >::const_iterator anIt = theFaces.begin(); + for (; anIt != theFaces.end(); ++anIt) { + // find the appropriate face + std::list::iterator aFIt = aFaces.begin(); + for (; aFIt != aFaces.end(); ++aFIt) { + std::list::const_iterator aEdgeIt = anIt->begin(); + GeomAPI_ShapeExplorer aFExp(*aFIt, GeomAPI_Shape::EDGE); + for (; aEdgeIt != anIt->end() && aFExp.more(); ++aEdgeIt, aFExp.next()) { + ResultPtr aCurRes = aEdgeIt->resultSubShapePair().first; + if (!aCurRes) + break; + GeomCurvePtr aCurve1 = untrimmedCurve(aCurRes->shape()); + GeomCurvePtr aCurve2 = untrimmedCurve(aFExp.current()); + if (!aCurve1->isEqual(aCurve2)) + break; + } + + if (aEdgeIt == anIt->end() && !aFExp.more()) { + // face is found + aNewFacesOrder.push_back(*aFIt); + aFaces.erase(aFIt); + break; + } + } + } + // place the rest faces at the end of new faces list + if (!aFaces.empty()) + aNewFacesOrder.insert(aNewFacesOrder.end(), aFaces.begin(), aFaces.end()); + // update the result of the sketch with the new order of faces + aSketchResult->setFacesOrder(aNewFacesOrder); +} + //-------------------------------------------------------------------------------------- std::shared_ptr SketchAPI_Sketch::addPoint( double theX, double theY) @@ -228,18 +336,24 @@ std::shared_ptr SketchAPI_Sketch::addPoint(const std::string & //-------------------------------------------------------------------------------------- std::shared_ptr SketchAPI_Sketch::addIntersectionPoint( - const ModelHighAPI_Selection & theExternal) + const ModelHighAPI_Selection & theExternal, + bool theKeepResult) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_IntersectionPoint::ID()); - return IntersectionPointPtr(new SketchAPI_IntersectionPoint(aFeature, theExternal)); + IntersectionPointPtr anIntersection(new SketchAPI_IntersectionPoint(aFeature, theExternal)); + anIntersection->setIncludeToResult(theKeepResult); + return anIntersection; } std::shared_ptr SketchAPI_Sketch::addIntersectionPoint( - const std::string & theExternalName) + const std::string & theExternalName, + bool theKeepResult) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_IntersectionPoint::ID()); - return IntersectionPointPtr(new SketchAPI_IntersectionPoint(aFeature, theExternalName)); + IntersectionPointPtr anIntersection(new SketchAPI_IntersectionPoint(aFeature, theExternalName)); + anIntersection->setIncludeToResult(theKeepResult); + return anIntersection; } //-------------------------------------------------------------------------------------- @@ -359,7 +473,6 @@ std::shared_ptr std::shared_ptr SketchAPI_Sketch::addCircle(const std::string & theExternalName) { - // TODO(spo): Add constraint SketchConstraintRigid like in PythonAPI. Is it necessary? std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_Circle::ID()); return CirclePtr(new SketchAPI_Circle(aFeature, theExternalName)); @@ -416,22 +529,33 @@ std::shared_ptr SketchAPI_Sketch::addArc( std::shared_ptr SketchAPI_Sketch::addArc( const ModelHighAPI_RefAttr& theTangentPoint, double theEndX, double theEndY, - bool theInversed) + bool theInversed, + bool theTransversal) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_MacroArc::ID()); - return MacroArcPtr(new SketchAPI_MacroArc( - aFeature, theTangentPoint, theEndX, theEndY, theInversed)); + MacroArcPtr aMacroArc(new SketchAPI_MacroArc(aFeature)); + if (theTransversal) + aMacroArc->setByTransversal(theTangentPoint, theEndX, theEndY, theInversed); + else + aMacroArc->setByTangent(theTangentPoint, theEndX, theEndY, theInversed); + return aMacroArc; } std::shared_ptr SketchAPI_Sketch::addArc( const ModelHighAPI_RefAttr& theTangentPoint, const std::shared_ptr& theEnd, - bool theInversed) + bool theInversed, + bool theTransversal) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_MacroArc::ID()); - return MacroArcPtr(new SketchAPI_MacroArc(aFeature, theTangentPoint, theEnd, theInversed)); + MacroArcPtr aMacroArc(new SketchAPI_MacroArc(aFeature)); + if (theTransversal) + aMacroArc->setByTransversal(theTangentPoint, theEnd, theInversed); + else + aMacroArc->setByTangent(theTangentPoint, theEnd, theInversed); + return aMacroArc; } std::shared_ptr SketchAPI_Sketch::addArc(const ModelHighAPI_Selection & theExternal) @@ -443,27 +567,184 @@ std::shared_ptr SketchAPI_Sketch::addArc(const ModelHighAPI_Selec std::shared_ptr SketchAPI_Sketch::addArc(const std::string & theExternalName) { - // TODO(spo): Add constraint SketchConstraintRigid like in PythonAPI. Is it necessary? std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_Arc::ID()); return ArcPtr(new SketchAPI_Arc(aFeature, theExternalName)); } +//-------------------------------------------------------------------------------------- +std::shared_ptr SketchAPI_Sketch::addEllipse( + double theCenterX, double theCenterY, + double theFocusX, double theFocusY, + double theMinorRadius) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_Ellipse::ID()); + return EllipsePtr(new SketchAPI_Ellipse(aFeature, + theCenterX, theCenterY, theFocusX, theFocusY, theMinorRadius)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipse( + const std::shared_ptr& theCenter, + const std::shared_ptr& theFocus, + double theMinorRadius) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_Ellipse::ID()); + return EllipsePtr(new SketchAPI_Ellipse(aFeature, theCenter, theFocus, theMinorRadius)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipse( + double thePoint1X, double thePoint1Y, + double thePoint2X, double thePoint2Y, + double thePassedX, double thePassedY, + bool isPoint1Center) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_MacroEllipse::ID()); + return MacroEllipsePtr(new SketchAPI_MacroEllipse(aFeature, + thePoint1X, thePoint1Y, thePoint2X, thePoint2Y, thePassedX, thePassedY, isPoint1Center)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipse( + const std::pair, ModelHighAPI_RefAttr>& thePoint1, + const std::pair, ModelHighAPI_RefAttr>& thePoint2, + const std::pair, ModelHighAPI_RefAttr>& thePassedPoint, + bool isPoint1Center) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_MacroEllipse::ID()); + MacroEllipsePtr anEllipse; + if (thePoint1.second.isEmpty() && + thePoint2.second.isEmpty() && + thePassedPoint.second.isEmpty()) { + anEllipse.reset(new SketchAPI_MacroEllipse(aFeature, + thePoint1.first, thePoint2.first, thePassedPoint.first, isPoint1Center)); + } + else { + anEllipse.reset(new SketchAPI_MacroEllipse(aFeature, + thePoint1.first, thePoint1.second, + thePoint2.first, thePoint2.second, + thePassedPoint.first, thePassedPoint.second, + isPoint1Center)); + } + return anEllipse; +} + +std::shared_ptr SketchAPI_Sketch::addEllipse( + const ModelHighAPI_Selection & theExternal) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_Ellipse::ID()); + return EllipsePtr(new SketchAPI_Ellipse(aFeature, theExternal)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipse( + const std::string & theExternalName) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_Ellipse::ID()); + return EllipsePtr(new SketchAPI_Ellipse(aFeature, theExternalName)); +} + +//-------------------------------------------------------------------------------------- +std::shared_ptr SketchAPI_Sketch::addEllipticArc( + double theCenterX, double theCenterY, + double theFocusX, double theFocusY, + double theStartX, double theStartY, + double theEndX, double theEndY, + bool theInversed) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_EllipticArc::ID()); + return EllipticArcPtr(new SketchAPI_EllipticArc(aFeature, + theCenterX, theCenterY, + theFocusX, theFocusY, + theStartX, theStartY, + theEndX, theEndY, + theInversed)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipticArc( + const std::pair, ModelHighAPI_RefAttr>& theCenter, + const std::pair, ModelHighAPI_RefAttr>& theMajorAxisPoint, + const std::pair, ModelHighAPI_RefAttr>& theStartPoint, + const std::pair, ModelHighAPI_RefAttr>& theEndPoint, + bool theInversed) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_MacroEllipticArc::ID()); + return MacroEllipticArcPtr(new SketchAPI_MacroEllipticArc(aFeature, + theCenter.first, theCenter.second, + theMajorAxisPoint.first, theMajorAxisPoint.second, + theStartPoint.first, theStartPoint.second, + theEndPoint.first, theEndPoint.second, + theInversed)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipticArc( + const ModelHighAPI_Selection & theExternal) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_EllipticArc::ID()); + return EllipticArcPtr(new SketchAPI_EllipticArc(aFeature, theExternal)); +} + +std::shared_ptr SketchAPI_Sketch::addEllipticArc( + const std::string & theExternalName) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_EllipticArc::ID()); + return EllipticArcPtr(new SketchAPI_EllipticArc(aFeature, theExternalName)); +} + +//-------------------------------------------------------------------------------------- + +std::shared_ptr SketchAPI_Sketch::addSpline( + const ModelHighAPI_Selection & external, + const int degree, + const std::list >& poles, + const std::list& weights, + const std::list& knots, + const std::list& multiplicities, + const bool periodic) +{ + FeaturePtr aFeature = compositeFeature()->addFeature( + periodic ? SketchPlugin_BSplinePeriodic::ID() : SketchPlugin_BSpline::ID()); + + BSplinePtr aBSpline(periodic ? new SketchAPI_BSplinePeriodic(aFeature) + : new SketchAPI_BSpline(aFeature)); + if (external.variantType() != ModelHighAPI_Selection::VT_Empty) + aBSpline->setByExternal(external); + else if (knots.empty() || multiplicities.empty()) + aBSpline->setByDegreePolesAndWeights(degree, poles, weights); + else + aBSpline->setByParameters(degree, poles, weights, knots, multiplicities); + + return aBSpline; +} + //-------------------------------------------------------------------------------------- std::shared_ptr SketchAPI_Sketch::addProjection( - const ModelHighAPI_Selection & theExternalFeature) + const ModelHighAPI_Selection & theExternalFeature, + bool theKeepResult) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_Projection::ID()); - return ProjectionPtr(new SketchAPI_Projection(aFeature, theExternalFeature)); + ProjectionPtr aProjection(new SketchAPI_Projection(aFeature, theExternalFeature)); + aProjection->setIncludeToResult(theKeepResult); + return aProjection; } std::shared_ptr SketchAPI_Sketch::addProjection( - const std::string & theExternalName) + const std::string & theExternalName, + bool theKeepResult) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_Projection::ID()); - return ProjectionPtr(new SketchAPI_Projection(aFeature, theExternalName)); + ProjectionPtr aProjection(new SketchAPI_Projection(aFeature, theExternalName)); + aProjection->setIncludeToResult(theKeepResult); + return aProjection; } //-------------------------------------------------------------------------------------- @@ -496,13 +777,14 @@ std::shared_ptr SketchAPI_Sketch::addRotation( const ModelHighAPI_RefAttr & theCenter, const ModelHighAPI_Double & theAngle, const ModelHighAPI_Integer & theNumberOfObjects, - bool theFullValue) + bool theFullValue, + bool theReversed) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_MultiRotation::ID()); return RotationPtr( new SketchAPI_Rotation(aFeature, theObjects, theCenter, - theAngle, theNumberOfObjects, theFullValue)); + theAngle, theNumberOfObjects, theFullValue, theReversed)); } //-------------------------------------------------------------------------------------- @@ -545,16 +827,38 @@ std::shared_ptr SketchAPI_Sketch::addTrim( std::shared_ptr SketchAPI_Sketch::setAngle( const ModelHighAPI_RefAttr & theLine1, const ModelHighAPI_RefAttr & theLine2, - const ModelHighAPI_Double & theValue) + const ModelHighAPI_Double & theValue, + const std::string& theType) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_ConstraintAngle::ID()); - fillAttribute(SketcherPrs_Tools::ANGLE_DIRECT, - aFeature->integer(SketchPlugin_ConstraintAngle::TYPE_ID())); - // fill the value before llines to avoid calculation of angle value by the Angle feature - fillAttribute(theValue, aFeature->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID())); + + const int aVersion = theType.empty() ? SketchPlugin_ConstraintAngle::THE_VERSION_0 + : SketchPlugin_ConstraintAngle::THE_VERSION_1; + fillAttribute(aVersion, aFeature->integer(SketchPlugin_ConstraintAngle::VERSION_ID())); + + int aType = (int)SketcherPrs_Tools::ANGLE_DIRECT; + fillAttribute(aType, aFeature->integer(SketchPlugin_ConstraintAngle::PREV_TYPE_ID())); + fillAttribute(aType, aFeature->integer(SketchPlugin_ConstraintAngle::TYPE_ID())); + + if (aVersion == SketchPlugin_ConstraintAngle::THE_VERSION_0) + fillAttribute(theValue, aFeature->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID())); + fillAttribute(theLine1, aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())); fillAttribute(theLine2, aFeature->refattr(SketchPlugin_Constraint::ENTITY_B())); + + if (aVersion == SketchPlugin_ConstraintAngle::THE_VERSION_1) { + std::string aTypeLC = theType; + std::transform(aTypeLC.begin(), aTypeLC.end(), aTypeLC.begin(), ::tolower); + if (aTypeLC == "supplementary") + aType = (int)SketcherPrs_Tools::ANGLE_COMPLEMENTARY; + else if (aTypeLC == "backward") + aType = (int)SketcherPrs_Tools::ANGLE_BACKWARD; + + fillAttribute(aType, aFeature->integer(SketchPlugin_ConstraintAngle::TYPE_ID())); + fillAttribute(theValue, aFeature->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID())); + } + aFeature->execute(); return InterfacePtr(new ModelHighAPI_Interface(aFeature)); } @@ -566,12 +870,13 @@ std::shared_ptr SketchAPI_Sketch::setAngleComplementary( { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_ConstraintAngle::ID()); + fillAttribute(SketchPlugin_ConstraintAngle::THE_VERSION_0, + aFeature->integer(SketchPlugin_ConstraintAngle::VERSION_ID())); fillAttribute(SketcherPrs_Tools::ANGLE_COMPLEMENTARY, aFeature->integer(SketchPlugin_ConstraintAngle::TYPE_ID())); fillAttribute(theValue, aFeature->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID())); fillAttribute(theLine1, aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())); fillAttribute(theLine2, aFeature->refattr(SketchPlugin_Constraint::ENTITY_B())); -// fillAttribute(theValue, aFeature->real(SketchPlugin_Constraint::VALUE())); aFeature->execute(); return InterfacePtr(new ModelHighAPI_Interface(aFeature)); } @@ -583,12 +888,13 @@ std::shared_ptr SketchAPI_Sketch::setAngleBackward( { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_ConstraintAngle::ID()); + fillAttribute(SketchPlugin_ConstraintAngle::THE_VERSION_0, + aFeature->integer(SketchPlugin_ConstraintAngle::VERSION_ID())); fillAttribute(SketcherPrs_Tools::ANGLE_BACKWARD, aFeature->integer(SketchPlugin_ConstraintAngle::TYPE_ID())); fillAttribute(theValue, aFeature->real(SketchPlugin_ConstraintAngle::ANGLE_VALUE_ID())); fillAttribute(theLine1, aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())); fillAttribute(theLine2, aFeature->refattr(SketchPlugin_Constraint::ENTITY_B())); -// fillAttribute(theValue, aFeature->real(SketchPlugin_Constraint::VALUE())); aFeature->execute(); return InterfacePtr(new ModelHighAPI_Interface(aFeature)); } @@ -620,13 +926,61 @@ std::shared_ptr SketchAPI_Sketch::setCollinear( std::shared_ptr SketchAPI_Sketch::setDistance( const ModelHighAPI_RefAttr & thePoint, const ModelHighAPI_RefAttr & thePointOrLine, - const ModelHighAPI_Double & theValue) + const ModelHighAPI_Double & theValue, + bool isSigned) { std::shared_ptr aFeature = compositeFeature()->addFeature(SketchPlugin_ConstraintDistance::ID()); fillAttribute(thePoint, aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())); fillAttribute(thePointOrLine, aFeature->refattr(SketchPlugin_Constraint::ENTITY_B())); fillAttribute(theValue, aFeature->real(SketchPlugin_Constraint::VALUE())); + fillAttribute(isSigned, aFeature->boolean(SketchPlugin_ConstraintDistance::SIGNED())); + aFeature->execute(); + return InterfacePtr(new ModelHighAPI_Interface(aFeature)); +} + +std::shared_ptr SketchAPI_Sketch::setSignedDistance( + const ModelHighAPI_RefAttr & thePoint, + const ModelHighAPI_RefAttr & thePointOrLine, + const ModelHighAPI_Double & theValue) +{ + return setDistance(thePoint, thePointOrLine, theValue, true); +} + +std::shared_ptr SketchAPI_Sketch::setUnsignedDistance( + const ModelHighAPI_RefAttr & thePoint, + const ModelHighAPI_RefAttr & thePointOrLine, + const ModelHighAPI_Double & theValue) +{ + return setDistance(thePoint, thePointOrLine, theValue, false); +} + +std::shared_ptr SketchAPI_Sketch::setHorizontalDistance( + const ModelHighAPI_RefAttr & thePoint1, + const ModelHighAPI_RefAttr & thePoint2, + const ModelHighAPI_Double & theValue) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_ConstraintDistanceHorizontal::ID()); + fillAttribute(thePoint1, aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())); + fillAttribute(thePoint2, aFeature->refattr(SketchPlugin_Constraint::ENTITY_B())); + fillAttribute(theValue, + aFeature->real(SketchPlugin_ConstraintDistanceAlongDir::DISTANCE_VALUE_ID())); + aFeature->execute(); + return InterfacePtr(new ModelHighAPI_Interface(aFeature)); +} + +std::shared_ptr SketchAPI_Sketch::setVerticalDistance( + const ModelHighAPI_RefAttr & thePoint1, + const ModelHighAPI_RefAttr & thePoint2, + const ModelHighAPI_Double & theValue) +{ + std::shared_ptr aFeature = + compositeFeature()->addFeature(SketchPlugin_ConstraintDistanceVertical::ID()); + fillAttribute(thePoint1, aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())); + fillAttribute(thePoint2, aFeature->refattr(SketchPlugin_Constraint::ENTITY_B())); + fillAttribute(theValue, + aFeature->real(SketchPlugin_ConstraintDistanceAlongDir::DISTANCE_VALUE_ID())); aFeature->execute(); return InterfacePtr(new ModelHighAPI_Interface(aFeature)); } @@ -775,6 +1129,155 @@ std::shared_ptr SketchAPI_Sketch::setVertical( //-------------------------------------------------------------------------------------- +static std::shared_ptr pointCoordinates(const AttributePtr& thePoint) +{ + AttributePoint2DPtr aPnt = std::dynamic_pointer_cast(thePoint); + return aPnt ? aPnt->pnt() : std::shared_ptr(); +} + +static std::shared_ptr middlePointOnLine(const FeaturePtr& theFeature) +{ + AttributePoint2DPtr aStartAttr = std::dynamic_pointer_cast( + theFeature->attribute(SketchPlugin_Line::START_ID())); + AttributePoint2DPtr aEndAttr = std::dynamic_pointer_cast( + theFeature->attribute(SketchPlugin_Line::END_ID())); + + if (!aStartAttr || !aEndAttr) + return std::shared_ptr(); + + std::shared_ptr aStartPoint = aStartAttr->pnt()->xy(); + std::shared_ptr aEndPoint = aEndAttr->pnt()->xy(); + return std::shared_ptr( + new GeomAPI_Pnt2d(aStartPoint->added(aEndPoint)->multiplied(0.5))); +} + +static std::shared_ptr pointOnCircle(const FeaturePtr& theFeature) +{ + AttributePoint2DPtr aCenter = std::dynamic_pointer_cast( + theFeature->attribute(SketchPlugin_Circle::CENTER_ID())); + AttributeDoublePtr aRadius = theFeature->real(SketchPlugin_Circle::RADIUS_ID()); + + if (!aCenter || !aRadius) + return std::shared_ptr(); + + return std::shared_ptr( + new GeomAPI_Pnt2d(aCenter->x() + aRadius->value(), aCenter->y())); +} + +static std::shared_ptr middlePointOnArc(const FeaturePtr& theFeature) +{ + static const double PI = 3.141592653589793238463; + + AttributePoint2DPtr aCenterAttr = std::dynamic_pointer_cast( + theFeature->attribute(SketchPlugin_Arc::CENTER_ID())); + AttributePoint2DPtr aStartAttr = std::dynamic_pointer_cast( + theFeature->attribute(SketchPlugin_Arc::START_ID())); + AttributePoint2DPtr aEndAttr = std::dynamic_pointer_cast( + theFeature->attribute(SketchPlugin_Arc::END_ID())); + + if (!aCenterAttr || !aStartAttr || !aEndAttr) + return std::shared_ptr(); + + std::shared_ptr aStartDir(new GeomAPI_Dir2d( + aStartAttr->x() - aCenterAttr->x(), aStartAttr->y() - aCenterAttr->y())); + std::shared_ptr aEndDir(new GeomAPI_Dir2d( + aEndAttr->x() - aCenterAttr->x(), aEndAttr->y() - aCenterAttr->y())); + + double anAngle = aStartDir->angle(aEndDir); + bool isReversed = theFeature->boolean(SketchPlugin_Arc::REVERSED_ID())->value(); + if (isReversed && anAngle > 0.) + anAngle -= 2.0 * PI; + else if (!isReversed && anAngle <= 0.) + anAngle += 2.0 * PI; + + double cosA = cos(anAngle); + double sinA = sin(anAngle); + + // rotate start dir to find middle point on arc + double aRadius = aStartAttr->pnt()->distance(aCenterAttr->pnt()); + double x = aCenterAttr->x() + aRadius * (aStartDir->x() * cosA - aStartDir->y() * sinA); + double y = aCenterAttr->y() + aRadius * (aStartDir->x() * sinA + aStartDir->y() * cosA); + + return std::shared_ptr(new GeomAPI_Pnt2d(x, y)); +} + +static std::shared_ptr pointOnEllipse(const FeaturePtr& theFeature, + bool isEllipse = true) +{ + const std::string& anAttrName = isEllipse ? SketchPlugin_Ellipse::MAJOR_AXIS_END_ID() : + SketchPlugin_EllipticArc::MAJOR_AXIS_END_ID(); + AttributePoint2DPtr aMajorAxisEnd = std::dynamic_pointer_cast( + theFeature->attribute(anAttrName)); + return aMajorAxisEnd ? aMajorAxisEnd->pnt() : std::shared_ptr(); +} + +static std::shared_ptr middlePointOnBSpline(const FeaturePtr& theFeature, + const CompositeFeaturePtr& theSketch) +{ + GeomAPI_Edge anEdge(theFeature->lastResult()->shape()); + GeomPointPtr aMiddle = anEdge.middlePoint(); + + std::shared_ptr aSketch = + std::dynamic_pointer_cast(theSketch); + return aSketch->to2D(aMiddle); +} + +static std::shared_ptr middlePoint(const ObjectPtr& theObject, + const CompositeFeaturePtr& theSketch) +{ + std::shared_ptr aMiddlePoint; + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + if (aFeature) { + // move only features of the following types + const std::string& aFeatureKind = aFeature->getKind(); + if (aFeatureKind == SketchPlugin_Point::ID()) + aMiddlePoint = pointCoordinates(aFeature->attribute(SketchPlugin_Point::COORD_ID())); + else if (aFeatureKind == SketchPlugin_Line::ID()) + aMiddlePoint = middlePointOnLine(aFeature); + else if (aFeatureKind == SketchPlugin_Circle::ID()) + aMiddlePoint = pointOnCircle(aFeature); + else if (aFeatureKind == SketchPlugin_Arc::ID()) + aMiddlePoint = middlePointOnArc(aFeature); + else if (aFeatureKind == SketchPlugin_Ellipse::ID()) + aMiddlePoint = pointOnEllipse(aFeature); + else if (aFeatureKind == SketchPlugin_EllipticArc::ID()) + aMiddlePoint = pointOnEllipse(aFeature, false); + else if (aFeatureKind == SketchPlugin_BSpline::ID() || + aFeatureKind == SketchPlugin_BSplinePeriodic::ID()) + aMiddlePoint = middlePointOnBSpline(aFeature, theSketch); + } + return aMiddlePoint; +} + +void SketchAPI_Sketch::move(const ModelHighAPI_RefAttr& theMovedEntity, + const std::shared_ptr& theTargetPoint) +{ + std::shared_ptr aMessage(new ModelAPI_ObjectMovedMessage); + theMovedEntity.fillMessage(aMessage); + + std::shared_ptr anOriginalPosition; + if (aMessage->movedAttribute()) + anOriginalPosition = pointCoordinates(aMessage->movedAttribute()); + else + anOriginalPosition = middlePoint(aMessage->movedObject(), compositeFeature()); + + if (!anOriginalPosition) + return; // something has gone wrong, do not process movement + + aMessage->setOriginalPosition(anOriginalPosition); + aMessage->setCurrentPosition(theTargetPoint); + Events_Loop::loop()->send(aMessage); +} + +void SketchAPI_Sketch::move(const ModelHighAPI_RefAttr& theMovedEntity, + double theTargetX, double theTargetY) +{ + std::shared_ptr aTargetPoint(new GeomAPI_Pnt2d(theTargetX, theTargetY)); + move(theMovedEntity, aTargetPoint); +} + +//-------------------------------------------------------------------------------------- + std::shared_ptr SketchAPI_Sketch::to2D(const std::shared_ptr& thePoint) { FeaturePtr aBase = feature(); @@ -791,6 +1294,99 @@ std::shared_ptr SketchAPI_Sketch::to2D(const std::shared_ptr anEdges1; + for (GeomAPI_ShapeExplorer anExp(theFace1, GeomAPI_Shape::EDGE); anExp.more(); anExp.next()) + anEdges1.push_back(anExp.current()); + // compare edges of faces + for (GeomAPI_ShapeExplorer anExp(theFace2, GeomAPI_Shape::EDGE); anExp.more(); anExp.next()) { + GeomShapePtr aCurrent = anExp.current(); + bool isFound = false; + std::list::iterator anIt1 = anEdges1.begin(); + for (; anIt1 != anEdges1.end(); ++anIt1) + if (aCurrent->isSameGeometry(*anIt1)) { + isFound = true; + anEdges1.erase(anIt1); + break; + } + if (!isFound) + return true; + } + return !anEdges1.empty(); +} + +static bool isCustomFacesOrder(CompositeFeaturePtr theSketch) +{ + ResultConstructionPtr aSketchResult = + std::dynamic_pointer_cast(theSketch->lastResult()); + if (!aSketchResult) + return false; + + std::shared_ptr aWires = + std::dynamic_pointer_cast(aSketchResult->shape()); + if (!aWires) + return false; + + // collect faces constructed by SketchBuilder algorithm + GeomAlgoAPI_SketchBuilder aSketchBuilder(aWires->origin(), aWires->dirX(), + aWires->norm(), aWires); + const ListOfShape& aFaces = aSketchBuilder.faces(); + + // compare faces stored in sketch with faces generated by SketchBuilder + int aNbSketchFaces = aSketchResult->facesNum(); + int aFaceIndex = 0; + for (ListOfShape::const_iterator aFIt = aFaces.begin(); + aFIt != aFaces.end() && aFaceIndex < aNbSketchFaces; + ++aFIt, ++aFaceIndex) { + GeomFacePtr aSketchFace = aSketchResult->face(aFaceIndex); + GeomFacePtr aCurFace = (*aFIt)->face(); + if (isDifferent(aSketchFace, aCurFace)) + return true; + } + return false; +} + +static void edgesOfSketchFaces(CompositeFeaturePtr theSketch, + std::list >& theEdges) +{ + ResultConstructionPtr aSketchResult = + std::dynamic_pointer_cast(theSketch->lastResult()); + if (!aSketchResult) + return; + + // collect curves of the sketch + std::map aCurves; + int aSubNum = theSketch->numberOfSubs(); + for (int a = 0; a < aSubNum; ++a) { + FeaturePtr aSub = theSketch->subFeature(a); + const std::list& aResults = aSub->results(); + std::list::const_iterator aRes = aResults.cbegin(); + for (; aRes != aResults.cend(); aRes++) { + GeomShapePtr aCurShape = (*aRes)->shape(); + if (aCurShape && aCurShape->isEdge()) + aCurves[untrimmedCurve(aCurShape)] = *aRes; + } + } + + // convert each face to the list of results of its edges + int aFacesNum = aSketchResult->facesNum(); + for (int a = 0; a < aFacesNum; ++a) { + theEdges.push_back(std::list()); + std::list& aCurEdges = theEdges.back(); + + GeomFacePtr aFace = aSketchResult->face(a); + for (GeomAPI_ShapeExplorer anExp(aFace, GeomAPI_Shape::EDGE); + anExp.more(); anExp.next()) { + GeomCurvePtr aCurrent = untrimmedCurve(anExp.current()); + aCurEdges.push_back(aCurves[aCurrent]); + } + } +} + +//-------------------------------------------------------------------------------------- + void SketchAPI_Sketch::dump(ModelHighAPI_Dumper& theDumper) const { FeaturePtr aBase = feature(); @@ -850,4 +1446,26 @@ void SketchAPI_Sketch::dump(ModelHighAPI_Dumper& theDumper) const // dump sketch's subfeatures CompositeFeaturePtr aCompFeat = std::dynamic_pointer_cast(aBase); theDumper.processSubs(aCompFeat, true); + + // if face order differs to the order generated by SketchBuilder, + // dump the list of faces for correct execution of the script + if (isCustomFacesOrder(aCompFeat)) { + std::list > aFaces; + edgesOfSketchFaces(aCompFeat, aFaces); + + const std::string& aSketchName = theDumper.name(aBase); + std::string aMethodName(".changeFacesOrder"); + std::string aSpaceShift(aSketchName.size() + aMethodName.size(), ' '); + + theDumper << aSketchName << aMethodName << "(["; + for (std::list >::iterator aFIt = aFaces.begin(); + aFIt != aFaces.end(); ++aFIt) { + if (aFIt != aFaces.begin()) + theDumper << ",\n" << aSpaceShift << " "; + theDumper << *aFIt; + } + theDumper << "\n" << aSpaceShift << " ])" << std::endl; + // call model.do() for correct update of the document's labels related to the changed faces + theDumper << "model.do()" << std::endl; + } }