X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketcherPrs%2FSketcherPrs_PositionMgr.cpp;h=7aacd2002093c332c992a444deaac12f75898e03;hb=c02fae5493cc6d56c9a1db3bdcf6d872f88fea07;hp=51796972caa61b15eafaae8d8422a27ebf7d29e1;hpb=b4d12f91513b9b8c014d71f29e5d2657d08b2320;p=modules%2Fshaper.git diff --git a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp b/src/SketcherPrs/SketcherPrs_PositionMgr.cpp index 51796972c..7aacd2002 100644 --- a/src/SketcherPrs/SketcherPrs_PositionMgr.cpp +++ b/src/SketcherPrs/SketcherPrs_PositionMgr.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,33 +12,35 @@ // // 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 "SketcherPrs_PositionMgr.h" #include "SketcherPrs_Tools.h" -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include #include -#include -#include #include -#include +#include +#include +#include #include +#include -#include #include #include +#include #include #include @@ -60,7 +62,6 @@ SketcherPrs_PositionMgr::SketcherPrs_PositionMgr() { } - int SketcherPrs_PositionMgr::getPositionIndex(ObjectPtr theLine, const SketcherPrs_SymbolPrs* thePrs) { @@ -88,17 +89,8 @@ int SketcherPrs_PositionMgr::getPositionIndex(ObjectPtr theLine, bool SketcherPrs_PositionMgr::isPntConstraint(const std::string& theName) { - static std::list aConstraints; - if (aConstraints.size() == 0) { - aConstraints.push_back(SketchPlugin_ConstraintTangent::ID()); - aConstraints.push_back(SketchPlugin_ConstraintPerpendicular::ID()); - } - std::list::const_iterator aIt; - for (aIt = aConstraints.cbegin(); aIt != aConstraints.cend(); ++aIt) { - if ((*aIt) == theName) - return true; - } - return false; + return ((theName == SketchPlugin_ConstraintTangent::ID()) || + (theName == SketchPlugin_ConstraintPerpendicular::ID())); } bool containsPoint(const FeaturePtr& theFeature, GeomPnt2dPtr thePnt2d, GeomPointPtr thePos) @@ -140,7 +132,7 @@ bool containsPoint(const FeaturePtr& theFeature, GeomPnt2dPtr thePnt2d, GeomPoin return false; } -int SketcherPrs_PositionMgr::getPositionIndex(GeomPointPtr thePos, +const std::array& SketcherPrs_PositionMgr::getPositionIndex(GeomPointPtr thePos, const SketcherPrs_SymbolPrs* thePrs) { if (myPntShapes.count(thePrs->feature()) == 0) { @@ -151,39 +143,46 @@ int SketcherPrs_PositionMgr::getPositionIndex(GeomPointPtr thePos, int aNbSubs = aOwner->numberOfSubs(); int aId = 0; + std::list aFeaList; for (int i = 0; i < aNbSubs; i++) { FeaturePtr aFeature = aOwner->subFeature(i); - if (myPntShapes.count(aFeature.get()) == 1) { - myPntShapes[aFeature.get()] = aId; - aId++; - } else { - if (isPntConstraint(aFeature->getKind())) { - DataPtr aData = aFeature->data(); - AttributeRefAttrPtr aObjRef = aData->refattr(SketchPlugin_Constraint::ENTITY_A()); - FeaturePtr aObj = ModelAPI_Feature::feature(aObjRef->object()); - bool aContains = false; - if (containsPoint(aObj, aPnt2d, thePos)) { - aContains = true; - } else { - aObjRef = aData->refattr(SketchPlugin_Constraint::ENTITY_B()); + bool aUseFeature = ((myPntShapes.count(aFeature.get()) == 1) || + (isPntConstraint(aFeature->getKind()))); + if (aUseFeature) { + DataPtr aData = aFeature->data(); + AttributeRefAttrPtr aObjRef = aData->refattr(SketchPlugin_Constraint::ENTITY_A()); + FeaturePtr aObj; + if (aObjRef) + aObj = ModelAPI_Feature::feature(aObjRef->object()); + bool aContains = false; + if (aObj && containsPoint(aObj, aPnt2d, thePos)) { + aContains = true; + } else { + aObjRef = aData->refattr(SketchPlugin_Constraint::ENTITY_B()); + if (aObjRef) aObj = ModelAPI_Feature::feature(aObjRef->object()); - if (containsPoint(aObj, aPnt2d, thePos)) { - aContains = true; - } - } - if (aContains) { - myPntShapes[aFeature.get()] = aId; - aId++; + if (aObj && containsPoint(aObj, aPnt2d, thePos)) { + aContains = true; } } + if (aContains) { + myPntShapes[aFeature.get()][0] = aId; + aId++; + aFeaList.push_back(aFeature.get()); + } } } + int aSize = (int) aFeaList.size(); + std::list::const_iterator aIt; + for (aIt = aFeaList.cbegin(); aIt != aFeaList.cend(); aIt++) { + myPntShapes[*aIt][1] = aSize; + } } return myPntShapes[thePrs->feature()]; } - +//***************************************************************** gp_Vec getVector(ObjectPtr theShape, GeomDirPtr theDir, gp_Pnt theP) { gp_Vec aVec; @@ -192,22 +191,25 @@ gp_Vec getVector(ObjectPtr theShape, GeomDirPtr theDir, gp_Pnt theP) std::shared_ptr aCurve = std::shared_ptr(new GeomAPI_Curve(aShape)); - if (aCurve->isCircle()) { - GeomEdgePtr aEdgePtr(new GeomAPI_Edge(aShape)); - GeomVertexPtr aVertexPtr(new GeomAPI_Vertex(theP.X(), theP.Y(), theP.Z())); - BRepExtrema_ExtPC aExtrema(aVertexPtr->impl(), - aEdgePtr->impl()); - int aNb = aExtrema.NbExt(); - if (aNb > 0) { - for (int i = 1; i <= aNb; i++) { - if (aExtrema.IsMin(i)) { - double aParam = aExtrema.Parameter(i); - Handle(Geom_Curve) aCurv = aCurve->impl(); - gp_Pnt aP; - aCurv->D1(aParam, aP, aVec); - break; - } - } + if (aCurve->isCircle() || aCurve->isEllipse()) { + Handle(Geom_Curve) aCurv = aCurve->impl(); + GeomAPI_ProjectPointOnCurve anExtr(theP, aCurv); + double aParam = anExtr.LowerDistanceParameter(); + gp_Pnt aP; + aCurv->D1(aParam, aP, aVec); + // 2458: check correct orientation of the vector + if (aVec.SquareMagnitude() > Precision::Confusion()) { + std::shared_ptr aCircEdge(new GeomAPI_Edge(aShape)); + double aFirstParam, aLastParam; + aCircEdge->getRange(aFirstParam, aLastParam); + // if parameter is near the LastParam, make the vector go inside (reverse) + double aDelta = aLastParam - aParam; + while (aDelta < -Precision::Confusion()) + aDelta += 2. * M_PI; + while (aDelta > 2. * M_PI - Precision::Confusion()) + aDelta -= 2. * M_PI; + if (fabs(aDelta) < Precision::Confusion()) + aVec.Reverse(); } } else { GeomPointPtr aPnt1 = aCurve->getPoint(aCurve->endParam()); @@ -225,6 +227,7 @@ gp_Vec getVector(ObjectPtr theShape, GeomDirPtr theDir, gp_Pnt theP) return aVec; } +//***************************************************************** gp_Pnt SketcherPrs_PositionMgr::getPosition(ObjectPtr theShape, const SketcherPrs_SymbolPrs* thePrs, double theStep, GeomPointPtr thePnt) @@ -302,8 +305,8 @@ std::list getCurves(const GeomPointPtr& thePnt, const SketcherPrs_Sym int aNbSubs = aOwner->numberOfSubs(); for (int i = 0; i < aNbSubs; i++) { FeaturePtr aFeature = aOwner->subFeature(i); - if (!aFeature->firstResult().get()) // There is no result - continue; + if (!aFeature->firstResult().get() || aFeature->firstResult()->isDisabled()) + continue; // There is no result if (aFeature->getKind() == SketchPlugin_Line::ID()) { AttributePoint2DPtr aSPnt1 = std::dynamic_pointer_cast( @@ -314,13 +317,20 @@ std::list getCurves(const GeomPointPtr& thePnt, const SketcherPrs_Sym GeomPnt2dPtr aPnt1 = aSPnt1->pnt(); GeomPnt2dPtr aPnt2 = aSPnt2->pnt(); - if (aPnt1->isEqual(aPnt2d) || aPnt2->isEqual(aPnt2d)) { + if (aPnt1->distance(aPnt2d) <= Precision::Confusion() || + aPnt2->distance(aPnt2d) <= Precision::Confusion()) { + // a point corresponds to one of the line end GeomShapePtr aShp = SketcherPrs_Tools::getShape(aFeature->firstResult()); GeomCurvePtr aCurv = std::shared_ptr(new GeomAPI_Curve(aShp)); aList.push_back(aFeature->firstResult()); + } else { + // Check that a point belongs to the curve + GeomAPI_Lin2d aLin2d(aPnt1, aPnt2); + double aDist = aLin2d.distance(aPnt2d); + if (aDist <= Precision::Confusion()) + aList.push_back(aFeature->firstResult()); } - } else if ((aFeature->getKind() == SketchPlugin_Circle::ID()) || - (aFeature->getKind() == SketchPlugin_Arc::ID())) { + } else { GeomCurvePtr aCurve; ObjectPtr aResObj; std::list aResults = aFeature->results(); @@ -334,11 +344,17 @@ std::list getCurves(const GeomPointPtr& thePnt, const SketcherPrs_Sym } } if (aCurve.get()) { - double aStart = aCurve->startParam(); - double aEnd = aCurve->endParam(); - GeomCirclePtr aCircle = GeomCirclePtr(new GeomAPI_Circ(aCurve)); - double aParam; - if (aCircle->parameter(thePnt, 1.e-4, aParam) && (aParam >= aStart) && (aParam <= aEnd)) + GeomPointPtr aProjPnt; + if (aFeature->getKind() == SketchPlugin_Circle::ID() || + aFeature->getKind() == SketchPlugin_Arc::ID()) { + GeomCirclePtr aCircle = GeomCirclePtr(new GeomAPI_Circ(aCurve)); + aProjPnt = aCircle->project(thePnt); + } + else if (aFeature->getKind() == SketchPlugin_Ellipse::ID()) { + GeomEllipsePtr anEllipse = GeomEllipsePtr(new GeomAPI_Ellipse(aCurve)); + aProjPnt = anEllipse->project(thePnt); + } + if (aProjPnt && thePnt->distance(aProjPnt) <= Precision::Confusion()) aList.push_back(aResObj); } } @@ -352,6 +368,8 @@ gp_Pnt SketcherPrs_PositionMgr::getPointPosition( double theStep, GeomPointPtr thePnt) { gp_Pnt aP = thePnt->impl(); + if (!thePrs->plane().get()) + return aP; GeomDirPtr aNormal = thePrs->plane()->normal(); gp_Dir aNormDir = aNormal->impl(); @@ -363,8 +381,16 @@ gp_Pnt SketcherPrs_PositionMgr::getPointPosition( aVectorsList.push_back(getVector((*aItCurv), thePrs->plane()->dirX(), aP)); } + // Position of the symbol + const std::array& aPos = getPositionIndex(thePnt, thePrs); + + // Angle size of a symbol + //double aAngleStep = PI * 50./180.; + double aAngleStep = PI/4.; + std::list::const_iterator aItVec; - std::map aAngVectors; + std::list aAngles; + std::list aVectors; // Select closest vectors and calculate angles between base vector and closest vector for (aItVec = aVectorsList.cbegin(); aItVec != aVectorsList.cend(); aItVec++) { std::list::const_iterator aIt; @@ -383,41 +409,65 @@ gp_Pnt SketcherPrs_PositionMgr::getPointPosition( } } } - aAngVectors[aMinAng] = aVec; + if (aMinAng >= aAngleStep) { + aVectors.push_back(aVec); + aAngles.push_back(aMinAng); + } } - // Angle size of a symbol for a first level - static const double aAngleStep = PI * 50./180.; - - // Position of the symbol - int aPos = getPositionIndex(thePnt, thePrs); - - //std::list::const_iterator aItAng; gp_Ax1 aRotAx(aP, aNormDir); - int aPosId = 0; // Last used position + gp_Vec aVecPos; + // If number of angle less then number of symbols then each symbol can be placed + // directly inside of the angle + if (aAngles.size() >= aPos[1] && !aVectors.empty()) { + int aId = aPos[0]; + aVecPos = *(std::next(aVectors.begin(), aId)); + + gp_Vec aShift = aVecPos.Rotated(aRotAx, aAngleStep); + aShift.Normalize(); + aShift.Multiply(theStep * 1.5); + return aP.Translated(aShift); + } + + // A case when there are a lot of symbols + int aPosCount = 0; double aAng; - gp_Vec aPrevVec; - std::map::const_iterator aItAng; - for (aItAng = aAngVectors.cbegin(); aItAng != aAngVectors.cend(); ++aItAng) { - aAng = aItAng->first; - aPrevVec = aItAng->second; - if (aAng >= aAngleStep) { - gp_Vec aShift; + std::list::const_iterator aItAng; + + double aAngPos; + bool aHasPlace = false; + //int aIntId = 0; // a position inside a one sector + while (aPosCount < aPos[1]) { + for (aItAng = aAngles.cbegin(), aItVec = aVectors.cbegin(); + aItAng != aAngles.cend(); ++aItAng, ++aItVec) { + aAng = (*aItAng); int Nb = int(aAng / aAngleStep); - if ((aPos >= aPosId) && (aPos < (aPosId + Nb))) { - // rotate base vector on a necessary angle - aShift = aPrevVec.Rotated(aRotAx, aAngleStep + aAngleStep * (aPos - aPosId)); - aShift.Normalize(); - aShift.Multiply(theStep * 1.5); - return aP.Translated(aShift); + aPosCount += Nb; + + if ((!aHasPlace) && (aPosCount >= (aPos[0] + 1))) { + aHasPlace = true; + aAngPos = (*aItAng); + aVecPos = (*aItVec); + //aIntId = aPos[0] - (aPosCount - Nb); } - aPosId += Nb; } + if (aPosCount < aPos[1]) { + aAngleStep -= 0.1; + aHasPlace = false; + aPosCount = 0; + } + if (aAngleStep <= 0) + break; } - gp_Vec aShift = aPrevVec.Rotated(aRotAx, aAngleStep); - aShift.Normalize(); - aShift.Multiply(theStep * 1.5); - return aP.Translated(aShift); + + if (aHasPlace) { + // rotate base vector on a necessary angle + gp_Vec aShift = aVecPos.Rotated(aRotAx, aAngleStep + aAngleStep * aPos[0]); + aShift.Normalize(); + aShift.Multiply(theStep * 1.5); + return aP.Translated(aShift); + } + return aP; } //*****************************************************************