-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: Model_SelectionNaming.cpp
-// Created: 11 Aug 2015
-// Author: Mikhail PONIKAROV
+// Copyright (C) 2014-2017 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
#include "Model_SelectionNaming.h"
#include "Model_Document.h"
#include <TNaming_Tool.hxx>
#include <TNaming_NamedShape.hxx>
#include <TNaming_Localizer.hxx>
+#include <TNaming_SameShapeIterator.hxx>
#include <TDataStd_Name.hxx>
#include <TColStd_MapOfTransient.hxx>
#include <algorithm>
myLab = theSelectionLab;
}
+// searches named shape by the shape in the given document (identified by the label)
+// tries to find s shape nearest to the context-label
+static Handle(TNaming_NamedShape) shapeToNS(const TDF_Label theLabAccess,
+ const TopoDS_Shape& theShape, const TDF_Label& theContextLab)
+{
+ Handle(TNaming_NamedShape) aResult;
+ if (!TNaming_Tool::HasLabel(theLabAccess, theShape)) // no shape in the document
+ return aResult;
+ int aContextLabDepth = theContextLab.IsNull() ? 100 : theContextLab.Depth();
+ TNaming_SameShapeIterator aNSIter(theShape, theLabAccess);
+ for(; aNSIter.More(); aNSIter.Next()) {
+ TDF_Label aLabel = aNSIter.Label();
+ Handle(TNaming_NamedShape) aNS;
+ if (aLabel.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
+ if (aNS->Evolution() != TNaming_SELECTED && aNS->Evolution() != TNaming_DELETE) {
+ // check this is new shape in this named shape
+ bool aIsNew = false;
+ for(TNaming_Iterator aNSIter(aNS); aNSIter.More(); aNSIter.Next())
+ if (!aNSIter.NewShape().IsNull() && aNSIter.NewShape().IsSame(theShape))
+ aIsNew = true;
+ if (!aIsNew)
+ continue;
+ // check this is the context-shape
+ while(aLabel.Depth() > aContextLabDepth)
+ aLabel = aLabel.Father();
+ if (aLabel.IsEqual(theContextLab))
+ return aNS;
+ if (aResult.IsNull()) // take the first, otherwise it will get shapes from results, etc
+ aResult = aNS; // keep some result anyway - if there are no context labels return any
+ }
+ }
+ }
+ return aResult;
+}
+
std::string Model_SelectionNaming::getShapeName(
std::shared_ptr<Model_Document> theDoc, const TopoDS_Shape& theShape,
ResultPtr& theContext, const bool theAnotherDoc, const bool theWholeContext)
// add the result name to the name of the shape
// (it was in BodyBuilder, but did not work on Result rename)
bool isNeedContextName = theContext->shape().get() != NULL;
- // && !theContext->shape()->isEqual(theSubSh);
// check if the subShape is already in DF
- Handle(TNaming_NamedShape) aNS = TNaming_Tool::NamedShape(theShape, myLab);
+ std::shared_ptr<Model_Data> aData =
+ std::dynamic_pointer_cast<Model_Data>(theContext->data());
+ TDF_Label aContextDataLab(aData.get() && aData->isValid() ? aData->label() : TDF_Label());
+ Handle(TNaming_NamedShape) aNS = shapeToNS(myLab, theShape, aContextDataLab);
Handle(TDataStd_Name) anAttr;
if(!aNS.IsNull() && !aNS->IsEmpty()) { // in the document
if(aNS->Label().FindAttribute(TDataStd_Name::GetID(), anAttr)) {
- std::shared_ptr<Model_Data> aData =
- std::dynamic_pointer_cast<Model_Data>(theContext->data());
- if (isNeedContextName && aData && aData->label().IsEqual(aNS->Label())) {
+ if (isNeedContextName && aData && aContextDataLab.IsEqual(aNS->Label())) {
// do nothing because this context name will be added later in this method
} else {
aName = TCollection_AsciiString(anAttr->Get()).ToCString();
// indexes are added to sub-shapes not primitives
// (primitives must not be located at the same label)
if(!aName.empty() && aNS->Evolution() != TNaming_PRIMITIVE && isNeedContextName) {
- const TDF_Label& aLabel = aNS->Label();//theDoc->findNamingName(aName);
+ const TDF_Label& aLabel = aNS->Label();
static const std::string aPostFix("_");
TNaming_Iterator anItL(aNS);
for(int i = 1; anItL.More(); anItL.Next(), i++) {
- if(anItL.NewShape().IsSame(theShape)) { // in #1766 IsEqual produced no index of the face
+ // in #1766 IsEqual produced no index of the face
+ if(anItL.NewShape().IsSame(theShape)) {
aName += aPostFix;
aName += TCollection_AsciiString (i).ToCString();
break;
aNewContext = theDoc->objects()->object(aNSDataLab);
}
if (aNewContext.get()) {
- aName = aNewContext->data()->name() + "/" + aName;
+ // this is to avoid duplicated names of results problem
+ std::string aContextName = aNewContext->data()->name();
+ // myLab corresponds to the current time
+ TDF_Label aCurrentLab = myLab;
+ while(aCurrentLab.Depth() > 3)
+ aCurrentLab = aCurrentLab.Father();
+
+ int aNumInHistoryNames =
+ theDoc->numberOfNameInHistory(aNewContext, aCurrentLab);
+ while(aNumInHistoryNames > 1) { // add "_" before name the needed number of times
+ aContextName = "_" + aContextName;
+ aNumInHistoryNames--;
+ }
+
+ aName = aContextName + "/" + aName;
}
}
}
BB.MakeCompound(aCmp);
TopTools_ListIteratorOfListOfShape it(theAncestors);
for(;it.More();it.Next()) {
+ if (theSMap.Contains(it.Value()))
+ continue;
BB.Add(aCmp, it.Value());
theSMap.Add(it.Value());
}
return true;
}
+const TopoDS_Shape findCommonShape(
+ const TopAbs_ShapeEnum theType, const TopTools_ListOfShape& theList)
+{
+ if(theList.Extent() < 1) {
+ return TopoDS_Shape();
+ } else if (theList.Extent() == 1) { // check that sub-shape is bounded by this alone shape
+ TopTools_MapOfShape aSubsInShape;
+ TopExp_Explorer anExp(theList.First(), theType);
+ for(; anExp.More(); anExp.Next()) {
+ if (aSubsInShape.Contains(anExp.Current())) { // found duplicate
+ return anExp.Current();
+ }
+ aSubsInShape.Add(anExp.Current());
+ }
+ }
+
+ // Store in maps sub-shapes from each face.
+ std::vector<TopTools_MapOfShape> aVec;
+ for(TopTools_ListIteratorOfListOfShape anIt(theList); anIt.More(); anIt.Next()) {
+ const TopoDS_Shape aFace = anIt.Value();
+ TopTools_MapOfShape aMap;
+ for(TopExp_Explorer anExp(aFace, theType); anExp.More(); anExp.Next()) {
+ const TopoDS_Shape& aSubShape = anExp.Current();
+ aMap.Add(anExp.Current());
+ }
+ aVec.push_back(aMap);
+ }
+
+ // Find sub-shape shared between all faces.
+ TopoDS_Shape aSharedShape;
+ for(TopTools_MapIteratorOfMapOfShape anIt(aVec[0]); anIt.More(); anIt.Next()) {
+ const TopoDS_Shape& aSubShape = anIt.Value();
+ int aSharedNb = 1;
+ for(int anIndex = 1; anIndex < aVec.size(); ++anIndex) {
+ if(aVec[anIndex].Contains(aSubShape)) {
+ ++aSharedNb;
+ }
+ }
+ if(aSharedNb == theList.Extent()) {
+ if(aSharedShape.IsNull()) {
+ aSharedShape = aSubShape;
+ } else {
+ // More than one shape shared between all faces, return null shape in this case.
+ return TopoDS_Shape();
+ }
+ }
+ }
+
+ return aSharedShape;
+}
+
+// searches theType shape that contains theConnectionType sub-shapes in each shape from the List,
+// so, implements the neighbours searching
+/*
+const TopoDS_Shape findCommonShapeByNB(const TopAbs_ShapeEnum theType,
+ const TopAbs_ShapeEnum theConnectionType, const TopTools_ListOfShape& theList)
+{
+TopTools_MapOfShape aCheckedShapes; // already checked shapes of type theType
+ TopoDS_Shape aResult; // theType result shape
+ for(TopTools_ListIteratorOfListOfShape anIt(theList); anIt.More(); anIt.Next()) { // iterate all
+ for(TopExp_Explorer anExp(anIt.ChangeValue(), theType); anExp.More(); anExp.Next()) {
+ if (aCheckedShapes.Contains(anExp.Current()))
+ continue; // already checked
+ aCheckedShapes.Add(anExp.Current());
+ TopTools_MapOfShape aConnectors; // all connectors of the checked theType shape
+ for(TopExp_Explorer aCExp(anExp.Current(), theConnectionType); aCExp.More(); aCExp.Next()) {
+ aConnectors.Add(aCExp.Current());
+ }
+ // check that all shapes from the List contain the connector sub-shapes
+ bool aFound = true;
+ for(TopTools_ListIteratorOfListOfShape anIt2(theList); anIt2.More() && aFound; anIt2.Next()) {
+ if (anIt2.Value().IsSame(anIt.Value()))
+ continue;
+ aFound = false;
+ for(TopExp_Explorer anE(anIt2.ChangeValue(), theConnectionType); anE.More(); anE.Next()) {
+ if (aConnectors.Contains(anE.Current())) {
+ aFound = true;
+ break;
+ }
+ }
+ }
+ if (aFound) {
+ if (!aResult.IsNull()) // more than one result
+ return TopoDS_Shape();
+ aResult = anExp.Current();
+ }
+ }
+ }
+ return aResult;
+}*/
+
+std::string Model_SelectionNaming::vertexNameByEdges(TopoDS_Shape theContext, TopoDS_Shape theSub,
+ std::shared_ptr<Model_Document> theDoc, ResultPtr& theContextRes, const bool theAnotherDoc)
+{
+ std::string aResult;
+ TopTools_IndexedDataMapOfShapeListOfShape aMap;
+ TopExp::MapShapesAndAncestors(theContext, TopAbs_VERTEX, TopAbs_EDGE, aMap);
+ const TopTools_ListOfShape& aList22 = aMap.FindFromKey(theSub);
+ if(aList22.Extent() >= 2) { // regular solution
+ TopTools_MapOfShape aFMap;
+ TopTools_ListOfShape aListE;
+ TopTools_ListIteratorOfListOfShape itl2(aList22);
+ for (int i = 1;itl2.More();itl2.Next(),i++) {
+ if(aFMap.Add(itl2.Value()))
+ aListE.Append(itl2.Value());
+ }
+ TopTools_ListIteratorOfListOfShape itl(aListE);
+ for (int i = 1;itl.More();itl.Next(),i++) {
+ const TopoDS_Shape& anEdge = itl.Value();
+ std::string anEdgeName = getShapeName(theDoc, anEdge, theContextRes, theAnotherDoc, false);
+ if (anEdgeName.empty()) { // edge is not in DS
+ aResult.clear();
+ return aResult;
+ }
+ if(i == 1)
+ aResult = anEdgeName;
+ else
+ aResult += "&" + anEdgeName;
+ }
+ }
+ return aResult;
+}
+
std::string Model_SelectionNaming::namingName(ResultPtr& theContext,
std::shared_ptr<GeomAPI_Shape> theSubSh, const std::string& theDefaultName,
const bool theAnotherDoc)
{
std::string aName("Undefined name");
- if(!theContext.get() || theContext->shape()->isNull())
+ if(!theContext.get()
+ || !theContext->shape().get()
+ || theContext->shape()->isNull()) {
return !theDefaultName.empty() ? theDefaultName : aName;
+ }
// if it is in result of another part
std::shared_ptr<Model_Document> aDoc =
const TopTools_ListOfShape& anAncestors = aMap.FindFromKey(aSubShape);
// check that it is not a trivial case (F1 & F2: aNumber = 1)
isTrivialCase = isTrivial(anAncestors, aSMap);
+ if (!isTrivialCase) { // another try: check that common shape can be processed anyway
+ isTrivialCase = !findCommonShape(TopAbs_EDGE, anAncestors).IsNull();
+ }
} else
break;
- TopTools_ListOfShape aListOfNbs;
+ TopTools_MapOfShape aNbs;
if(!isTrivialCase) { // find Neighbors
TNaming_Localizer aLocalizer;
TopTools_MapOfShape aMap3;
TopTools_ListIteratorOfListOfShape it2(aList);
for(;it2.More();it2.Next()) {
if(aSMap.Contains(it2.Value())) continue; // skip this Face
- aListOfNbs.Append(it2.Value());
+ aNbs.Add(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);
+ // iterate faces of the context to get stable order, not map-order
+ TopTools_MapOfShape aStoredFaces; // to avoid duplicates
+ for(TopExp_Explorer aContExp(aContext, TopAbs_FACE); aContExp.More(); aContExp.Next()) {
+ const TopoDS_Shape& aFace = aContExp.Current();
+ if (aStoredFaces.Contains(aFace) || !(aSMap.Contains(aFace) || aNbs.Contains(aFace)))
+ continue;
+ aStoredFaces.Add(aFace);
std::string aFaceName = getShapeName(aDoc, aFace, theContext, theAnotherDoc, false);
- if(i == 1)
+ if(aName.empty())
aName = aFaceName;
else
aName += "&" + aFaceName;
}
- TopTools_ListIteratorOfListOfShape itl(aListOfNbs);
- for (;itl.More();itl.Next()) {
- std::string aFaceName = getShapeName(aDoc, itl.Value(), theContext, theAnotherDoc, false);
- aName += "&" + aFaceName;
- }
}
break;
break;
int n = aList.Extent();
bool isByFaces = n >= 3;
+ if (isByFaces) { // check that by faces vertex is identified uniquly (2317)
+ TopoDS_Shape aVertex = findCommonShape(TopAbs_VERTEX, aList);
+ isByFaces = !aVertex.IsNull() && aVertex.ShapeType() == TopAbs_VERTEX;
+ }
+
if(!isByFaces) { // open topology case or Compound case => via edges
- TopTools_IndexedDataMapOfShapeListOfShape aMap;
- TopExp::MapShapesAndAncestors(aContext, TopAbs_VERTEX, TopAbs_EDGE, aMap);
- const TopTools_ListOfShape& aList22 = aMap.FindFromKey(aSubShape);
- if(aList22.Extent() >= 2) { // regular solution
-
- // bug! duplication; fix is below
- aFMap.Clear();
- TopTools_ListOfShape aListE;
- TopTools_ListIteratorOfListOfShape itl2(aList22);
- for (int i = 1;itl2.More();itl2.Next(),i++) {
- if(aFMap.Add(itl2.Value()))
- aListE.Append(itl2.Value());
- }
- n = aListE.Extent();
- TopTools_ListIteratorOfListOfShape itl(aListE);
- for (int i = 1;itl.More();itl.Next(),i++) {
- const TopoDS_Shape& anEdge = itl.Value();
- std::string anEdgeName = getShapeName(aDoc, anEdge, theContext, theAnotherDoc, false);
- if (anEdgeName.empty()) { // edge is not in DS, trying by faces anyway
- isByFaces = true;
- aName.clear();
- break;
+ aName = vertexNameByEdges(aContext, aSubShape, aDoc, theContext, theAnotherDoc);
+ isByFaces = aName.empty();
+ if (isByFaces) { // try to find a vertex in sketch faces
+ ResultConstructionPtr aConstr =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theContext);
+ if (aConstr.get() && aConstr->facesNum()) {
+ for(int aFace = aConstr->facesNum() - 1; isByFaces && aFace >= 0; aFace--) {
+ std::shared_ptr<GeomAPI_Face> aGFace = aConstr->face(aFace);
+ aName = vertexNameByEdges(aGFace->impl<TopoDS_Face>(), aSubShape,
+ aDoc, theContext, theAnotherDoc);
+ isByFaces = aName.empty();
}
- if(i == 1)
- aName = anEdgeName;
- else
- aName += "&" + anEdgeName;
}
- }//reg
- else { // dangle vertex: if(aList22.Extent() == 1)
- //it should be already in DF
}
}
+
if (isByFaces) {
TopTools_ListIteratorOfListOfShape itl(aList);
for (int i = 1;itl.More();itl.Next(),i++) {
break;
}
}
-
return aName;
}
// if we have here the same name as theSubShapeName, there is no index in compound, it is whole
Handle(TDataStd_Name) aName;
if (!theNS->Label().FindAttribute(TDataStd_Name::GetID(), aName) ||
- aName->Get() != theSubShapeName.c_str()) {
+ aName->Get() != aSubString.c_str()) {
aSubString = aSubString.substr(n+1);
indx = atoi(aSubString.c_str());
}
}
const TopoDS_Shape findFaceByName(
- const std::string& theSubShapeName, std::shared_ptr<Model_Document> theDoc)
+ const std::string& theSubShapeName, std::shared_ptr<Model_Document> theDoc,
+ const ResultPtr theDetectedContext, bool theContextIsUnique)
{
TopoDS_Shape aFace;
- //std::string::size_type n, nb = theSubShapeName.rfind('/');
- //if (nb == std::string::npos) nb = 0;
- //std::string aSubString = theSubShapeName.substr(nb + 1);
std::string aSubString = theSubShapeName;
- TDF_Label aLabel = theDoc->findNamingName(aSubString);
+ static const ResultPtr anEmpty;
+ TDF_Label aLabel = theDoc->findNamingName(aSubString,
+ theContextIsUnique ? theDetectedContext : anEmpty);
if (aLabel.IsNull()) { // try to remove additional artificial suffix
std::string::size_type n = aSubString.rfind('_');
if (n != std::string::npos) {
aSubString = aSubString.substr(0, n);
- aLabel = theDoc->findNamingName(aSubString);
+ aLabel = theDoc->findNamingName(aSubString,
+ theContextIsUnique ? theDetectedContext : anEmpty);
}
}
if(aLabel.IsNull()) return aFace;
size_t ParseName(const std::string& theSubShapeName, std::list<std::string>& theList)
{
std::string aName = theSubShapeName;
- std::string aLastName;
+ std::string aLastName = aName;
size_t n1(0), n2(0); // n1 - start position, n2 - position of the delimiter
while ((n2 = aName.find('&', n1)) != std::string::npos) {
const std::string aName1 = aName.substr(n1, n2 - n1); //name of face
return theList.size();
}
-const TopoDS_Shape findCommonShape(
- const TopAbs_ShapeEnum theType, const TopTools_ListOfShape& theList)
-{
- if(theList.IsEmpty() || theList.Extent() == 1) {
- return TopoDS_Shape();
- }
-
- TopoDS_Shape aShape;
- std::vector<TopTools_MapOfShape> aVec;
- TopTools_MapOfShape aMap1, aMap2, aMap3, aMap4;
- if(theList.Extent() > 1) {
- aVec.push_back(aMap1);
- aVec.push_back(aMap2);
- }
- if(theList.Extent() > 2)
- aVec.push_back(aMap3);
- if(theList.Extent() == 4)
- aVec.push_back(aMap4);
-
- //fill maps
- TopTools_ListIteratorOfListOfShape it(theList);
- for(int i = 0;it.More();it.Next(),i++) {
- const TopoDS_Shape& aFace = it.Value();
- if(i < 2) {
- TopExp_Explorer anExp (aFace, theType);
- for(;anExp.More();anExp.Next()) {
- const TopoDS_Shape& anEdge = anExp.Current();
- if (!anEdge.IsNull())
- aVec[i].Add(anExp.Current());
- }
- } else {
- TopExp_Explorer anExp (aFace, TopAbs_VERTEX);
- for(;anExp.More();anExp.Next()) {
- const TopoDS_Shape& aVertex = anExp.Current();
- if (!aVertex.IsNull())
- aVec[i].Add(anExp.Current());
- }
- }
- }
- //trivial case: 2 faces
- TopTools_ListOfShape aList;
- TopTools_MapIteratorOfMapOfShape it2(aVec[0]);
- for(;it2.More();it2.Next()) {
- if(aVec[1].Contains(it2.Key())) {
- aShape = it2.Key();
- if(theList.Extent() == 2)
- break;
- else
- aList.Append(it2.Key());
- }
- }
- if(aList.Extent() && aVec.size() > 3) {// list of common edges ==> search ny neighbors
- if(aVec[2].Extent() && aVec[3].Extent()) {
- TopTools_ListIteratorOfListOfShape it(aList);
- for(;it.More();it.Next()) {
- const TopoDS_Shape& aCand = it.Value();
- // not yet completelly implemented, to be rechecked
- TopoDS_Vertex aV1, aV2;
- TopExp::Vertices(TopoDS::Edge(aCand), aV1, aV2);
- int aNum(0);
- if(aVec[2].Contains(aV1)) aNum++;
- else if(aVec[2].Contains(aV2)) aNum++;
- if(aVec[3].Contains(aV1)) aNum++;
- else if(aVec[3].Contains(aV2)) aNum++;
- if(aNum == 2) {
- aShape = aCand;
- break;
- }
- }
- }
- }
-
- if(aList.Extent() && aVec.size() == 3) {
-
- TopTools_ListIteratorOfListOfShape it(aList);
- for(;it.More();it.Next()) {
- const TopoDS_Shape& aCand = it.Value();
- if(aVec[2].Contains(aCand)) {
- aShape = aCand;
- break;
- }
- }
- }
- return aShape;
-}
-
std::string getContextName(const std::string& theSubShapeName)
{
std::string aName;
std::string aContName = getContextName(aSubShapeName);
if(aContName.empty()) return false;
- ResultPtr aCont = aDoc->findByName(aContName);
+ bool anUniqueContext = false;
+ ResultPtr aCont = aDoc->findByName(aContName, aSubShapeName, anUniqueContext);
// possible this is body where postfix is added to distinguish several shapes on the same label
int aSubShapeId = -1; // -1 means sub shape not found
// for result body the name wihtout "_" has higher priority than with it: it is always added
aContName == aSubShapeName) {
size_t aPostIndex = aContName.rfind('_');
if (aPostIndex != std::string::npos) {
- std::string aSubContName = aContName.substr(0, aPostIndex);
- ResultPtr aSubCont = aDoc->findByName(aSubContName);
+ std::string anEmpty, aSubContName = aContName.substr(0, aPostIndex);
+ ResultPtr aSubCont = aDoc->findByName(aSubContName, anEmpty, anUniqueContext);
if (aSubCont.get()) {
try {
std::string aNum = aContName.substr(aPostIndex + 1);
}
+ static const ResultPtr anEmpty;
TopoDS_Shape aSelection;
switch (aType)
{
case TopAbs_FACE:
case TopAbs_WIRE:
{
- aSelection = findFaceByName(aSubShapeName, aDoc);
+ aSelection = findFaceByName(aSubShapeName, aDoc, aCont, anUniqueContext);
}
break;
case TopAbs_EDGE:
{
- const TDF_Label& aLabel = aDoc->findNamingName(aSubShapeName);
+ const TDF_Label& aLabel =
+ aDoc->findNamingName(aSubShapeName, anUniqueContext ? aCont : anEmpty);
if(!aLabel.IsNull()) {
Handle(TNaming_NamedShape) aNS;
if(aLabel.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
break;
case TopAbs_VERTEX:
{
- const TDF_Label& aLabel = aDoc->findNamingName(aSubShapeName);
+ const TDF_Label& aLabel =
+ aDoc->findNamingName(aSubShapeName, anUniqueContext ? aCont : anEmpty);
if(!aLabel.IsNull()) {
Handle(TNaming_NamedShape) aNS;
if(aLabel.FindAttribute(TNaming_NamedShape::GetID(), aNS)) {
return false;
}
}
+ if (!aSelection.IsNull() &&
+ aSelection.ShapeType() != aType && aSelection.ShapeType() != TopAbs_COMPOUND)
+ aSelection.Nullify(); // to avoid selection of face instead of edge that is described by face
// another try to find edge or vertex by faces
std::list<std::string> aListofNames;
size_t aN = aSelection.IsNull() ? ParseName(aSubShapeName, aListofNames) : 0;
- if (aSelection.IsNull() && (aType == TopAbs_EDGE || aType == TopAbs_VERTEX)) {
- if(aN > 1 && (aN < 4 || (aType == TopAbs_EDGE && aN < 5))) { // 2 || 3 or 4 for EDGE
+ if ((aSelection.IsNull() && (aType == TopAbs_EDGE || aType == TopAbs_VERTEX)) ||
+ (!aSelection.IsNull() && aSelection.ShapeType() != aType)) { // edge by one face as example
+ if(aN >= 1) {
TopTools_ListOfShape aList;
std::list<std::string>::iterator it = aListofNames.begin();
- for(; it != aListofNames.end(); it++){
- const TopoDS_Shape aFace = findFaceByName(*it, aDoc);
+ for(; it != aListofNames.end(); it++) {
+ ResultPtr aFaceContext = aCont;
+ if (it != aListofNames.begin()) { // there may be other context for different sub-faces
+ std::string aContName = getContextName(*it);
+ if(!aContName.empty()) {
+ aFaceContext = aDoc->findByName(aContName, *it, anUniqueContext);
+ }
+ }
+ TopoDS_Shape aFace = findFaceByName(*it, aDoc, aFaceContext, anUniqueContext);
+ if (aFace.IsNull() && aFaceContext.get() &&
+ aFaceContext->groupName() == ModelAPI_ResultConstruction::group() ) {
+ // search the construction sub-elements for the intersection if they are in the tree
+ size_t aSlash = it->find("/");
+ if (aSlash != std::string::npos) {
+ std::string aSubShapeName = it->substr(aSlash + 1);
+ aFace = findFaceByName(aSubShapeName, aDoc, aFaceContext, true);
+ }
+ }
if(!aFace.IsNull())
aList.Append(aFace);
}
aSelection = findCommonShape(aType, aList);
+ //if (aSelection.IsNull() && aType == TopAbs_EDGE) { // try to find selection by neighbours
+ // aSelection = findCommonShapeByNB(aType, TopAbs_VERTEX, aList);
+ //}
}
}
// in case of construction, there is no registered names for all sub-elements,
// even for the main element; so, trying to find them by name (without "&" intersections)
- if (aN == 0) {
+ if (aSelection.IsNull() && aN < 2) {
size_t aConstrNamePos = aSubShapeName.find("/");
bool isFullName = aConstrNamePos == std::string::npos;
- std::string aContrName = aContName;
- ResultPtr aConstr = aDoc->findByName(aContrName);
+ std::string anEmpty, aContrName = aContName;
+ ResultPtr aConstr = aDoc->findByName(aContrName, anEmpty, anUniqueContext);
if (aConstr.get() && aConstr->groupName() == ModelAPI_ResultConstruction::group()) {
theCont = aConstr;
if (isFullName) {
if (aComposite.get()) {
if (aType == TopAbs_VERTEX || aType == TopAbs_EDGE) {
// collect all IDs in the name
+ bool isVertexByEdge = false;
std::map<int, int> anIDs;
if (!parseSubIndices(aComposite, aSubShapeName,
- aType == TopAbs_EDGE ? "Edge" : "Vertex", anIDs))
- return false;
+ aType == TopAbs_EDGE ? "Edge" : "Vertex", anIDs)) {
+ // there is a case when vertex is identified by one circle-edge (2253)
+ if (aType == TopAbs_VERTEX &&
+ parseSubIndices(aComposite, aSubShapeName, "Edge", anIDs))
+ isVertexByEdge = true;
+ else
+ return false;
+ }
const int aSubNum = aComposite->numberOfSubs();
for(int a = 0; a < aSubNum; a++) {
int anOrientation = abs(anIDs[aCompID]);
TopoDS_Shape aShape = aRes->shape()->impl<TopoDS_Shape>();
if (anOrientation == 1) {
- if (aType == aShape.ShapeType()) {
+ if (!isVertexByEdge && aType == aShape.ShapeType()) {
theShapeToBeSelected = aRes->shape();
return true;
+ } else if (isVertexByEdge && aType != aShape.ShapeType()) {
+ // check that there is only one vertex produces by and circular edge
+ TopoDS_Shape aShape = aRes->shape()->impl<TopoDS_Shape>();
+ TopExp_Explorer anExp(aShape, TopAbs_VERTEX);
+ if (anExp.More())
+ aShape = anExp.Current();
+ anExp.Next();
+ if (!anExp.More() || anExp.Current().IsSame(aShape)) {
+ std::shared_ptr<GeomAPI_Shape> aShapeToBeSelected(new GeomAPI_Shape());
+ aShapeToBeSelected->setImpl(new TopoDS_Shape(aShape));
+ theShapeToBeSelected = aShapeToBeSelected;
+ return true;
+ }
}
} else { // take first or second vertex of the edge
TopoDS_Shape aShape = aRes->shape()->impl<TopoDS_Shape>();
+ if (aShape.ShapeType() == TopAbs_VERTEX) continue;
TopExp_Explorer anExp(aShape, aType);
for(; anExp.More() && anOrientation != 2; anOrientation--)
anExp.Next();
}
}
}
+ } else if (aSelection.IsNull() && aN >= 2 && aType == TopAbs_VERTEX) {
+ // support of shape name as intersection separated by "&"
+ static std::string anEdgeType = "edge"; // for now it works only with su-edges
+ std::list<std::string>::iterator aSubNames = aListofNames.begin();
+ TopTools_ListOfShape aSubsList;
+ for(; aSubNames != aListofNames.end(); aSubNames++) {
+ std::string aSubName = *aSubNames;
+ std::shared_ptr<GeomAPI_Shape> aSubShapeFound;
+ std::shared_ptr<ModelAPI_Result> aContextFound;
+ if (selectSubShape(anEdgeType, aSubName, theDoc, aSubShapeFound, aContextFound)) {
+ if (aSubShapeFound.get())
+ aSubsList.Append(aSubShapeFound->impl<TopoDS_Shape>());
+ }
+ }
+ aSelection = findCommonShape(TopAbs_VERTEX, aSubsList);
}
if (!aSelection.IsNull()) {
// Select it (must be after N=0 checking,