X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeSelection.cpp;h=f610b3dbefb7161ab8e292fcfac57b0dfd7e6539;hb=ecec337d46d54cb79cbca6233fb93449513603af;hp=aa3d7c9760acdd0b0c11ff4f2790944655ef0656;hpb=c16dc95c6e368bbd3fd4b62aa2dbcd138b44e631;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index aa3d7c976..f610b3dbe 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -21,16 +21,25 @@ #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 @@ -67,7 +76,7 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext, else if (theContext->groupName() == ModelAPI_ResultConstruction::group()) selectConstruction(theContext, theSubShape); - std::string aSelName = buildSubShapeName(theSubShape, theContext); + std::string aSelName = namingName(); if(!aSelName.empty()) TDataStd_Name::Set(selectionLabel(), aSelName.c_str()); //set name @@ -433,55 +442,181 @@ TDF_Label Model_AttributeSelection::selectionLabel() return myRef.myRef->Label().FindChild(1); } -std::string Model_AttributeSelection::buildSubShapeName(std::shared_ptr theSubShape, - const ResultPtr& theContext) +#define FIX_BUG1 1 +std::string GetShapeName(std::shared_ptr theDoc, const TopoDS_Shape& theShape, + const TDF_Label& theLabel) { std::string aName; - if(theSubShape->isNull() || theContext->shape()->isNull()) return aName; - TopoDS_Shape aSubShape = theSubShape->impl(); - TopoDS_Shape aContext = theContext->shape()->impl(); - // check if the subShape is already in DF - Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(aSubShape, selectionLabel()); + Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(theShape, theLabel); Handle(TDataStd_Name) anAttr; - if(!aNS.IsNull()) { // in the document + if(!aNS.IsNull() && !aNS->IsEmpty()) { // in the document if(aNS->Label().FindAttribute(TDataStd_Name::GetID(), anAttr)) { aName = TCollection_AsciiString(anAttr->Get()).ToCString(); - if(!aName.empty()) { - std::shared_ptr aDoc = std::dynamic_pointer_cast(theContext->document()); - const TDF_Label& aLabel = aDoc->findNamingName(aName); + if(!aName.empty()) { + const TDF_Label& aLabel = theDoc->findNamingName(aName); if(!aLabel.IsEqual(aNS->Label())) { - aName.erase(); //something is wrong, to be checked! + //aName.erase(); //something is wrong, to be checked!!! + aName += "_SomethingWrong"; + return aName; } const TopoDS_Shape& aShape = aNS->Get(); if(aShape.ShapeType() == TopAbs_COMPOUND) { - std::string aFullName = aName + "_"; - TopoDS_Iterator it(aShape); - int i(1); - for (;it.More();it.Next(), i++) { - if(it.Value() != aSubShape) continue; - else { - aName = aFullName + TCollection_AsciiString (i).ToCString(); - break; - } + std::string aPostFix("_"); + TopoDS_Iterator it(aShape); + for (int i = 1;it.More();it.Next(), i++) { + if(it.Value() == theShape) { + aPostFix += TCollection_AsciiString (i).ToCString(); + aName += aPostFix; + break; } + else continue; + } } } } } + return aName; +} + +bool isTrivial (const TopTools_ListOfShape& theAncestors, TopTools_IndexedMapOfShape& theSMap) +{ +// a trivial case: F1 & F2, aNumber = 1, i.e. intersection gives 1 edge. + TopoDS_Compound aCmp; + BRep_Builder BB; + BB.MakeCompound(aCmp); + TopTools_ListIteratorOfListOfShape it(theAncestors); + for(;it.More();it.Next()) { + BB.Add(aCmp, it.Value()); + theSMap.Add(it.Value()); + } + int aNumber(0); + TopTools_IndexedDataMapOfShapeListOfShape aMap2; + TopExp::MapShapesAndAncestors(aCmp, TopAbs_EDGE, TopAbs_FACE, aMap2); + for (int i = 1; i <= aMap2.Extent(); i++) { + const TopoDS_Shape& aKey = aMap2.FindKey(i); + const TopTools_ListOfShape& anAncestors = aMap2.FindFromIndex(i); + if(anAncestors.Extent() > 1) aNumber++; + } + if(aNumber > 1) return false; + return true; +} +std::string Model_AttributeSelection::namingName()//std::shared_ptr theSubShape, + // const ResultPtr& theContext) +{ + std::shared_ptr aSubSh = value(); + ResultPtr aCont = context(); + std::string aName; + if(!aSubSh.get() || aSubSh->isNull() || !aCont.get() || aCont->shape()->isNull()) + return aName; + TopoDS_Shape aSubShape = aSubSh->impl(); + TopoDS_Shape aContext = aCont->shape()->impl(); + std::shared_ptr aDoc = + std::dynamic_pointer_cast(aCont->document()); + + // check if the subShape is already in DF + aName = GetShapeName(aDoc, aSubShape, selectionLabel()); if(aName.empty() ) { // not in the document! TopAbs_ShapeEnum aType = aSubShape.ShapeType(); switch (aType) { case TopAbs_FACE: - // the Face should be in DF. If it is not a case it is an error ==> to be dbugged - + // the Face should be in DF. If it is not a case, it is an error ==> to be dbugged break; case TopAbs_EDGE: + { + // name structure: F1 | F2 [| F3 | F4], where F1 & F2 the faces which gives the Edge in trivial case + // if it is not atrivial case we use localization by neighbours. F3 & F4 - neighbour faces + TopTools_IndexedMapOfShape aSMap; // map for ancestors of the sub-shape + TopTools_IndexedDataMapOfShapeListOfShape aMap; + TopExp::MapShapesAndAncestors(aContext, TopAbs_EDGE, TopAbs_FACE, aMap); + bool isTrivialCase(true); + for (int i = 1; i <= aMap.Extent(); i++) { + const TopoDS_Shape& aKey = aMap.FindKey(i); + if (aKey.IsNotEqual(aSubShape)) continue; // find exactly the selected key + + const TopTools_ListOfShape& anAncestors = aMap.FindFromIndex(i); + // check that it is not a trivial case (F1 & F2: aNumber = 1) + isTrivialCase = isTrivial(anAncestors, aSMap); + break; + } + + TopTools_ListOfShape aListOfNbs; + if(!isTrivialCase) { // find Neighbors + TNaming_Localizer aLocalizer; + TopTools_MapOfShape aMap3; + aLocalizer.FindNeighbourg(aContext, aSubShape, aMap3); + //int n = aMap3.Extent(); + TopTools_MapIteratorOfMapOfShape it(aMap3); + for(;it.More();it.Next()) { + const TopoDS_Shape& aNbShape = it.Key(); // neighbor edge + //TopAbs_ShapeEnum aType = aNbShape.ShapeType(); + const TopTools_ListOfShape& aList = aMap.FindFromKey(aNbShape); + TopTools_ListIteratorOfListOfShape it2(aList); + for(;it2.More();it2.Next()) { + if(aSMap.Contains(it2.Value())) continue; // skip this Face + aListOfNbs.Append(it2.Value()); + } + } + } // else a trivial case + + // build name of the sub-shape Edge + for(int i=1; i <= aSMap.Extent(); i++) { + const TopoDS_Shape& aFace = aSMap.FindKey(i); + std::string aFaceName = GetShapeName(aDoc, aFace, selectionLabel()); + if(i == 1) + aName = aFaceName; + else + aName += "|" + aFaceName; + } + TopTools_ListIteratorOfListOfShape itl(aListOfNbs); + for (;itl.More();itl.Next()) { + std::string aFaceName = GetShapeName(aDoc, itl.Value(), selectionLabel()); + aName += "|" + aFaceName; + } + } break; + case TopAbs_VERTEX: + // name structure (Monifold Topology): + // 1) F1 | F2 | F3 - intersection of 3 faces defines a vertex - trivial case. + // 2) F1 | F2 - intersection of 2 faces definses a vertex - applicable for case + // when 1 faces is cylindrical, conical, spherical or revolution and etc. + // 3) E1 | E2 | E3 - intersection of 3 edges defines a vertex - when we have case of a shell + // or compound of 2 open faces. + // 4) E1 | E2 - intesection of 2 edges defines a vertex - when we have a case of + // two independent edges (wire or compound) + // implemented 2 first cases + { + TopTools_IndexedDataMapOfShapeListOfShape aMap; + TopExp::MapShapesAndAncestors(aContext, TopAbs_VERTEX, TopAbs_FACE, aMap); + const TopTools_ListOfShape& aList2 = aMap.FindFromKey(aSubShape); + TopTools_ListOfShape aList; + TopTools_MapOfShape aFMap; +#ifdef FIX_BUG1 + //int n = aList2.Extent(); //bug! + // fix is below + TopTools_ListIteratorOfListOfShape itl2(aList2); + for (int i = 1;itl2.More();itl2.Next(),i++) { + if(aFMap.Add(itl2.Value())) + aList.Append(itl2.Value()); + } + //n = aList.Extent(); +#endif + TopTools_ListIteratorOfListOfShape itl(aList); + for (int i = 1;itl.More();itl.Next(),i++) { + const TopoDS_Shape& aFace = itl.Value(); + std::string aFaceName = GetShapeName(aDoc, aFace, selectionLabel()); + if(i == 1) + aName = aFaceName; + else + aName += "|" + aFaceName; + } + } break; - } + // register name + // aDoc->addNamingName(selectionLabel(), aName); + // the selected sub-shape will not be shared and as result it will not require registration } return aName; }