X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeSelection.cpp;h=3df579de17660cedec7a07f43350f50602274cfe;hb=6958dab7cbbaf443a39b04a609c5f33573c73f9e;hp=f76344f552f6d0e976e26a7910c6dccb6b6c1666;hpb=869145c3cd63a59f3d37f7b3d24d3b99afdc2bce;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp index f76344f55..3df579de1 100644 --- a/src/Model/Model_AttributeSelection.cpp +++ b/src/Model/Model_AttributeSelection.cpp @@ -21,25 +21,41 @@ #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 - +#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) static const int kSTART_VERTEX_DELTA = 1000000; +// identifier that there is simple reference: selection equals to context +Standard_GUID kSIMPLE_REF_ID("635eacb2-a1d6-4dec-8348-471fae17cb29"); // on this label is stored: // TNaming_NamedShape - selected shape @@ -57,13 +73,27 @@ void Model_AttributeSelection::setValue(const ResultPtr& theContext, if (isOldShape) return; // shape is the same, so context is also unchanged // update the referenced object if needed bool isOldContext = theContext == myRef.value(); + + if (!isOldContext) myRef.setValue(theContext); - if (theContext->groupName() == ModelAPI_ResultBody::group()) - selectBody(theContext, theSubShape); - else if (theContext->groupName() == ModelAPI_ResultConstruction::group()) - selectConstruction(theContext, theSubShape); + // do noth use naming if selected shape is result shape itself, but not sub-shape + TDF_Label aSelLab = selectionLabel(); + if (theContext->shape().get() && theContext->shape()->isEqual(theSubShape)) { + aSelLab.ForgetAllAttributes(true); + TDataStd_UAttribute::Set(aSelLab, kSIMPLE_REF_ID); + } else { + aSelLab.ForgetAttribute(kSIMPLE_REF_ID); + if (theContext->groupName() == ModelAPI_ResultBody::group()) + selectBody(theContext, theSubShape); + 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); @@ -73,6 +103,14 @@ std::shared_ptr Model_AttributeSelection::value() { std::shared_ptr aResult; if (myIsInitialized) { + TDF_Label aSelLab = selectionLabel(); + if (aSelLab.IsAttribute(kSIMPLE_REF_ID)) { // it is just reference to shape, not sub-shape + ResultPtr aContext = context(); + if (!aContext.get()) + return aResult; // empty result + return aContext->shape(); + } + Handle(TNaming_NamedShape) aSelection; if (selectionLabel().FindAttribute(TNaming_NamedShape::GetID(), aSelection)) { TopoDS_Shape aSelShape = aSelection->Get(); @@ -132,10 +170,15 @@ TDF_LabelMap& Model_AttributeSelection::scope() bool Model_AttributeSelection::update() { ResultPtr aContext = context(); - if (!aContext) return false; + if (!aContext.get()) return false; + TDF_Label aSelLab = selectionLabel(); + if (aSelLab.IsAttribute(kSIMPLE_REF_ID)) { // it is just reference to shape, not sub-shape + return aContext->shape() && !aContext->shape()->isNull(); + } + if (aContext->groupName() == ModelAPI_ResultBody::group()) { // body: just a named shape, use selection mechanism from OCCT - TNaming_Selector aSelector(selectionLabel()); + TNaming_Selector aSelector(aSelLab); bool aResult = aSelector.Solve(scope()) == Standard_True; owner()->data()->sendAttributeUpdated(this); return aResult; @@ -260,7 +303,9 @@ bool Model_AttributeSelection::update() for(int a = 0; a < aSubNum; a++) { // if aSubIds take any, the first appropriate int aFeatureID = aComposite->subFeatureId(a); - if (aSubIds->IsEmpty() || aSubIds->Contains(aFeatureID)) { + if (aSubIds->IsEmpty() || aSubIds->Contains(aFeatureID) || + aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA) || + aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA * 2)) { // searching for deltas int aVertexNum = 0; if (aSubIds->Contains(aFeatureID + kSTART_VERTEX_DELTA)) aVertexNum = 1; @@ -328,9 +373,42 @@ void Model_AttributeSelection::selectBody( aSel.Select(aNewShape, aContext); } +/// registers the name of the shape in the label (theID == 0) of sub label (theID is a tag) +/// if theID is zero, +static void registerSubShape(TDF_Label& theMainLabel, TopoDS_Shape theShape, + const int theID, const FeaturePtr& theContextFeature, std::shared_ptr theDoc, + std::string theAdditionalName, + Handle(TDataStd_IntPackedMap) theRefs = Handle(TDataStd_IntPackedMap)()) +{ + TDF_Label aLab = theID == 0 ? theMainLabel : theMainLabel.FindChild(theID); + TNaming_Builder aBuilder(aLab); + aBuilder.Generated(theShape); + std::stringstream aName; + aName<name()<<"/"; + if (!theAdditionalName.empty()) + aName<GetMap()); + for(; aRef.More(); aRef.Next()) { + aName<<"_"<addNamingName(aLab, aName.str()); + TDataStd_Name::Set(aLab, aName.str().c_str()); +} + void Model_AttributeSelection::selectConstruction( const ResultPtr& theContext, const std::shared_ptr& theSubShape) { + std::shared_ptr aMyDoc = + std::dynamic_pointer_cast(owner()->document()); FeaturePtr aContextFeature = theContext->document()->feature(theContext); CompositeFeaturePtr aComposite = std::dynamic_pointer_cast(aContextFeature); @@ -356,7 +434,7 @@ void Model_AttributeSelection::selectConstruction( allCurves.Add(aCurve); } } - // iterate and store the result ids of sub-elements + // iterate and store the result ids of sub-elements and sub-elements to sub-labels Handle(TDataStd_IntPackedMap) aRefs = TDataStd_IntPackedMap::Set(aLab); aRefs->Clear(); const int aSubNum = aComposite->numberOfSubs(); @@ -384,7 +462,6 @@ void Model_AttributeSelection::selectConstruction( for(TopExp_Explorer aVExp(anEdge, TopAbs_VERTEX); aVExp.More(); aVExp.Next()) { gp_Pnt aPnt = BRep_Tool::Pnt(TopoDS::Vertex(aVExp.Current())); if (aPnt.IsEqual(aVertexPos, Precision::Confusion())) { - aRefs->Add(aComposite->subFeatureId(a)); aRefs->Add(aDelta + aComposite->subFeatureId(a)); break; } @@ -401,14 +478,27 @@ void Model_AttributeSelection::selectConstruction( if (allCurves.Contains(aCurve)) { int anID = aComposite->subFeatureId(a); aRefs->Add(anID); - // add edges to sub-label to support naming for edges selection - for(TopExp_Explorer anEdgeExp(aSubShape, TopAbs_EDGE); anEdgeExp.More(); anEdgeExp.Next()) { - TopoDS_Edge anEdge = TopoDS::Edge(anEdgeExp.Current()); - Standard_Real aFirst, aLast; - Handle(Geom_Curve) aFaceCurve = BRep_Tool::Curve(anEdge, aFirst, aLast); - if (aFaceCurve == aCurve) { - TNaming_Builder anEdgeBuilder(selectionLabel().FindChild(anID)); - anEdgeBuilder.Generated(anEdge); + if (aShapeType != TopAbs_EDGE) { // edge do not need the sub-edges on sub-labels + // add edges to sub-label to support naming for edges selection + TopExp_Explorer anEdgeExp(aSubShape, TopAbs_EDGE); + for(; anEdgeExp.More(); anEdgeExp.Next()) { + TopoDS_Edge anEdge = TopoDS::Edge(anEdgeExp.Current()); + Standard_Real aFirst, aLast; + Handle(Geom_Curve) aFaceCurve = BRep_Tool::Curve(anEdge, aFirst, aLast); + if (aFaceCurve == aCurve) { + registerSubShape(selectionLabel(), anEdge, anID, aContextFeature, aMyDoc, ""); + } + } + } else { // put vertices of the selected edge to sub-labels + // add edges to sub-label to support naming for edges selection + TopExp_Explorer anEdgeExp(aSubShape, TopAbs_VERTEX); + int aTagIndex = anID + kSTART_VERTEX_DELTA; + for(; anEdgeExp.More(); anEdgeExp.Next(), aTagIndex += kSTART_VERTEX_DELTA) { + TopoDS_Vertex aV = TopoDS::Vertex(anEdgeExp.Current()); + + std::stringstream anAdditionalName; + registerSubShape(selectionLabel(), aV, aTagIndex, aContextFeature, aMyDoc, + ""); } } } @@ -420,9 +510,189 @@ void Model_AttributeSelection::selectConstruction( // store the selected as primitive TNaming_Builder aBuilder(selectionLabel()); aBuilder.Generated(aSubShape); + registerSubShape(selectionLabel(), aSubShape, 0, aContextFeature, aMyDoc, "", aRefs); } 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); + /* MPV: the same shape with the same name may be duplicated on different labels (selection of the same construction object) + 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 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; +}