kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Toponaming: Fix PropertyTopoShape restore; tweak Loft test; missing TopoShape method.

Browse Source
This commit is contained in:
bgbsww
2024-08-05 11:18:56 -04:00
committed by Chris Hennes
parent 9b898346a7
commit a0b44f8405
7 changed files with 101 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/Mod/Part/App/PropertyTopoShape.cpp
View File

@@ -356,32 +356,28 @@ void PropertyPartShape::Restore(Base::XMLReader &reader)
auto owner = Base::freecad_dynamic_cast<App::DocumentObject>(getContainer());
_Ver = "?";
bool has_ver = reader.hasAttribute("ElementMap");
if(has_ver)
if (has_ver)
_Ver = reader.getAttribute("ElementMap");
int hasher_idx = -1;
int save_hasher = 0;
if ( reader.hasAttribute("HasherIndex") ) {
reader.getAttributeAsInteger("HasherIndex");
}
if ( reader.hasAttribute("SaveHasher") ) {
save_hasher = reader.getAttributeAsInteger("SaveHasher");
}
TopoDS_Shape sh;
int hasher_idx = static_cast<int>(reader.getAttributeAsInteger("HasherIndex", "-1"));
int save_hasher = static_cast<int>(reader.getAttributeAsInteger("SaveHasher", "0"));
if(reader.hasAttribute("file")) {
TopoShape shape;
if (reader.hasAttribute("file")) {
std::string file = reader.getAttribute("file");
if (!file.empty()) {
// initiate a file read
reader.addFile(file.c_str(),this);
reader.addFile(file.c_str(), this);
}
} else if( reader.hasAttribute(("binary")) && reader.getAttributeAsInteger("binary")) {
}
else if (reader.hasAttribute(("binary")) && reader.getAttributeAsInteger("binary")) {
TopoShape shape;
shape.importBinary(reader.beginCharStream());
sh = shape.getShape();
} else if( reader.hasAttribute("brep") && reader.getAttributeAsInteger("brep")) {
BRep_Builder builder;
BRepTools::Read(sh, reader.beginCharStream(), builder);
shape = shape.getShape();
}
else if (reader.hasAttribute("brep") && reader.getAttributeAsInteger("brep")) {
shape.importBrep(reader.beginCharStream(Base::CharStreamFormat::Raw));
}
reader.readEndElement("Part");
@@ -433,25 +429,27 @@ void PropertyPartShape::Restore(Base::XMLReader &reader)
}
}
if (!sh.IsNull() || !_Shape.isNull()) {
if (!shape.isNull() || !_Shape.isNull()) {
aboutToSetValue();
_Shape.setShape(sh,false);
_Shape.setShape(shape.getShape(),false);
hasSetValue();
}
}
// void PropertyPartShape::afterRestore()
// {
// if (_Shape.isRestoreFailed()) {
// // this cause GeoFeature::updateElementReference() to call
// // PropertyLinkBase::updateElementReferences() with reverse = true, in
// // order to try to regenerate the element map
// _Ver = "?";
// }
// else if (_Shape.getElementMapSize() == 0)
// _Shape.Hasher->clear(); //reset();
// PropertyComplexGeoData::afterRestore();
// }
void PropertyPartShape::afterRestore()
{
if (_Shape.isRestoreFailed()) {
// this cause GeoFeature::updateElementReference() to call
// PropertyLinkBase::updateElementReferences() with reverse = true, in
// order to try to regenerate the element map
_Ver = "?";
}
else if (_Shape.getElementMapSize() == 0) {
if (_Shape.Hasher)
_Shape.Hasher->clear();
}
PropertyComplexGeoData::afterRestore();
}
#endif
// The following function is copied from OCCT BRepTools.cxx and modified