X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSelector%2FSelector_Algo.cpp;h=c41e8ca8bb1d1903f77a798cea35292d61ba51f5;hb=5a5362530345c00af26fc8226f3066f749dde392;hp=9a387d1f0cd4533b63e6fbae4c3eb515912695df;hpb=43bf7e7ab5fd11b71c8221f0929252de9bf6a7e0;p=modules%2Fshaper.git diff --git a/src/Selector/Selector_Algo.cpp b/src/Selector/Selector_Algo.cpp index 9a387d1f0..c41e8ca8b 100644 --- a/src/Selector/Selector_Algo.cpp +++ b/src/Selector/Selector_Algo.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2022 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 @@ -31,16 +30,21 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include #include +#include +#include +#include /// type of the selection, integer keeps the Selector_Type value @@ -62,6 +66,42 @@ Selector_Algo::Selector_Algo() myAlwaysGeometricalNaming = false; } +static TDF_Label findGoodLabelWithShape(const TDF_Label theAccess, const TopoDS_Shape& theShape) { + TDF_Label aResult; + TDF_Label aMyOpLab; + bool aMyOpLabIsComputed = false; + if (TNaming_Tool::HasLabel(theAccess, theShape)) { // selection and delete evolution are not used + for(TNaming_SameShapeIterator aShapes(theShape, theAccess); aShapes.More(); aShapes.Next()) + { + Handle(TNaming_NamedShape) aNS; + if (aShapes.Label().FindAttribute(TNaming_NamedShape::GetID(), aNS)) { + if (aNS->Evolution() == TNaming_MODIFY || aNS->Evolution() == TNaming_GENERATED || + aNS->Evolution() == TNaming_PRIMITIVE) { + // getting label of this operation to avoid usage of ready shapes of this + if (!aMyOpLabIsComputed) { + aMyOpLab = theAccess; + if (!aMyOpLab.IsNull()) { + int aDepth = aMyOpLab.Depth(); + if (aDepth < 3) + aMyOpLab.Nullify(); + else { + for(; aDepth != 3; aDepth--) + aMyOpLab = aMyOpLab.Father(); + } + } + aMyOpLabIsComputed = true; + } + if (!aMyOpLab.IsNull() && aNS->Label().IsDescendant(aMyOpLab)) + continue; + aResult = aNS->Label(); + break; + } + } + } + } + return aResult; +} + #define SET_ALGO_FLAGS(algo) \ algo->myLab = theAccess; \ algo->myBaseDocumentLab = theBaseDocument; \ @@ -81,37 +121,9 @@ Selector_Algo* Selector_Algo::select(const TopoDS_Shape theContext, const TopoDS // check the value shape can be named as it is, or it is needed to construct it from the // higher level shapes (like a box vertex by faces that form this vertex) - bool aIsFound = TNaming_Tool::HasLabel(theAccess, theValue); - if (aIsFound) { // additional check for selection and delete evolution only: also could not use - aIsFound = false; - for(TNaming_SameShapeIterator aShapes(theValue, theAccess); aShapes.More(); aShapes.Next()) - { - Handle(TNaming_NamedShape) aNS; - if (aShapes.Label().FindAttribute(TNaming_NamedShape::GetID(), aNS)) { - if (aNS->Evolution() == TNaming_MODIFY || aNS->Evolution() == TNaming_GENERATED || - aNS->Evolution() == TNaming_PRIMITIVE) { - aIsFound = true; - break; - } - } - } - } - // searching in the base document - if (!aIsFound && !theBaseDocument.IsNull() && TNaming_Tool::HasLabel(theBaseDocument, theValue)) - { - TNaming_SameShapeIterator aShapes(theValue, theBaseDocument); - for(; aShapes.More(); aShapes.Next()) - { - Handle(TNaming_NamedShape) aNS; - if (aShapes.Label().FindAttribute(TNaming_NamedShape::GetID(), aNS)) { - if (aNS->Evolution() == TNaming_MODIFY || aNS->Evolution() == TNaming_GENERATED || - aNS->Evolution() == TNaming_PRIMITIVE) { - aIsFound = true; - break; - } - } - } - } + bool aIsFound = !findGoodLabelWithShape(theAccess, theValue).IsNull(); + if (!aIsFound && !theBaseDocument.IsNull()) // searching in the base document + aIsFound = !findGoodLabelWithShape(theBaseDocument, theValue).IsNull(); if (!aIsFound) { TopAbs_ShapeEnum aSelectionType = theValue.ShapeType(); if (aSelectionType == TopAbs_COMPOUND || aSelectionType == TopAbs_COMPSOLID || @@ -139,7 +151,11 @@ Selector_Algo* Selector_Algo::select(const TopoDS_Shape theContext, const TopoDS // searching by neighbors Selector_FilterByNeighbors* aNBs = new Selector_FilterByNeighbors; SET_ALGO_FLAGS(aNBs); - if (aNBs->select(theContext, theValue)) { + // searching a context lab to store in NB algorithm + TDF_Label aContextLab = findGoodLabelWithShape(theAccess, theContext); + if (aContextLab.IsNull() && !theBaseDocument.IsNull()) // search also in the base document + aContextLab = findGoodLabelWithShape(theBaseDocument, theContext); + if (aNBs->select(aContextLab, theContext, theValue)) { delete anIntersect; return aNBs; } @@ -160,6 +176,17 @@ Selector_Algo* Selector_Algo::select(const TopoDS_Shape theContext, const TopoDS } return NULL; // not found value in the tree, not found context shape in the tree also } + // getting label of this operation to avoid usage of ready shapes of this + TDF_Label aMyOpLab = theAccess; + if (!aMyOpLab.IsNull()) { + int aDepth = aMyOpLab.Depth(); + if (aDepth < 3) + aMyOpLab.Nullify(); + else { + for(; aDepth != 3; aDepth--) + aMyOpLab = aMyOpLab.Father(); + } + } // searching for the base shapes of the value Handle(TNaming_NamedShape) aPrimitiveNS; NCollection_List aModifList; @@ -172,6 +199,10 @@ Selector_Algo* Selector_Algo::select(const TopoDS_Shape theContext, const TopoDS Handle(TNaming_NamedShape) aNS; if (aShapes.Label().FindAttribute(TNaming_NamedShape::GetID(), aNS)) { TNaming_Evolution anEvolution = aNS->Evolution(); + if (anEvolution == TNaming_SELECTED || anEvolution == TNaming_DELETE) + continue; + if (!aMyOpLab.IsNull() && aNS->Label().IsDescendant(aMyOpLab)) + continue; if (anEvolution == TNaming_PRIMITIVE) { // the value shape is declared as PRIMITIVE aPrimitiveNS = aNS; break; @@ -208,7 +239,11 @@ Selector_Algo* Selector_Algo::select(const TopoDS_Shape theContext, const TopoDS // searching by neighbors Selector_FilterByNeighbors* aNBs = new Selector_FilterByNeighbors; SET_ALGO_FLAGS(aNBs); - if (aNBs->select(theContext, theValue)) { + // searching a context lab to store in NB algorithm + TDF_Label aContextLab = findGoodLabelWithShape(theAccess, theContext); + if (aContextLab.IsNull() && !theBaseDocument.IsNull()) // search also in the base document + aContextLab = findGoodLabelWithShape(theBaseDocument, theContext); + if (aNBs->select(aContextLab, theContext, theValue)) { delete aModify; return aNBs; } @@ -375,11 +410,11 @@ Selector_Algo* Selector_Algo::restoreByLab(TDF_Label theLab, TDF_Label theBaseDo } Selector_Algo* Selector_Algo::restoreByName(TDF_Label theLab, TDF_Label theBaseDocLab, - std::string theName, const TopAbs_ShapeEnum theShapeType, + std::wstring theName, const TopAbs_ShapeEnum theShapeType, const bool theGeomNaming, Selector_NameGenerator* theNameGenerator, TDF_Label& theContextLab) { Selector_Algo* aResult = NULL; - if (theName[0] == '[') { // intersection or container + if (theName[0] == L'[') { // intersection or container switch(theShapeType) { case TopAbs_COMPOUND: case TopAbs_COMPSOLID: @@ -394,11 +429,12 @@ Selector_Algo* Selector_Algo::restoreByName(TDF_Label theLab, TDF_Label theBaseD break; default:; } - } else if (theName[0] == '(') { // filter by neighbors + } else if (theName[0] == L'(') { // filter by neighbors aResult = new Selector_FilterByNeighbors; - } else if (theName.find(pureWeakNameID()) == 0) { // weak naming identifier + } else if (theName.find(pureWeakNameID()) == 0 || + theName.find(oldPureWeakNameID()) == 0) { // weak naming identifier aResult = new Selector_WeakName; - } else if (theName.find('&') != std::string::npos) { // modification + } else if (theName.find(L'&') != std::wstring::npos) { // modification aResult = new Selector_Modify; } else { // primitive aResult = new Selector_Primitive; @@ -406,6 +442,7 @@ Selector_Algo* Selector_Algo::restoreByName(TDF_Label theLab, TDF_Label theBaseD if (aResult) { aResult->myLab = theLab; aResult->myBaseDocumentLab = theBaseDocLab; + aResult->myGeometricalNaming = theGeomNaming; theContextLab = aResult->restoreByName(theName, theShapeType, theNameGenerator); if (theContextLab.IsNull()) { delete aResult; @@ -422,3 +459,73 @@ void Selector_Algo::storeType(const Selector_Type theType) if (myGeometricalNaming) TDataStd_UAttribute::Set(myLab, kGEOMETRICAL_NAMING); } + +/// Returns true if theSub is in theContext shape +static bool isInContext(const TopoDS_Shape& theContext, const TopoDS_Shape& theSub) { + for(TopExp_Explorer anExp(theContext, theSub.ShapeType()); anExp.More(); anExp.Next()) { + if (anExp.Current().IsSame(theSub)) + return true; + } + return false; +} + +bool Selector_Algo::findNewVersion(const TopoDS_Shape& theContext, TopoDS_Shape& theResult) const +{ + if (theResult.IsNull()) + return false; + if (!TNaming_Tool::HasLabel(myLab, theResult)) { + if (theResult.ShapeType() == TopAbs_COMPOUND) { // do it for all elements of compound + BRep_Builder aBuilder; + TopoDS_Compound aResultingCompound; + aBuilder.MakeCompound(aResultingCompound); + bool aWasChanged = false; + for (TopoDS_Iterator anIter(theResult); anIter.More(); anIter.Next()) { + TopoDS_Shape aSub = anIter.Value(); + if (findNewVersion(theContext, aSub)) + aWasChanged = true; + aBuilder.Add(aResultingCompound, aSub); + } + if (aWasChanged) + theResult = aResultingCompound; + return aWasChanged; + } + } else { + // check theResult is in theContext + if (isInContext(theContext, theResult)) + return false; + // searching the next modifications of the result shape in document + TopTools_MapOfShape aResultShapes; + for(TNaming_NewShapeIterator aBaseIter(theResult, myLab); aBaseIter.More(); aBaseIter.Next()) + { + TNaming_Evolution anEvolution = aBaseIter.NamedShape()->Evolution(); + if (anEvolution == TNaming_GENERATED || anEvolution == TNaming_MODIFY) { + TopoDS_Shape aNextModification = aBaseIter.Shape(); + if (aNextModification.IsNull()) + continue; + if (isInContext(theContext, aNextModification)) { + // don't add vertices generated from edges + if (aNextModification.ShapeType() <= theResult.ShapeType()) + aResultShapes.Add(aNextModification); + } + else if (findNewVersion(theContext, aNextModification)) { + if (aNextModification.ShapeType() <= theResult.ShapeType()) + aResultShapes.Add(aNextModification); + } + } + } + if (aResultShapes.IsEmpty()) + return false; + if (aResultShapes.Size() == 1) { + theResult = TopTools_MapIteratorOfMapOfShape(aResultShapes).Value(); + } else { // make a compound of all results + BRep_Builder aBuilder; + TopoDS_Compound aResultingCompound; + aBuilder.MakeCompound(aResultingCompound); + for(TopTools_MapIteratorOfMapOfShape anIter(aResultShapes); anIter.More(); anIter.Next()) + aBuilder.Add(aResultingCompound, anIter.Value()); + theResult = aResultingCompound; + } + return true; + } + return false; +}