OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0029723: Modeling Data - Get rid of second writing format (additional save of UV points)

Browse Source 
Default BinTools_ShapeSet format version has been changed from 3 to 1.
BinMNaming_NamedShapeDriver (Bin OCAF) now writes shapes in 1st version of Binary format instead of 3rd.
XmlMNaming_NamedShapeDriver (Xml OCAF) now writes shapes in 1st version of ASCII  format instead of 2nd.

writebrep now by default writes into 1st binary format version instead of 3rd.
This commit is contained in:
asuraven
2020-12-15 12:31:52 +03:00
committed by bugmaster
parent 2057c37b67
commit 3b1129a546
9 changed files with 75 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BinTools/BinTools_FormatVersion.hxx
View File

@@ -24,7 +24,7 @@ enum BinTools_FormatVersion
BinTools_FormatVersion_VERSION_3 = 3, //!< (OCCT 6.2.1) Correctly processes geometry with points on Curve,
//! or point on Surface, or points on curve of surface [#0009745]
BinTools_FormatVersion_CURRENT = BinTools_FormatVersion_VERSION_3 //!< The current version.
BinTools_FormatVersion_CURRENT = BinTools_FormatVersion_VERSION_1 //!< The current version.
};
#endif

44
src/BinTools/BinTools_ShapeSet.cxx
View File

@@ -94,8 +94,9 @@ BinTools_ShapeSet::~BinTools_ShapeSet()
//=======================================================================
void BinTools_ShapeSet::SetFormatNb(const Standard_Integer theFormatNb)
{
Standard_ASSERT_RETURN(theFormatNb >= BinTools_FormatVersion_VERSION_1 &&
theFormatNb <= BinTools_FormatVersion_CURRENT,
Standard_ASSERT_RETURN(theFormatNb == BinTools_FormatVersion_VERSION_1 ||
theFormatNb == BinTools_FormatVersion_VERSION_2 ||
theFormatNb == BinTools_FormatVersion_VERSION_3,
"Error: unsupported BinTools version.", );
myFormatNb = theFormatNb;
@@ -500,10 +501,12 @@ void BinTools_ShapeSet::Read (Standard_IStream& IS,
S.Free(aFree);
S.Modified(aMod);
if (myFormatNb >= BinTools_FormatVersion_VERSION_2)
S.Checked(aChecked);
else
S.Checked (Standard_False); // force check at reading..
if (myFormatNb != BinTools_FormatVersion_VERSION_2
&& myFormatNb != BinTools_FormatVersion_VERSION_3)
{
aChecked = false; // force check at reading
}
S.Checked (aChecked);
S.Orientable(anOrient);
S.Closed (aClosed);
S.Infinite (anInf);
@@ -703,17 +706,16 @@ void BinTools_ShapeSet::WriteGeometry (const TopoDS_Shape& S,
BinTools::PutReal(OS, last);
// Write UV Points for higher performance
if (myFormatNb >= BinTools_FormatVersion_VERSION_2)
if (myFormatNb == BinTools_FormatVersion_VERSION_2
|| myFormatNb == BinTools_FormatVersion_VERSION_3)
{
gp_Pnt2d Pf,Pl;
if (CR->IsCurveOnClosedSurface()) {
Handle(BRep_CurveOnClosedSurface) COCS =
Handle(BRep_CurveOnClosedSurface)::DownCast(CR);
Handle(BRep_CurveOnClosedSurface) COCS = Handle(BRep_CurveOnClosedSurface)::DownCast(CR);
COCS->UVPoints2(Pf,Pl);
}
else {
Handle(BRep_CurveOnSurface) COS =
Handle(BRep_CurveOnSurface)::DownCast(CR);
Handle(BRep_CurveOnSurface) COS = Handle(BRep_CurveOnSurface)::DownCast(CR);
COS->UVPoints(Pf,Pl);
}
BinTools::PutReal(OS, Pf.X());
@@ -847,9 +849,8 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
BRep_ListOfPointRepresentation& lpr = TV->ChangePoints();
TopLoc_Location L;
Standard_Boolean aNewF = (myFormatNb >= BinTools_FormatVersion_VERSION_3);
do {
if(aNewF) {
if(myFormatNb == BinTools_FormatVersion_VERSION_3) {
val = (Standard_Integer)IS.get();//case {0|1|2|3}
if (val > 0 && val <= 3)
BinTools::GetReal(IS, p1);
@@ -1011,7 +1012,8 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
BinTools::GetReal(IS, last);
// read UV Points // for XML Persistence higher performance
if (myFormatNb >= BinTools_FormatVersion_VERSION_2)
if (myFormatNb == BinTools_FormatVersion_VERSION_2
|| myFormatNb == BinTools_FormatVersion_VERSION_3)
{
BinTools::GetReal(IS, PfX);
BinTools::GetReal(IS, PfY);
@@ -1027,17 +1029,22 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
break;
if (closed) {
if (myFormatNb >= BinTools_FormatVersion_VERSION_2)
if (myFormatNb == BinTools_FormatVersion_VERSION_2
|| myFormatNb == BinTools_FormatVersion_VERSION_3)
{
myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc),
myCurves2d.Curve2d(pc2),
mySurfaces.Surface(s),
Locations().Location(l),tol,
aPf, aPl);
}
else
{
myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc),
myCurves2d.Curve2d(pc2),
mySurfaces.Surface(s),
Locations().Location(l),tol);
}
myBuilder.Continuity(E,
mySurfaces.Surface(s),
@@ -1048,15 +1055,20 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T,
}
else
{
if (myFormatNb >= BinTools_FormatVersion_VERSION_2)
if (myFormatNb == BinTools_FormatVersion_VERSION_2
|| myFormatNb == BinTools_FormatVersion_VERSION_3)
{
myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc),
mySurfaces.Surface(s),
Locations().Location(l),tol,
aPf, aPl);
}
else
{
myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc),
mySurfaces.Surface(s),
Locations().Location(l),tol);
}
}
myBuilder.Range(E,
mySurfaces.Surface(s),