X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeSelection.cpp;h=f610b3dbefb7161ab8e292fcfac57b0dfd7e6539;hb=ecec337d46d54cb79cbca6233fb93449513603af;hp=79b87dc2d30563f12a644d908491b74431faf4ff;hpb=3874b57fe5aba25ff5aee2a07654fc23c1ee8eb0;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index 79b87dc2d..f610b3dbe 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -21,19 +21,32 @@ #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 +#include using namespace std; /// adeed to the index in the packed map to signalize that the vertex of edge is seleted /// (multiplied by the index of the edge) @@ -63,6 +76,10 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext, else if (theContext->groupName() == ModelAPI_ResultConstruction::group()) selectConstruction(theContext, theSubShape); + std::string aSelName = namingName(); + if(!aSelName.empty()) + TDataStd_Name::Set(selectionLabel(), aSelName.c_str()); //set name + myIsInitialized = true; owner()->data()->sendAttributeUpdated(this); } @@ -76,6 +93,12 @@ std::shared_ptr Model_AttributeSelection::value() TopoDS_Shape aSelShape = aSelection->Get(); aResult = std::shared_ptr(new GeomAPI_Shape); aResult->setImpl(new TopoDS_Shape(aSelShape)); + } else { // for simple construction element: just shape of this construction element + ResultConstructionPtr aConstr = + std::dynamic_pointer_cast(context()); + if (aConstr) { + return aConstr->shape(); + } } } return aResult; @@ -98,6 +121,29 @@ void Model_AttributeSelection::setObject(const std::shared_ptr& myRef.setObject(theObject); } +TDF_LabelMap& Model_AttributeSelection::scope() +{ + if (myScope.IsEmpty()) { // create a new scope if not yet done + // gets all labels with named shapes that are bofore this feature label (before in history) + TDF_Label aFeatureLab = std::dynamic_pointer_cast( + owner()->data())->label().Father(); + int aFeatureID = aFeatureLab.Tag(); + TDF_ChildIterator aFeaturesIter(aFeatureLab.Father()); + for(; aFeaturesIter.More(); aFeaturesIter.Next()) { + if (aFeaturesIter.Value().Tag() >= aFeatureID) // the left labels are created later + break; + TDF_ChildIDIterator aNSIter(aFeaturesIter.Value(), TNaming_NamedShape::GetID(), 1); + for(; aNSIter.More(); aNSIter.Next()) { + Handle(TNaming_NamedShape) aNS = Handle(TNaming_NamedShape)::DownCast(aNSIter.Value()); + if (!aNS.IsNull() && aNS->Evolution() != TNaming_SELECTED) { + myScope.Add(aNS->Label()); + } + } + } + } + return myScope; +} + bool Model_AttributeSelection::update() { ResultPtr aContext = context(); @@ -105,8 +151,7 @@ bool Model_AttributeSelection::update() if (aContext->groupName() == ModelAPI_ResultBody::group()) { // body: just a named shape, use selection mechanism from OCCT TNaming_Selector aSelector(selectionLabel()); - TDF_LabelMap aScope; // empty means the whole document - bool aResult = aSelector.Solve(aScope) == Standard_True; + bool aResult = aSelector.Solve(scope()) == Standard_True; owner()->data()->sendAttributeUpdated(this); return aResult; } else if (aContext->groupName() == ModelAPI_ResultConstruction::group()) { @@ -115,7 +160,7 @@ bool Model_AttributeSelection::update() std::shared_ptr aWirePtr = std::dynamic_pointer_cast( std::dynamic_pointer_cast(aContext)->shape()); - if (aWirePtr && aWirePtr->hasPlane()) { + if (aWirePtr && aWirePtr->hasPlane()) { // sketch sub-element TDF_Label aLab = myRef.myRef->Label(); // getting a type of selected shape Handle(TDataStd_Integer) aTypeAttr; @@ -234,7 +279,7 @@ bool Model_AttributeSelection::update() // searching for deltas int aVertexNum = 0; if (aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA)) aVertexNum = 1; - else if (aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA)) aVertexNum = 2; + else if (aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA * 2)) aVertexNum = 2; // found the feature with appropriate edge FeaturePtr aFeature = aComposite->subFeature(a); std::list >::const_iterator aResIter = @@ -266,6 +311,9 @@ bool Model_AttributeSelection::update() } } } + } else { // simple construction element: the selected is that needed + owner()->data()->sendAttributeUpdated(this); + return true; } } return false; // unknown case @@ -393,3 +441,182 @@ TDF_Label Model_AttributeSelection::selectionLabel() { return myRef.myRef->Label().FindChild(1); } + +#define FIX_BUG1 1 +std::string GetShapeName(std::shared_ptr theDoc, const TopoDS_Shape& theShape, + const TDF_Label& theLabel) +{ + std::string aName; + // check if the subShape is already in DF + Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(theShape, theLabel); + Handle(TDataStd_Name) anAttr; + 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()) { + const TDF_Label& aLabel = theDoc->findNamingName(aName); + if(!aLabel.IsEqual(aNS->Label())) { + //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 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 + 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; +}