#include <TopExp.hxx>
#include <BRepTools.hxx>
#include <BRep_Tool.hxx>
+#include <BRepTools_History.hxx>
#include <GeomAPI_Shape.h>
#include <GeomAlgoAPI_MakeShape.h>
#include <GeomAlgoAPI_SortListOfShapes.h>
//#define DEB_IMPORT 1
Model_BodyBuilder::Model_BodyBuilder(ModelAPI_Object* theOwner)
-: ModelAPI_BodyBuilder(theOwner)
+: ModelAPI_BodyBuilder(theOwner),
+ myDividedIndex(1),
+ myVIndex(1),
+ myEIndex(1),
+ myFIndex(1)
{
}
void Model_BodyBuilder::evolutionToSelection(const bool theFlag)
{
std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
- if (!aData) // unknown case
+ if (!aData || !aData->isValid()) // unknown case
return;
TDF_Label& aShapeLab = aData->shapeLab();
evolutionToSelectionRec(aShapeLab, theFlag);
}
}
+TNaming_Builder* Model_BodyBuilder::builder(const int theTag)
+{
+ std::map<int, TNaming_Builder*>::iterator aFind = myBuilders.find(theTag);
+ if (aFind == myBuilders.end()) {
+ std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
+ myBuilders[theTag] = new TNaming_Builder(
+ theTag == 0 ? aData->shapeLab() : aData->shapeLab().FindChild(theTag));
+ aFind = myBuilders.find(theTag);
+ }
+ return aFind->second;
+}
+
void Model_BodyBuilder::storeModified(const std::shared_ptr<GeomAPI_Shape>& theOldShape,
const std::shared_ptr<GeomAPI_Shape>& theNewShape, const int theDecomposeSolidsTag)
{
if (aData) {
TDF_Label& aShapeLab = aData->shapeLab();
// clean builders
- clean();
+ if (theDecomposeSolidsTag != -2)
+ clean();
// store the new shape as primitive
- TNaming_Builder aBuilder(aShapeLab);
+ TNaming_Builder* aBuilder = builder(0);
if (!theOldShape || !theNewShape)
return; // bad shape
TopoDS_Shape aShapeOld = theOldShape->impl<TopoDS_Shape>();
TopoDS_Shape aShapeNew = theNewShape->impl<TopoDS_Shape>();
if (aShapeNew.IsNull())
return; // null shape inside
- aBuilder.Modify(aShapeOld, aShapeNew);
- if(!aBuilder.NamedShape()->IsEmpty()) {
+ aBuilder->Modify(aShapeOld, aShapeNew);
+ if(!aBuilder->NamedShape()->IsEmpty()) {
Handle(TDataStd_Name) anAttr;
- if(aBuilder.NamedShape()->Label().FindAttribute(TDataStd_Name::GetID(),anAttr)) {
+ if(aBuilder->NamedShape()->Label().FindAttribute(TDataStd_Name::GetID(),anAttr)) {
std::string aName (TCollection_AsciiString(anAttr->Get()).ToCString());
if(!aName.empty()) {
std::shared_ptr<Model_Document> aDoc =
std::dynamic_pointer_cast<Model_Document>(document());
- aDoc->addNamingName(aBuilder.NamedShape()->Label(), aName);
+ aDoc->addNamingName(aBuilder->NamedShape()->Label(), aName);
}
}
}
myBuilders.clear();
// remove the old reference (if any)
aLab.ForgetAttribute(TDF_Reference::GetID());
+ myDividedIndex = 1;
+ myVIndex = 1;
+ myEIndex = 1;
+ myFIndex = 1;
}
Model_BodyBuilder::~Model_BodyBuilder()
clean();
}
-TNaming_Builder* Model_BodyBuilder::builder(const int theTag)
-{
- std::map<int, TNaming_Builder*>::iterator aFind = myBuilders.find(theTag);
- if (aFind == myBuilders.end()) {
- std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
- myBuilders[theTag] = new TNaming_Builder(
- theTag == 0 ? aData->shapeLab() : aData->shapeLab().FindChild(theTag));
- aFind = myBuilders.find(theTag);
- }
- return aFind->second;
-}
-
void Model_BodyBuilder::buildName(const int theTag, const std::string& theName)
{
std::shared_ptr<Model_Document> aDoc = std::dynamic_pointer_cast<Model_Document>(document());
void Model_BodyBuilder::loadDeletedShapes (GeomAlgoAPI_MakeShape* theMS,
std::shared_ptr<GeomAPI_Shape> theShapeIn,
const int theKindOfShape,
- const int theTag)
+ const int theTag,
+ const GeomShapePtr theShapes)
{
TopoDS_Shape aShapeIn = theShapeIn->impl<TopoDS_Shape>();
TopTools_MapOfShape aView;
TopExp_Explorer ShapeExplorer (aShapeIn, (TopAbs_ShapeEnum)theKindOfShape);
+ GeomShapePtr aResultShape = shape();
for (; ShapeExplorer.More(); ShapeExplorer.Next ()) {
const TopoDS_Shape& aRoot = ShapeExplorer.Current ();
if (!aView.Add(aRoot)) continue;
std::shared_ptr<GeomAPI_Shape> aRShape(new GeomAPI_Shape());
aRShape->setImpl((new TopoDS_Shape(aRoot)));
- if (theMS->isDeleted (aRShape)) {
+ if (!theMS->isDeleted(aRShape)
+ || aResultShape->isSubShape(aRShape, false)
+ || (theShapes.get() && theShapes->isSubShape(aRShape, false))) {
+ continue;
+ }
+
+ ListOfShape aHist;
+ if (BRepTools_History::IsSupportedType(aRoot)) // to avoid crash in #2572
+ theMS->modified(aRShape, aHist);
+ if (aHist.size() == 0 || (aHist.size() == 1 && aHist.front()->isSame(aRShape)))
builder(theTag)->Delete(aRoot);
+ }
+}
+
+static void removeBadShapes(ListOfShape& theShapes)
+{
+ ListOfShape::iterator anIt = theShapes.begin();
+ while (anIt != theShapes.end()) {
+ TopoDS_Shape aNewShape = (*anIt)->impl<TopoDS_Shape>();
+ bool aSkip = aNewShape.IsNull()
+ || (aNewShape.ShapeType() == TopAbs_EDGE && BRep_Tool::Degenerated(TopoDS::Edge(aNewShape)));
+ if (aSkip) {
+ ListOfShape::iterator aRemoveIt = anIt++;
+ theShapes.erase(aRemoveIt);
+ } else {
+ ++anIt;
}
}
}
ListOfShape::iterator anIt = theShapes.begin();
while (anIt != theShapes.end()) {
TopoDS_Shape aNewShape = (*anIt)->impl<TopoDS_Shape>();
- if (theRoot.IsSame(aNewShape) || (theResultShape &&
+ bool aSkip = aNewShape.IsNull() ||
+ (aNewShape.ShapeType() == TopAbs_EDGE && BRep_Tool::Degenerated(TopoDS::Edge(aNewShape)));
+ if (aSkip || theRoot.IsSame(aNewShape) || (theResultShape &&
(!theResultShape->isSubShape(*anIt, false) || theResultShape->isSame(*anIt)))) {
ListOfShape::iterator aRemoveIt = anIt++;
theShapes.erase(aRemoveIt);
const bool theIsStoreSeparate,
const bool theIsStoreAsGenerated)
{
+ static const int THE_ANCHOR_TAG = 100000;
+
int anIndex = 1;
int aTag = theTag;
bool isBuilt = !theName.empty();
TopoDS_Shape aShapeIn = theShapeIn->impl<TopoDS_Shape>();
TopTools_MapOfShape aView;
std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
- TopExp_Explorer aShapeExplorer (aShapeIn, (TopAbs_ShapeEnum)theKindOfShape);
+
+ TopoDS_Shape aShapeToIterate;
+ if (theMS->newShapesCollected(theShapeIn, theKindOfShape)) {
+ // use optimized set of old shapes for this
+ GeomShapePtr aCompound = theMS->oldShapesForNew(theShapeIn, aResultShape, theKindOfShape);
+ if (aCompound.get())
+ aShapeToIterate = aCompound->impl<TopoDS_Shape>();
+ } else {
+ aShapeToIterate = aShapeIn;
+ }
+
+ TopExp_Explorer aShapeExplorer (aShapeToIterate, (TopAbs_ShapeEnum)theKindOfShape);
for (; aShapeExplorer.More(); aShapeExplorer.Next ()) {
const TopoDS_Shape& aRoot = aShapeExplorer.Current ();
if (!aView.Add(aRoot)) continue;
std::shared_ptr<GeomAPI_Shape> aRShape(new GeomAPI_Shape());
aRShape->setImpl((new TopoDS_Shape(aRoot)));
theMS->modified(aRShape, aList);
- if (!theIsStoreSeparate)
- keepTopLevelShapes(aList, aRoot, aResultShape);
+
+ if (!theIsStoreSeparate) {
+ //keepTopLevelShapes(aList, aRoot, aResultShape);
+ removeBadShapes(aList);
+ }
// sort the list of images before naming
GeomAlgoAPI_SortListOfShapes::sort(aList);
// to trace situation where several objects are produced by one parent (#2317)
- int aSameParentShapes = -1;
+ int aSameParentShapes = (aShapeIn.ShapeType() == TopAbs_WIRE
+ || aShapeIn.ShapeType() == TopAbs_SHELL
+ || aShapeIn.ShapeType() == TopAbs_COMPOUND) ? 0 : -1;
std::list<std::shared_ptr<GeomAPI_Shape> >::const_iterator
anIt = aList.begin(), aLast = aList.end();
for (; anIt != aLast; anIt++) {
std::shared_ptr<GeomAPI_Shape> aMapShape(theSubShapes.find(*anIt));
aNewShape.Orientation(aMapShape->impl<TopoDS_Shape>().Orientation());
}
- GeomShapePtr aGeomNewShape(new GeomAPI_Shape());
- aGeomNewShape->setImpl(new TopoDS_Shape(aNewShape));
- if(!aRoot.IsSame(aNewShape) && aResultShape->isSubShape(aGeomNewShape, false) &&
- !aResultShape->isSame(*anIt)) { // to avoid put of same shape on main label and sub
- int aBuilderTag = aTag;
+ isBuilt = !theName.empty();
+ if(!aRoot.IsSame(aNewShape)
+ && aResultShape->isSubShape((*anIt), false)
+ && !aResultShape->isSame(*anIt)) // to avoid put of same shape on main label and sub
+ {
if (!theIsStoreSeparate) {
aSameParentShapes++;
- } else if (aNotInTree) { // check this new shape can not be represented as
- // a sub-shape of higher level sub-shapes
+ } else if (aNotInTree) // check this new shape can not be represented as
+ // a sub-shape of higher level sub-shapes
+ {
TopAbs_ShapeEnum aNewType = aNewShape.ShapeType();
TopAbs_ShapeEnum anAncestorType = typeOfAncestor(aNewType);
if (anAncestorType != TopAbs_VERTEX) {
}
}
- static const int THE_ANCHOR_TAG = 100000;
+ int aFoundTag = 0;
+ bool isFoundSameOld = false;
+ bool isFoundDiffOld = false;
+
+ // Check if new shape was already stored.
+ for (std::map<int, TNaming_Builder*>::iterator aBuildersIt = myBuilders.begin();
+ aBuildersIt != myBuilders.end();
+ ++aBuildersIt)
+ {
+ TNaming_Builder* aBuilder = aBuildersIt->second;
+ for (TNaming_Iterator aNamingIt(aBuilder->NamedShape());
+ aNamingIt.More();
+ aNamingIt.Next())
+ {
+ if (aNamingIt.NewShape().IsSame(aNewShape))
+ {
+ aNamingIt.OldShape().IsSame(aRoot) ? isFoundSameOld = true
+ : isFoundDiffOld = true;
+ aFoundTag = aBuildersIt->first;
+ }
+ }
+
+ if (isFoundSameOld || isFoundDiffOld) break;
+ }
+
+ if (isFoundSameOld) {
+ // Builder already contains same old->new shapes, don't store it twice.
+ continue;
+ }
+
+ int aBuilderTag = aSameParentShapes > 0 ? THE_ANCHOR_TAG : aTag;
+
int aCurShapeType = (int)((*anIt)->shapeType());
bool needSuffix = false; // suffix for the name based on the shape type
- if (aSameParentShapes > 0) { // store in other label
- aBuilderTag = THE_ANCHOR_TAG - aSameParentShapes * 10 - aCurShapeType;
- needSuffix = true;
- } else if (aCurShapeType != theKindOfShape) {
+ if (aCurShapeType != theKindOfShape) {
// modified shape has different type => set another tag
// to avoid shapes of different types on the same label
- aBuilderTag = THE_ANCHOR_TAG - aCurShapeType;
+ aBuilderTag = THE_ANCHOR_TAG;
needSuffix = true;
}
std::string aSuffix;
if (needSuffix) {
switch (aCurShapeType) {
- case GeomAPI_Shape::VERTEX: aSuffix = "_v"; break;
- case GeomAPI_Shape::EDGE: aSuffix = "_e"; break;
- case GeomAPI_Shape::FACE: aSuffix = "_f"; break;
- default: break;
+ case GeomAPI_Shape::VERTEX: aSuffix = "_v_" + std::to_string(myVIndex++); break;
+ case GeomAPI_Shape::EDGE: aSuffix = "_e_" + std::to_string(myEIndex++); break;
+ case GeomAPI_Shape::FACE: aSuffix = "_f_" + std::to_string(myFIndex++); break;
+ default: break;
+ }
+ }
+
+ std::vector<std::pair<TopoDS_Shape, TopoDS_Shape>> aKeepShapes, aMoveShapes;
+ if (isFoundDiffOld) {
+ // Found same new shape with different old shape.
+ if (aFoundTag >= THE_ANCHOR_TAG) {
+ // Found on separated tag.
+ aBuilderTag = aFoundTag; // Store it on the same tag.
+ isBuilt = false; // Don't change name;
+ } else {
+ // Found on previous tag.
+ if (aBuilderTag < THE_ANCHOR_TAG) {
+ // New shape shouls not be separated.
+ aBuilderTag = aFoundTag; // Store it on the same tag.
+ isBuilt = false; // Don't change name;
+ } else {
+ // New shape should be separated from others. Move shapes from found tag to new tag.
+ while (myBuilders.find(aBuilderTag) != myBuilders.end()) {
+ ++aBuilderTag;
+ }
+
+ TNaming_Builder* aFoundBuilder = myBuilders.at(aFoundTag);
+ Handle(TNaming_NamedShape) aFoundNamedShape = aFoundBuilder->NamedShape();
+ TDF_Label aFoundLabel = aFoundNamedShape->Label();
+ TNaming_Evolution anEvolution = aFoundNamedShape->Evolution();
+ for (TNaming_Iterator aNamingIt(aFoundNamedShape);
+ aNamingIt.More();
+ aNamingIt.Next())
+ {
+ std::pair<TopoDS_Shape, TopoDS_Shape> aShapesPair =
+ std::make_pair(aNamingIt.OldShape(), aNamingIt.NewShape());
+ aNamingIt.NewShape().IsSame(aNewShape) ? aMoveShapes.push_back(aShapesPair)
+ : aKeepShapes.push_back(aShapesPair);
+ }
+
+ aFoundNamedShape->Clear();
+ for (std::vector<std::pair<TopoDS_Shape, TopoDS_Shape>>::iterator aKeepIt =
+ aKeepShapes.begin();
+ aKeepIt != aKeepShapes.end();
+ ++aKeepIt)
+ {
+ if (anEvolution == TNaming_GENERATED) {
+ aFoundBuilder->Generated(aKeepIt->first, aKeepIt->second);
+ } else {
+ aFoundBuilder->Modify(aKeepIt->first, aKeepIt->second);
+ }
+ }
+ }
+ }
+ } else if (aBuilderTag == THE_ANCHOR_TAG) {
+ while (myBuilders.find(aBuilderTag) != myBuilders.end()) {
+ ++aBuilderTag;
}
}
// Here we store shapes as generated, to avoid problem when one parent shape produce
// several child shapes. In this case naming could not determine which shape to select.
builder(aBuilderTag)->Generated(aRoot, aNewShape);
+ for (std::vector<std::pair<TopoDS_Shape, TopoDS_Shape>>::iterator aMoveIt =
+ aMoveShapes.begin();
+ aMoveIt != aMoveShapes.end();
+ ++aMoveIt)
+ {
+ builder(aBuilderTag)->Generated(aMoveIt->first, aMoveIt->second);
+ }
} else if (aNotInTree) {
// not in tree -> store as primitive (stored as separated)
builder(aBuilderTag)->Generated(aNewShape);
+ } else if (aCurShapeType != theKindOfShape) {
+ // if different shape type is produced, make it as generated
+ builder(aBuilderTag)->Generated(aRoot, aNewShape);
} else {
builder(aBuilderTag)->Modify(aRoot, aNewShape);
+ for (std::vector<std::pair<TopoDS_Shape, TopoDS_Shape>>::iterator aMoveIt =
+ aMoveShapes.begin();
+ aMoveIt != aMoveShapes.end();
+ ++aMoveIt) {
+ builder(aBuilderTag)->Modify(aMoveIt->first, aMoveIt->second);
+ }
}
if(isBuilt) {
aStream.str(std::string());
aStream.clear();
aStream << theName;
- if(theIsStoreSeparate)
+ if (theIsStoreSeparate && !isFoundDiffOld)
aStream << "_" << anIndex++;
if (aSameParentShapes > 0) {
aStream.str(std::string());
aStream.clear();
- aStream << aName << "_" << aSameParentShapes << "divided";
+ aStream << aName << "_" << "divided" << "_" << myDividedIndex++;
}
aStream << aSuffix;
buildName(aBuilderTag, aStream.str());
}
- if(theIsStoreSeparate) {
+ if(theIsStoreSeparate && !isFoundDiffOld) {
aTag++;
}
} else if (aResultShape->isSame(*anIt)) {
// keep the modification evolution on the root level (2241 - history propagation issue)
- if(theIsStoreAsGenerated) {
- builder(0)->Generated(aRoot, aNewShape);
- } else {
- builder(0)->Modify(aRoot, aNewShape);
+ TNaming_Builder* aBuilder = builder(0);
+ TDF_Label aShapeLab = aBuilder->NamedShape()->Label();
+ Handle(TDF_Reference) aRef;
+ // Store only in case if it does not have reference.
+ if (!aShapeLab.FindAttribute(TDF_Reference::GetID(), aRef)) {
+ if (theIsStoreAsGenerated) {
+ TNaming_Builder* aBuilder = builder(0);
+ if (!aBuilder->NamedShape().IsNull() &&
+ aBuilder->NamedShape()->Evolution() != TNaming_GENERATED) {
+ myBuilders.erase(0); // clear old builder to avoid different evolutions crash
+ }
+ builder(0)->Generated(aRoot, aNewShape);
+ } else {
+ TNaming_Builder* aBuilder = builder(0);
+ if (!aBuilder->NamedShape().IsNull() &&
+ aBuilder->NamedShape()->Evolution() != TNaming_MODIFY) {
+ myBuilders.erase(0); // clear old builder to avoid different evolutions crash
+ }
+ builder(0)->Modify(aRoot, aNewShape);
+ }
}
}
}
std::shared_ptr<GeomAPI_Shape> Model_BodyBuilder::shape()
{
std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
- if (aData) {
+ if (aData && aData->isValid()) {
TDF_Label aShapeLab = aData->shapeLab();
Handle(TDF_Reference) aRef;
if (aShapeLab.FindAttribute(TDF_Reference::GetID(), aRef)) {
