diff --git a/src/BRepTools/BRepTools.cxx b/src/BRepTools/BRepTools.cxx index 7860c5d76a..f4ec0d2162 100644 --- a/src/BRepTools/BRepTools.cxx +++ b/src/BRepTools/BRepTools.cxx @@ -663,19 +663,21 @@ void BRepTools::Dump(const TopoDS_Shape& Sh, Standard_OStream& S) //======================================================================= //function : Write -//purpose : +//purpose : //======================================================================= - -void BRepTools::Write(const TopoDS_Shape& Sh, Standard_OStream& S, +void BRepTools::Write (const TopoDS_Shape& theShape, + Standard_OStream& theStream, + const Standard_Boolean theWithTriangles, + const TopTools_FormatVersion theVersion, const Message_ProgressRange& theProgress) { - BRepTools_ShapeSet SS; - SS.Add(Sh); - SS.Write(S, theProgress); - SS.Write(Sh,S); + BRepTools_ShapeSet aShapeSet (theWithTriangles); + aShapeSet.SetFormatNb (theVersion); + aShapeSet.Add (theShape); + aShapeSet.Write (theStream, theProgress); + aShapeSet.Write (theShape, theStream); } - //======================================================================= //function : Read //purpose : @@ -693,30 +695,34 @@ void BRepTools::Read(TopoDS_Shape& Sh, //======================================================================= //function : Write -//purpose : +//purpose : //======================================================================= - -Standard_Boolean BRepTools::Write(const TopoDS_Shape& Sh, - const Standard_CString File, - const Message_ProgressRange& theProgress) +Standard_Boolean BRepTools::Write (const TopoDS_Shape& theShape, + const Standard_CString theFile, + const Standard_Boolean theWithTriangles, + const TopTools_FormatVersion theVersion, + const Message_ProgressRange& theProgress) { std::ofstream os; - OSD_OpenStream(os, File, std::ios::out); + OSD_OpenStream(os, theFile, std::ios::out); if (!os.is_open() || !os.good()) return Standard_False; Standard_Boolean isGood = (os.good() && !os.eof()); if(!isGood) return isGood; - - BRepTools_ShapeSet SS; - SS.Add(Sh); - + + BRepTools_ShapeSet SS (theWithTriangles); + SS.SetFormatNb (theVersion); + SS.Add (theShape); + os << "DBRep_DrawableShape\n"; // for easy Draw read SS.Write(os, theProgress); isGood = os.good(); - if(isGood ) - SS.Write(Sh,os); + if (isGood) + { + SS.Write (theShape, os); + } os.flush(); isGood = os.good(); diff --git a/src/BRepTools/BRepTools.hxx b/src/BRepTools/BRepTools.hxx index a8cf855b10..9744e3083e 100644 --- a/src/BRepTools/BRepTools.hxx +++ b/src/BRepTools/BRepTools.hxx @@ -17,6 +17,7 @@ #ifndef _BRepTools_HeaderFile #define _BRepTools_HeaderFile +#include #include #include #include @@ -203,20 +204,64 @@ public: //! Dumps the topological structure and the geometry //! of on the stream . Standard_EXPORT static void Dump (const TopoDS_Shape& Sh, Standard_OStream& S); - - //! Writes on in an ASCII format. - Standard_EXPORT static void Write (const TopoDS_Shape& Sh, Standard_OStream& S, + + //! Writes the shape to the stream in an ASCII format TopTools_FormatVersion_VERSION_1. + //! This alias writes shape with triangulation data. + //! @param theShape [in] the shape to write + //! @param theStream [in][out] the stream to output shape into + //! @param theRange the range of progress indicator to fill in + static void Write (const TopoDS_Shape& theShape, + Standard_OStream& theStream, + const Message_ProgressRange& theProgress = Message_ProgressRange()) + { + Write (theShape, theStream, Standard_True, + TopTools_FormatVersion_VERSION_1, theProgress); + } + + //! Writes the shape to the stream in an ASCII format of specified version. + //! @param theShape [in] the shape to write + //! @param theStream [in][out] the stream to output shape into + //! @param theWithTriangles [in] flag which specifies whether to save shape with (TRUE) or without (FALSE) triangles; + //! has no effect on triangulation-only geometry + //! @param theVersion [in] the TopTools format version + //! @param theRange the range of progress indicator to fill in + Standard_EXPORT static void Write (const TopoDS_Shape& theShape, + Standard_OStream& theStream, + const Standard_Boolean theWithTriangles, + const TopTools_FormatVersion theVersion, const Message_ProgressRange& theProgress = Message_ProgressRange()); - + //! Reads a Shape from in returns it in . //! is used to build the shape. Standard_EXPORT static void Read (TopoDS_Shape& Sh, Standard_IStream& S, const BRep_Builder& B, const Message_ProgressRange& theProgress = Message_ProgressRange()); - - //! Writes in . - Standard_EXPORT static Standard_Boolean Write (const TopoDS_Shape& Sh, const Standard_CString File, + + //! Writes the shape to the file in an ASCII format TopTools_FormatVersion_VERSION_1. + //! This alias writes shape with triangulation data. + //! @param theShape [in] the shape to write + //! @param theFile [in] the path to file to output shape into + //! @param theRange the range of progress indicator to fill in + static Standard_Boolean Write (const TopoDS_Shape& theShape, + const Standard_CString theFile, + const Message_ProgressRange& theProgress = Message_ProgressRange()) + { + return Write (theShape, theFile, Standard_True, + TopTools_FormatVersion_VERSION_1, theProgress); + } + + //! Writes the shape to the file in an ASCII format of specified version. + //! @param theShape [in] the shape to write + //! @param theFile [in] the path to file to output shape into + //! @param theWithTriangles [in] flag which specifies whether to save shape with (TRUE) or without (FALSE) triangles; + //! has no effect on triangulation-only geometry + //! @param theVersion [in] the TopTools format version + //! @param theRange the range of progress indicator to fill in + Standard_EXPORT static Standard_Boolean Write (const TopoDS_Shape& theShape, + const Standard_CString theFile, + const Standard_Boolean theWithTriangles, + const TopTools_FormatVersion theVersion, const Message_ProgressRange& theProgress = Message_ProgressRange()); - + //! Reads a Shape from , returns it in . //! is used to build the shape. Standard_EXPORT static Standard_Boolean Read (TopoDS_Shape& Sh, const Standard_CString File, diff --git a/src/BRepTools/BRepTools_ShapeSet.cxx b/src/BRepTools/BRepTools_ShapeSet.cxx index 5b89b218f3..ab569703cc 100644 --- a/src/BRepTools/BRepTools_ShapeSet.cxx +++ b/src/BRepTools/BRepTools_ShapeSet.cxx @@ -82,25 +82,32 @@ //======================================================================= //function : BRepTools_ShapeSet -//purpose : +//purpose : //======================================================================= - -BRepTools_ShapeSet::BRepTools_ShapeSet(const Standard_Boolean isWithTriangles) - :myWithTriangles(isWithTriangles) +BRepTools_ShapeSet::BRepTools_ShapeSet (const Standard_Boolean theWithTriangles) +: myWithTriangles (theWithTriangles) { } //======================================================================= //function : BRepTools_ShapeSet -//purpose : +//purpose : //======================================================================= - -BRepTools_ShapeSet::BRepTools_ShapeSet (const BRep_Builder& B, - const Standard_Boolean isWithTriangles) : - myBuilder(B), myWithTriangles(isWithTriangles) +BRepTools_ShapeSet::BRepTools_ShapeSet (const BRep_Builder& theBuilder, + const Standard_Boolean theWithTriangles) +: myBuilder (theBuilder), + myWithTriangles (theWithTriangles) { } +//======================================================================= +//function : ~BRepTools_ShapeSet +//purpose : +//======================================================================= +BRepTools_ShapeSet::~BRepTools_ShapeSet() +{ + // +} //======================================================================= //function : Clear @@ -592,7 +599,7 @@ void BRepTools_ShapeSet::WriteGeometry (const TopoDS_Shape& S, Standard_OStream OS << "\n"; // Write UV Points // for XML Persistence higher performance - if (FormatNb() == 2) + if (FormatNb() >= TopTools_FormatVersion_VERSION_2) { gp_Pnt2d Pf,Pl; if (CR->IsCurveOnClosedSurface()) { @@ -902,7 +909,7 @@ void BRepTools_ShapeSet::ReadGeometry (const TopAbs_ShapeEnum T, GeomTools::GetReal(IS, last); // read UV Points // for XML Persistence higher performance - if (FormatNb() == 2) + if (FormatNb() >= TopTools_FormatVersion_VERSION_2) { GeomTools::GetReal(IS, PfX); GeomTools::GetReal(IS, PfY); @@ -920,7 +927,7 @@ void BRepTools_ShapeSet::ReadGeometry (const TopAbs_ShapeEnum T, // Modified by Sergey KHROMOV - Wed Apr 24 12:11:17 2002 End if (closed) { - if (FormatNb() == 2) + if (FormatNb() >= TopTools_FormatVersion_VERSION_2) myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc), myCurves2d.Curve2d(pc2), mySurfaces.Surface(s), @@ -941,7 +948,7 @@ void BRepTools_ShapeSet::ReadGeometry (const TopAbs_ShapeEnum T, } else { - if (FormatNb() == 2) + if (FormatNb() >= TopTools_FormatVersion_VERSION_2) myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc), mySurfaces.Surface(s), Locations().Location(l),tol, diff --git a/src/BRepTools/BRepTools_ShapeSet.hxx b/src/BRepTools/BRepTools_ShapeSet.hxx index ac5197b452..3406666af8 100644 --- a/src/BRepTools/BRepTools_ShapeSet.hxx +++ b/src/BRepTools/BRepTools_ShapeSet.hxx @@ -46,16 +46,24 @@ public: DEFINE_STANDARD_ALLOC + //! Builds an empty ShapeSet. + //! @param theWithTriangles flag to write triangulation data + Standard_EXPORT BRepTools_ShapeSet (const Standard_Boolean theWithTriangles = Standard_True); //! Builds an empty ShapeSet. - //! Parameter is added for XML Persistence - Standard_EXPORT BRepTools_ShapeSet (const Standard_Boolean isWithTriangles = Standard_True); - - //! Builds an empty ShapeSet. - //! Parameter is added for XML Persistence - Standard_EXPORT BRepTools_ShapeSet (const BRep_Builder& B, - const Standard_Boolean isWithTriangles = Standard_True); - + //! @param theWithTriangles flag to write triangulation data + Standard_EXPORT BRepTools_ShapeSet (const BRep_Builder& theBuilder, + const Standard_Boolean theWithTriangles = Standard_True); + + Standard_EXPORT virtual ~BRepTools_ShapeSet(); + + //! Return true if shape should be stored with triangles. + Standard_Boolean IsWithTriangles() const { return myWithTriangles; } + + //! Define if shape will be stored with triangles. + //! Ignored (always written) if face defines only triangulation (no surface). + void SetWithTriangles (const Standard_Boolean theWithTriangles) { myWithTriangles = theWithTriangles; } + //! Clears the content of the set. Standard_EXPORT virtual void Clear() Standard_OVERRIDE; diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx index c8c26991c1..9e29d27bf6 100644 --- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx +++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -192,7 +193,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream& else if (aStr == END_TYPES) break; else if (begin) { - if ( aFileVer < 8 ) { + if ( aFileVer < TDocStd_FormatVersion_VERSION_8) { #ifdef DATATYPE_MIGRATION TCollection_AsciiString newName; if(Storage_Schema::CheckTypeMigration(aStr, newName)) { @@ -236,7 +237,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream& Message_ProgressScope aPS(theRange, "Reading data", 3); // 2b. Read the TOC of Sections - if (aFileVer >= 3) { + if (aFileVer >= TDocStd_FormatVersion_VERSION_3) { BinLDrivers_DocumentSection aSection; do { BinLDrivers_DocumentSection::ReadTOC (aSection, theIStream, aFileVer); @@ -347,7 +348,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream& } // Read Sections (post-reading type) - if (aFileVer >= 3) { + if (aFileVer >= TDocStd_FormatVersion_VERSION_3) { BinLDrivers_VectorOfDocumentSection::Iterator aSectIter (mySections); for (; aSectIter.More(); aSectIter.Next()) { BinLDrivers_DocumentSection& aCurSection = aSectIter.ChangeValue(); @@ -569,7 +570,7 @@ Standard_Boolean BinLDrivers_DocumentRetrievalDriver::CheckDocumentVersion( const Standard_Integer theFileVersion, const Standard_Integer theCurVersion) { - if (theFileVersion < 2 || theFileVersion > theCurVersion) { + if (theFileVersion < TDocStd_FormatVersion_VERSION_2 || theFileVersion > theCurVersion) { // file was written with another version return Standard_False; } diff --git a/src/BinMDataStd/BinMDataStd.hxx b/src/BinMDataStd/BinMDataStd.hxx index 50864bb07c..5257638135 100644 --- a/src/BinMDataStd/BinMDataStd.hxx +++ b/src/BinMDataStd/BinMDataStd.hxx @@ -22,6 +22,7 @@ #include #include +#include class BinMDF_ADriverTable; class Message_Messenger; @@ -41,7 +42,7 @@ template static void SetAttributeID(const BinObjMgt_Persistent& theSource, const Handle(T)& anAtt, const Standard_Integer aDocFormatVersion) { Standard_Boolean ok = Standard_True; - if(aDocFormatVersion > 9) { // process user defined guid + if(aDocFormatVersion >= TDocStd_FormatVersion_VERSION_10) { // process user defined guid const Standard_Integer& aPos = theSource.Position(); Standard_GUID aGuid; ok = theSource >> aGuid; diff --git a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx index cc17b78067..3a6fc34675 100644 --- a/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_AsciiStringDriver.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_AsciiStringDriver,BinMDF_ADriver) @@ -62,7 +63,7 @@ Standard_Boolean BinMDataStd_AsciiStringDriver::Paste Standard_Boolean ok = Source >> aString; if (ok) aStrAtt->Set( aString ); - if(RelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 8) { // process user defined guid + if(RelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_9) { // process user defined guid const Standard_Integer& aPos = Source.Position(); Standard_GUID aGuid; ok = Source >> aGuid; diff --git a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx index 5572d807c8..936ee8407d 100644 --- a/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_ByteArrayDriver.cxx @@ -23,6 +23,7 @@ #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ByteArrayDriver,BinMDF_ADriver) @@ -71,7 +72,7 @@ Standard_Boolean BinMDataStd_ByteArrayDriver::Paste(const BinObjMgt_Persistent& anAtt->ChangeArray(bytes); Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Byte aDeltaValue; if (! (theSource >> aDeltaValue)) return Standard_False; diff --git a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx index 089e2cf160..4470dcc662 100644 --- a/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_ExtStringArrayDriver.cxx @@ -23,6 +23,7 @@ #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_ExtStringArrayDriver,BinMDF_ADriver) @@ -81,7 +82,7 @@ Standard_Boolean BinMDataStd_ExtStringArrayDriver::Paste if(ok) { Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Byte aDeltaValue; if (! (theSource >> aDeltaValue)) { return Standard_False; diff --git a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx index 84a0e39749..9fcaa6c03d 100644 --- a/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_GenericExtStringDriver.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_GenericExtStringDriver,BinMDF_ADriver) @@ -67,7 +68,7 @@ Standard_Boolean BinMDataStd_GenericExtStringDriver::Paste Standard_Boolean ok = Source >> aStr; if (ok) aStrAttr->Set( aStr ); - if(RelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 8) { // process user defined guid + if(RelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_9) { // process user defined guid const Standard_Integer& aPos = Source.Position(); Standard_GUID aGuid; ok = Source >> aGuid; diff --git a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx index 5d2dd63fef..3bade5243e 100644 --- a/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_IntPackedMapDriver.cxx @@ -28,6 +28,7 @@ #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntPackedMapDriver,BinMDF_ADriver) @@ -87,7 +88,7 @@ Standard_Boolean BinMDataStd_IntPackedMapDriver::Paste } Standard_Boolean aDelta(Standard_False); - if(RelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(RelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Byte aDeltaValue; if (! (Source >> aDeltaValue)) return Standard_False; diff --git a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx index d0663b17f3..a25cb4e215 100644 --- a/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_IntegerArrayDriver.cxx @@ -22,6 +22,7 @@ #include #include #include +#include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerArrayDriver,BinMDF_ADriver) @@ -69,7 +70,7 @@ Standard_Boolean BinMDataStd_IntegerArrayDriver::Paste if(!theSource.GetIntArray (&aTargetArray(aFirstInd), aLength)) return Standard_False; Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Byte aDeltaValue; if (! (theSource >> aDeltaValue)) return Standard_False; diff --git a/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx b/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx index 5325bdfd8f..89b6025be0 100644 --- a/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_IntegerDriver.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_IntegerDriver,BinMDF_ADriver) @@ -59,7 +60,7 @@ Standard_Boolean BinMDataStd_IntegerDriver::Paste Standard_Boolean ok = theSource >> aValue; if (ok) anAtt->Set(aValue); - if(theRT.GetHeaderData()->StorageVersion().IntegerValue() > 8) { // process user defined guid + if(theRT.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_9) { // process user defined guid const Standard_Integer& aPos = theSource.Position(); Standard_GUID aGuid; ok = theSource >> aGuid; diff --git a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx index f6d41acba6..69447573c5 100644 --- a/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_RealArrayDriver.cxx @@ -70,7 +70,7 @@ Standard_Boolean BinMDataStd_RealArrayDriver::Paste return Standard_False; Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Byte aDeltaValue; if (! (theSource >> aDeltaValue)) return Standard_False; diff --git a/src/BinMDataStd/BinMDataStd_RealDriver.cxx b/src/BinMDataStd/BinMDataStd_RealDriver.cxx index 5c0111ef3d..10fe079d85 100644 --- a/src/BinMDataStd/BinMDataStd_RealDriver.cxx +++ b/src/BinMDataStd/BinMDataStd_RealDriver.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(BinMDataStd_RealDriver,BinMDF_ADriver) @@ -59,7 +60,7 @@ Standard_Boolean BinMDataStd_RealDriver::Paste Standard_Boolean ok = theSource >> aValue; if (ok) anAtt->Set(aValue); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 8) { // process user defined guid + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_9) { // process user defined guid const Standard_Integer& aPos = theSource.Position(); Standard_GUID aGuid; ok = theSource >> aGuid; diff --git a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx index 767c19d8ff..eeb1a35354 100644 --- a/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx +++ b/src/BinMNaming/BinMNaming_NamedShapeDriver.cxx @@ -34,7 +34,6 @@ IMPLEMENT_STANDARD_RTTIEXT(BinMNaming_NamedShapeDriver,BinMDF_ADriver) #define SHAPESET "SHAPE_SECTION" -#define FORMAT_NUMBER 3 //======================================================================= static Standard_Character EvolutionToChar(const TNaming_Evolution theEvol) { @@ -142,7 +141,9 @@ static int TranslateFrom (const BinObjMgt_Persistent& theSource, BinMNaming_NamedShapeDriver::BinMNaming_NamedShapeDriver (const Handle(Message_Messenger)& theMsgDriver) - : BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TNaming_NamedShape)->Name()), myShapeSet(Standard_False),myFormatNb(FORMAT_NUMBER) +: BinMDF_ADriver (theMsgDriver, STANDARD_TYPE(TNaming_NamedShape)->Name()), + myShapeSet (Standard_False), + myFormatNb (BinTools_FormatVersion_VERSION_3) { } diff --git a/src/BinMNaming/BinMNaming_NamingDriver.cxx b/src/BinMNaming/BinMNaming_NamingDriver.cxx index 5a45a1e074..96c703898a 100644 --- a/src/BinMNaming/BinMNaming_NamingDriver.cxx +++ b/src/BinMNaming/BinMNaming_NamingDriver.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -237,7 +238,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste myMessageDriver->Send (aMsg, Message_Warning); } - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 3) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_4) { TCollection_AsciiString entry; ok = theSource >> entry; if(ok) { @@ -254,8 +255,8 @@ Standard_Boolean BinMNaming_NamingDriver::Paste aName.ContextLabel(tLab); } } - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 4 && - theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < 7) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_5 && + theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() <= TDocStd_FormatVersion_VERSION_6) { // Orientation processing - converting from old format Handle(TNaming_NamedShape) aNShape; if(anAtt->Label().FindAttribute(TNaming_NamedShape::GetID(), aNShape)) { @@ -274,7 +275,7 @@ Standard_Boolean BinMNaming_NamingDriver::Paste } } } - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 6) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_7) { ok = theSource >> anIndx; TopAbs_Orientation OrientationToApply(TopAbs_FORWARD); if(ok) { diff --git a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx index 43fa820dfe..dfee78838a 100644 --- a/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx +++ b/src/BinMXCAFDoc/BinMXCAFDoc_LocationDriver.cxx @@ -93,7 +93,7 @@ Standard_Boolean BinMXCAFDoc_LocationDriver::Translate(const BinObjMgt_Persisten } Standard_Integer aFileVer = theMap.GetHeaderData()->StorageVersion().IntegerValue(); - if( aFileVer > 5 && myLocations == 0 ) + if( aFileVer >= TDocStd_FormatVersion_VERSION_6 && myLocations == 0 ) { return Standard_False; } @@ -101,7 +101,7 @@ Standard_Boolean BinMXCAFDoc_LocationDriver::Translate(const BinObjMgt_Persisten Standard_Integer aPower; Handle(TopLoc_Datum3D) aDatum; - if( aFileVer > 5 ) + if( aFileVer >= TDocStd_FormatVersion_VERSION_6) { const TopLoc_Location& aLoc = myLocations->Location(anId); aPower = aLoc.FirstPower(); diff --git a/src/BinTools/BinTools.cxx b/src/BinTools/BinTools.cxx index 16237e5a87..741be0e7ac 100644 --- a/src/BinTools/BinTools.cxx +++ b/src/BinTools/BinTools.cxx @@ -171,14 +171,16 @@ Standard_IStream& BinTools::GetBool(Standard_IStream& IS, Standard_Boolean& aVal //======================================================================= //function : Write -//purpose : +//purpose : //======================================================================= - -void BinTools::Write (const TopoDS_Shape& theShape, Standard_OStream& theStream, +void BinTools::Write (const TopoDS_Shape& theShape, + Standard_OStream& theStream, + const Standard_Boolean theWithTriangles, + const BinTools_FormatVersion theVersion, const Message_ProgressRange& theRange) { - BinTools_ShapeSet aShapeSet(Standard_True); - aShapeSet.SetFormatNb (3); + BinTools_ShapeSet aShapeSet (theWithTriangles); + aShapeSet.SetFormatNb (theVersion); aShapeSet.Add (theShape); aShapeSet.Write (theStream, theRange); aShapeSet.Write (theShape, theStream); @@ -199,10 +201,12 @@ void BinTools::Read (TopoDS_Shape& theShape, Standard_IStream& theStream, //======================================================================= //function : Write -//purpose : +//purpose : //======================================================================= - -Standard_Boolean BinTools::Write (const TopoDS_Shape& theShape, const Standard_CString theFile, +Standard_Boolean BinTools::Write (const TopoDS_Shape& theShape, + const Standard_CString theFile, + const Standard_Boolean theWithTriangles, + const BinTools_FormatVersion theVersion, const Message_ProgressRange& theRange) { std::ofstream aStream; @@ -211,7 +215,7 @@ Standard_Boolean BinTools::Write (const TopoDS_Shape& theShape, const Standard_C if (!aStream.good()) return Standard_False; - Write (theShape, aStream, theRange); + Write (theShape, aStream, theWithTriangles, theVersion, theRange); aStream.close(); return aStream.good(); } diff --git a/src/BinTools/BinTools.hxx b/src/BinTools/BinTools.hxx index 07ad4655bb..efbf8239d1 100644 --- a/src/BinTools/BinTools.hxx +++ b/src/BinTools/BinTools.hxx @@ -16,6 +16,7 @@ #ifndef _BinTools_HeaderFile #define _BinTools_HeaderFile +#include #include #include #include @@ -62,20 +63,61 @@ public: Standard_EXPORT static Standard_IStream& GetBool (Standard_IStream& IS, Standard_Boolean& theValue); Standard_EXPORT static Standard_IStream& GetExtChar (Standard_IStream& IS, Standard_ExtCharacter& theValue); - - //! Writes on in binary format. - Standard_EXPORT static void Write (const TopoDS_Shape& theShape, Standard_OStream& theStream, - const Message_ProgressRange& theRange = Message_ProgressRange()); - + + //! Writes the shape to the stream in binary format BinTools_FormatVersion_CURRENT. + //! This alias writes shape with triangulation data. + //! @param theShape [in] the shape to write + //! @param theStream [in][out] the stream to output shape into + //! @param theRange the range of progress indicator to fill in + static void Write (const TopoDS_Shape& theShape, + Standard_OStream& theStream, + const Message_ProgressRange& theRange = Message_ProgressRange()) + { + Write (theShape, theStream, Standard_True, + BinTools_FormatVersion_CURRENT, theRange); + } + + //! Writes the shape to the stream in binary format of specified version. + //! @param theShape [in] the shape to write + //! @param theStream [in][out] the stream to output shape into + //! @param theWithTriangles [in] flag which specifies whether to save shape with (TRUE) or without (FALSE) triangles; + //! has no effect on triangulation-only geometry + //! @param theVersion [in] the BinTools format version + //! @param theRange the range of progress indicator to fill in + Standard_EXPORT static void Write(const TopoDS_Shape& theShape, Standard_OStream& theStream, + const Standard_Boolean theWithTriangles, + const BinTools_FormatVersion theVersion, + const Message_ProgressRange& theRange = Message_ProgressRange()); + //! Reads a shape from and returns it in . Standard_EXPORT static void Read (TopoDS_Shape& theShape, Standard_IStream& theStream, const Message_ProgressRange& theRange = Message_ProgressRange()); - - //! Writes in . - Standard_EXPORT static Standard_Boolean Write - (const TopoDS_Shape& theShape, const Standard_CString theFile, - const Message_ProgressRange& theRange = Message_ProgressRange()); - + + //! Writes the shape to the file in binary format BinTools_FormatVersion_CURRENT. + //! @param theShape [in] the shape to write + //! @param theFile [in] the path to file to output shape into + //! @param theRange the range of progress indicator to fill in + static Standard_Boolean Write (const TopoDS_Shape& theShape, + const Standard_CString theFile, + const Message_ProgressRange& theRange = Message_ProgressRange()) + { + return Write (theShape, theFile, Standard_True, + BinTools_FormatVersion_CURRENT, theRange); + } + + //! Writes the shape to the file in binary format of specified version. + //! @param theShape [in] the shape to write + //! @param theFile [in] the path to file to output shape into + //! @param theWithTriangles [in] flag which specifies whether to save shape with (TRUE) or without (FALSE) triangles; + //! has no effect on triangulation-only geometry + //! @param theVersion [in] the BinTools format version + //! @param theRange the range of progress indicator to fill in + Standard_EXPORT static Standard_Boolean Write (const TopoDS_Shape& theShape, + const Standard_CString theFile, + const Standard_Boolean theWithTriangles, + const BinTools_FormatVersion theVersion, + const Message_ProgressRange& theRange = Message_ProgressRange()); + //! Reads a shape from and returns it in . Standard_EXPORT static Standard_Boolean Read (TopoDS_Shape& theShape, const Standard_CString theFile, diff --git a/src/BinTools/BinTools_FormatVersion.hxx b/src/BinTools/BinTools_FormatVersion.hxx new file mode 100644 index 0000000000..6255f6ce10 --- /dev/null +++ b/src/BinTools/BinTools_FormatVersion.hxx @@ -0,0 +1,30 @@ +// Copyright (c) 2020 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _BinToolsFormatVersion_HeaderFile +#define _BinToolsFormatVersion_HeaderFile + +//! Defined BinTools format version +enum BinTools_FormatVersion +{ + BinTools_FormatVersion_VERSION_1 = 1, //!< Does not write CurveOnSurface UV Points into the file. + //! On reading calls Check() method. + BinTools_FormatVersion_VERSION_2 = 2, //!< Stores CurveOnSurface UV Points. + //! On reading format is recognized from Version string. + 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. +}; + +#endif diff --git a/src/BinTools/BinTools_ShapeSet.cxx b/src/BinTools/BinTools_ShapeSet.cxx index eaec192d4a..59303c7c78 100644 --- a/src/BinTools/BinTools_ShapeSet.cxx +++ b/src/BinTools/BinTools_ShapeSet.cxx @@ -55,9 +55,10 @@ #include //#define MDTV_DEB 1 -const char* Version_1 = "Open CASCADE Topology V1 (c)"; -const char* Version_2 = "Open CASCADE Topology V2 (c)"; -const char* Version_3 = "Open CASCADE Topology V3 (c)"; +Standard_CString BinTools_ShapeSet::Version_1 = "Open CASCADE Topology V1 (c)"; +Standard_CString BinTools_ShapeSet::Version_2 = "Open CASCADE Topology V2 (c)"; +Standard_CString BinTools_ShapeSet::Version_3 = "Open CASCADE Topology V3 (c)"; + //======================================================================= //function : operator << (gp_Pnt) //purpose : @@ -72,11 +73,11 @@ static Standard_OStream& operator <<(Standard_OStream& OS, const gp_Pnt P) } //======================================================================= //function : BinTools_ShapeSet -//purpose : +//purpose : //======================================================================= - -BinTools_ShapeSet::BinTools_ShapeSet(const Standard_Boolean isWithTriangles) - :myFormatNb(3), myWithTriangles(isWithTriangles) +BinTools_ShapeSet::BinTools_ShapeSet (const Standard_Boolean theWithTriangles) +: myFormatNb (BinTools_FormatVersion_CURRENT), + myWithTriangles (theWithTriangles) {} //======================================================================= @@ -93,6 +94,10 @@ BinTools_ShapeSet::~BinTools_ShapeSet() //======================================================================= void BinTools_ShapeSet::SetFormatNb(const Standard_Integer theFormatNb) { + Standard_ASSERT_RETURN(theFormatNb >= BinTools_FormatVersion_VERSION_1 && + theFormatNb <= BinTools_FormatVersion_CURRENT, + "Error: unsupported BinTools version.", ); + myFormatNb = theFormatNb; } @@ -325,14 +330,19 @@ void BinTools_ShapeSet::WriteGeometry (Standard_OStream& OS, void BinTools_ShapeSet::Write (Standard_OStream& OS, const Message_ProgressRange& theRange)const { - // write the copyright - if (myFormatNb == 3) + if (myFormatNb == BinTools_FormatVersion_VERSION_3) + { OS << "\n" << Version_3 << "\n"; - else if (myFormatNb == 2) + } + else if (myFormatNb == BinTools_FormatVersion_VERSION_2) + { OS << "\n" << Version_2 << "\n"; + } else + { OS << "\n" << Version_1 << "\n"; + } //----------------------------------------- // write the locations @@ -415,13 +425,22 @@ void BinTools_ShapeSet::Read (Standard_IStream& IS, } while ( ! IS.fail() && strcmp(vers,Version_1) && strcmp(vers,Version_2) && strcmp(vers,Version_3)); if (IS.fail()) { - std::cout << "BinTools_ShapeSet::Read: File was not written with this version of the topology"<= 2) + if (myFormatNb >= BinTools_FormatVersion_VERSION_2) S.Checked(aChecked); else S.Checked (Standard_False); // force check at reading.. @@ -491,7 +510,7 @@ void BinTools_ShapeSet::Read (Standard_IStream& IS, S.Convex (aConv); // check - if (myFormatNb == 1) + if (myFormatNb == BinTools_FormatVersion_VERSION_1) if(T == TopAbs_FACE) { const TopoDS_Face& F = TopoDS::Face(S); BRepTools::Update(F); @@ -684,7 +703,7 @@ void BinTools_ShapeSet::WriteGeometry (const TopoDS_Shape& S, BinTools::PutReal(OS, last); // Write UV Points for higher performance - if (FormatNb() >= 2) + if (myFormatNb >= BinTools_FormatVersion_VERSION_2) { gp_Pnt2d Pf,Pl; if (CR->IsCurveOnClosedSurface()) { @@ -828,7 +847,7 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T, BRep_ListOfPointRepresentation& lpr = TV->ChangePoints(); TopLoc_Location L; - Standard_Boolean aNewF = (myFormatNb > 2); + Standard_Boolean aNewF = (myFormatNb >= BinTools_FormatVersion_VERSION_3); do { if(aNewF) { val = (Standard_Integer)IS.get();//case {0|1|2|3} @@ -992,7 +1011,7 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T, BinTools::GetReal(IS, last); // read UV Points // for XML Persistence higher performance - if (FormatNb() >= 2) + if (myFormatNb >= BinTools_FormatVersion_VERSION_2) { BinTools::GetReal(IS, PfX); BinTools::GetReal(IS, PfY); @@ -1008,7 +1027,7 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T, break; if (closed) { - if (FormatNb() >= 2) + if (myFormatNb >= BinTools_FormatVersion_VERSION_2) myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc), myCurves2d.Curve2d(pc2), mySurfaces.Surface(s), @@ -1029,7 +1048,7 @@ void BinTools_ShapeSet::ReadGeometry(const TopAbs_ShapeEnum T, } else { - if (FormatNb() >= 2) + if (myFormatNb >= BinTools_FormatVersion_VERSION_2) myBuilder.UpdateEdge(E,myCurves2d.Curve2d(pc), mySurfaces.Surface(s), Locations().Location(l),tol, diff --git a/src/BinTools/BinTools_ShapeSet.hxx b/src/BinTools/BinTools_ShapeSet.hxx index bbc171cfe0..365d6146d7 100644 --- a/src/BinTools/BinTools_ShapeSet.hxx +++ b/src/BinTools/BinTools_ShapeSet.hxx @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -44,11 +45,10 @@ public: DEFINE_STANDARD_ALLOC - //! Builds an empty ShapeSet. - //! Parameter is added for XML Persistence - Standard_EXPORT BinTools_ShapeSet(const Standard_Boolean isWithTriangles = Standard_False); - + //! @param theWithTriangles [in] flag to write triangulation data + Standard_EXPORT BinTools_ShapeSet (const Standard_Boolean theWithTriangles = Standard_False); + Standard_EXPORT virtual ~BinTools_ShapeSet(); //! Return true if shape should be stored with triangles. @@ -56,15 +56,12 @@ public: //! Define if shape will be stored with triangles. //! Ignored (always written) if face defines only triangulation (no surface). - void SetWithTriangles (const Standard_Boolean isWithTriangles) { myWithTriangles = isWithTriangles; } + void SetWithTriangles (const Standard_Boolean theWithTriangles) { myWithTriangles = theWithTriangles; } + //! Sets the BinTools_FormatVersion. Standard_EXPORT void SetFormatNb (const Standard_Integer theFormatNb); - - //! two formats available for the moment: - //! First: does not write CurveOnSurface UV Points into the file - //! on reading calls Check() method. - //! Second: stores CurveOnSurface UV Points. - //! On reading format is recognized from Version string. + + //! Returns the BinTools_FormatVersion. Standard_EXPORT Standard_Integer FormatNb() const; //! Clears the content of the set. @@ -194,6 +191,12 @@ public: (Standard_OStream& OS, const Message_ProgressRange& theRange = Message_ProgressRange()) const; +public: + + static Standard_CString Version_1; + static Standard_CString Version_2; + static Standard_CString Version_3; + private: TopTools_IndexedMapOfShape myShapes; diff --git a/src/BinTools/FILES b/src/BinTools/FILES index fd4a059d36..93f41e661f 100644 --- a/src/BinTools/FILES +++ b/src/BinTools/FILES @@ -4,6 +4,7 @@ BinTools_Curve2dSet.cxx BinTools_Curve2dSet.hxx BinTools_CurveSet.cxx BinTools_CurveSet.hxx +BinTools_FormatVersion.hxx BinTools_LocationSet.cxx BinTools_LocationSet.hxx BinTools_LocationSetPtr.hxx diff --git a/src/DBRep/DBRep.cxx b/src/DBRep/DBRep.cxx index ff00a8ab6b..4355685412 100644 --- a/src/DBRep/DBRep.cxx +++ b/src/DBRep/DBRep.cxx @@ -14,7 +14,7 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. - +#include #include #include #include @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -1376,47 +1377,180 @@ static Standard_Integer XProgress (Draw_Interpretor& di, Standard_Integer argc, } //======================================================================= -// binsave +// writebrep //======================================================================= - -static Standard_Integer binsave(Draw_Interpretor& di, Standard_Integer n, const char** a) +static Standard_Integer writebrep (Draw_Interpretor& theDI, + Standard_Integer theNbArgs, + const char** theArgVec) { - if (n <= 2) return 1; - - TopoDS_Shape aShape = DBRep::Get (a[1]); - if (aShape.IsNull()) + Standard_Integer aVersion = -1; + TCollection_AsciiString aShapeName, aFileName; + TopoDS_Shape aShape; + bool isBinaryFormat = false, isWithTriangles = true; + if (!strcasecmp (theArgVec[0], "binsave")) { - di << a[1] << " is not a shape"; + isBinaryFormat = true; + } + + for (Standard_Integer anArgIter = 1; anArgIter < theNbArgs; ++anArgIter) + { + TCollection_AsciiString aParam (theArgVec[anArgIter]); + aParam.LowerCase(); + if (aParam == "-binary") + { + isBinaryFormat = true; + if (anArgIter + 1 < theNbArgs + && Draw::ParseOnOff (theArgVec[anArgIter + 1], isBinaryFormat)) + { + ++anArgIter; + } + } + else if (aParam == "-version" + && anArgIter + 1 < theNbArgs) + { + aVersion = Draw::Atoi (theArgVec[++anArgIter]); + if (aVersion <= 0) + { + theDI << "Syntax error: unknown version"; + return 1; + } + } + else if (aParam == "-notriangles" + || aParam == "-triangles") + { + isWithTriangles = true; + if (anArgIter + 1 < theNbArgs + && Draw::ParseOnOff (theArgVec[anArgIter + 1], isWithTriangles)) + { + ++anArgIter; + } + if (aParam == "-notriangles") + { + isWithTriangles = !isWithTriangles; + } + } + else if (aShapeName.IsEmpty()) + { + aShapeName = theArgVec[anArgIter]; + aShape = DBRep::Get (aShapeName); + if (aShape.IsNull()) + { + theDI << "Syntax error: " << aShapeName << " is not a shape"; + return 1; + } + } + else if (aFileName.IsEmpty()) + { + aFileName = theArgVec[anArgIter]; + } + else + { + theDI << "Syntax error: unknown argument '" << aParam << "'"; + return 1; + } + } + if (aFileName.IsEmpty()) + { + theDI << "Syntax error: wrong number of arguments"; return 1; } - if (!BinTools::Write (aShape, a[2])) + Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI); + if (isBinaryFormat) { - di << "Cannot write to the file " << a[2]; - return 1; - } + if (aVersion > BinTools_FormatVersion_CURRENT) + { + theDI << "Syntax error: unknown format version"; + return 1; + } - di << a[1]; + BinTools_FormatVersion aBinToolsVersion = aVersion > 0 + ? static_cast (aVersion) + : BinTools_FormatVersion_CURRENT; + if (!BinTools::Write (aShape, aFileName.ToCString(), isWithTriangles, aBinToolsVersion, aProgress->Start())) + { + theDI << "Cannot write to the file " << aFileName; + return 1; + } + } + else + { + if (aVersion > TopTools_FormatVersion_VERSION_2) + { + theDI << "Syntax error: unknown format version"; + return 1; + } + + TopTools_FormatVersion aTopToolsVersion = aVersion > 0 + ? static_cast (aVersion) + : TopTools_FormatVersion_CURRENT; + if (!BRepTools::Write (aShape, aFileName.ToCString(), isWithTriangles, aTopToolsVersion, aProgress->Start())) + { + theDI << "Cannot write to the file " << aFileName; + return 1; + } + } + theDI << aShapeName; return 0; } //======================================================================= -// binrestore +// readbrep //======================================================================= - -static Standard_Integer binrestore(Draw_Interpretor& di, Standard_Integer n, const char** a) +static Standard_Integer readbrep (Draw_Interpretor& theDI, + Standard_Integer theNbArgs, + const char** theArgVec) { - if (n <= 2) return 1; - - TopoDS_Shape aShape; - if (!BinTools::Read (aShape, a[1])) + if (theNbArgs != 3) { - di << "Cannot read from the file " << a[1]; + theDI << "Syntax error: wrong number of arguments"; return 1; } - DBRep::Set (a[2], aShape); - di << a[2]; + Standard_CString aFileName = theArgVec[1]; + Standard_CString aShapeName = theArgVec[2]; + bool isBinaryFormat = true; + { + // probe file header to recognize format + std::ifstream aFile; + OSD_OpenStream (aFile, aFileName, std::ios::in | std::ios::binary); + if (!aFile.is_open()) + { + theDI << "Error: cannot read the file '" << aFileName << "'"; + return 1; + } + + char aStringBuf[255] = {}; + aFile.read (aStringBuf, 255); + if (aFile.fail()) + { + theDI << "Error: cannot read the file '" << aFileName << "'"; + return 1; + } + isBinaryFormat = !(::strncmp (aStringBuf, "DBRep_DrawableShape", 19) == 0); + } + + Handle(Draw_ProgressIndicator) aProgress = new Draw_ProgressIndicator (theDI); + TopoDS_Shape aShape; + if (isBinaryFormat) + { + if (!BinTools::Read (aShape, aFileName, aProgress->Start())) + { + theDI << "Error: cannot read from the file '" << aFileName << "'"; + return 1; + } + } + else + { + if (!BRepTools::Read (aShape, aFileName, BRep_Builder(), aProgress->Start())) + { + theDI << "Error: cannot read from the file '" << aFileName << "'"; + return 1; + } + } + + DBRep::Set (aShapeName, aShape); + theDI << aShapeName; return 0; } @@ -1517,13 +1651,23 @@ void DBRep::BasicCommands(Draw_Interpretor& theCommands) "\n\t\t +|-c : switch on/off output to cout of Progress Indicator" "\n\t\t +|-g : switch on/off graphical mode of Progress Indicator", XProgress,"DE: General"); - - theCommands.Add("binsave", "binsave shape filename\n" - "\t\tsave the shape in the binary format file", - __FILE__, binsave, g); - theCommands.Add("binrestore", "binrestore filename shape\n" - "\t\trestore the shape from the binary format file", - __FILE__, binrestore, g); + theCommands.Add("writebrep", + "writebrep shape filename [-binary] [-version Version] [-noTriangles]" + "\n\t\t: Save the shape in the ASCII (default) or binary format file." + "\n\t\t: -binary write into the binary format (ASCII when unspecified)" + "\n\t\t: -version a number of format version to save;" + "\n\t\t: ASCII versions: 1, 2 (1 for ASCII when unspecified);" + "\n\t\t: Binary versions: 1, 2 and 3 (3 for Binary when unspecified)." + "\n\t\t: -noTriangles skip triangulation data (OFF when unspecified).", + __FILE__, writebrep, g); + theCommands.Add("readbrep", + "readbrep filename shape" + "\n\t\t: Restore the shape from the binary or ASCII format file.", + __FILE__, readbrep, g); + theCommands.Add("binsave", "binsave shape filename", __FILE__, writebrep, g); + theCommands.Add("binrestore", + "alias to readbrep command", + __FILE__, readbrep, g); theCommands.Add ("removeinternals", "removeinternals shape [force flag {0/1}]" "\n\t\t Removes sub-shapes with internal orientation from the shape.\n" diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx index ab3a54bcdd..771c358cab 100644 --- a/src/Draw/Draw_VariableCommands.cxx +++ b/src/Draw/Draw_VariableCommands.cxx @@ -141,7 +141,12 @@ static Draw_SaveAndRestore numsr("Draw_Number", static Standard_Integer save(Draw_Interpretor& di, Standard_Integer n, const char** a) { - if (n <= 2) return 1; + if (n < 3) + { + di << "Syntax error: wrong number of arguments!\n"; + di.PrintHelp(a[0]); + return 1; + } const char* name = a[2]; std::ofstream os; diff --git a/src/Storage/Storage_HeaderData.hxx b/src/Storage/Storage_HeaderData.hxx index 7f726976d6..7ce511b8c6 100644 --- a/src/Storage/Storage_HeaderData.hxx +++ b/src/Storage/Storage_HeaderData.hxx @@ -111,7 +111,12 @@ public: Standard_EXPORT void SetNumberOfObjects (const Standard_Integer anObjectNumber); Standard_EXPORT void SetStorageVersion (const TCollection_AsciiString& aVersion); - + + void SetStorageVersion (const Standard_Integer theVersion) + { + SetStorageVersion (TCollection_AsciiString (theVersion)); + } + Standard_EXPORT void SetCreationDate (const TCollection_AsciiString& aDate); Standard_EXPORT void SetSchemaVersion (const TCollection_AsciiString& aVersion); diff --git a/src/TopTools/FILES b/src/TopTools/FILES index 9aa32c899b..747e21c1fd 100644 --- a/src/TopTools/FILES +++ b/src/TopTools/FILES @@ -24,6 +24,7 @@ TopTools_DataMapOfShapeListOfShape.hxx TopTools_DataMapOfShapeReal.hxx TopTools_DataMapOfShapeSequenceOfShape.hxx TopTools_DataMapOfShapeShape.hxx +TopTools_FormatVersion.hxx TopTools_HArray1OfListOfShape.hxx TopTools_HArray1OfShape.hxx TopTools_HArray2OfShape.hxx diff --git a/src/TopTools/TopTools_FormatVersion.hxx b/src/TopTools/TopTools_FormatVersion.hxx new file mode 100644 index 0000000000..a852cfbbe0 --- /dev/null +++ b/src/TopTools/TopTools_FormatVersion.hxx @@ -0,0 +1,26 @@ +// Copyright (c) 2020 OPEN CASCADE SAS +// +// This file is part of Open CASCADE Technology software library. +// +// This library is free software; you can redistribute it and/or modify it under +// the terms of the GNU Lesser General Public License version 2.1 as published +// by the Free Software Foundation, with special exception defined in the file +// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT +// distribution for complete text of the license and disclaimer of any warranty. +// +// Alternatively, this file may be used under the terms of Open CASCADE +// commercial license or contractual agreement. + +#ifndef _TopToolsFormatVersion_HeaderFile +#define _TopToolsFormatVersion_HeaderFile + +//! Defined TopTools format version +enum TopTools_FormatVersion +{ + TopTools_FormatVersion_VERSION_1 = 1, //!< Does not write CurveOnSurface UV Points into the file. On reading calls Check() method. + TopTools_FormatVersion_VERSION_2 = 2, //!< Stores CurveOnSurface UV Points. On reading format is recognized from Version string. + + TopTools_FormatVersion_CURRENT = TopTools_FormatVersion_VERSION_1 //!< The current version. +}; + +#endif diff --git a/src/TopTools/TopTools_ShapeSet.cxx b/src/TopTools/TopTools_ShapeSet.cxx index 8c1c99cfd9..b3a4359439 100644 --- a/src/TopTools/TopTools_ShapeSet.cxx +++ b/src/TopTools/TopTools_ShapeSet.cxx @@ -28,18 +28,21 @@ #include #include #include +#include + +#include #include #include -static const char* Version = "CASCADE Topology V1, (c) Matra-Datavision"; -static const char* Version2 = "CASCADE Topology V2, (c) Matra-Datavision"; +Standard_CString TopTools_ShapeSet::Version_1 = "CASCADE Topology V1, (c) Matra-Datavision"; +Standard_CString TopTools_ShapeSet::Version_2 = "CASCADE Topology V2, (c) Matra-Datavision"; //======================================================================= //function : TopTools_ShapeSet //purpose : //======================================================================= - -TopTools_ShapeSet::TopTools_ShapeSet() : myFormatNb(1) +TopTools_ShapeSet::TopTools_ShapeSet() +: myFormatNb (TopTools_FormatVersion_VERSION_1) { } @@ -52,6 +55,10 @@ TopTools_ShapeSet::~TopTools_ShapeSet() //======================================================================= void TopTools_ShapeSet::SetFormatNb(const Standard_Integer theFormatNb) { + Standard_ASSERT_RETURN(theFormatNb == TopTools_FormatVersion_VERSION_1 || + theFormatNb == TopTools_FormatVersion_VERSION_2, + "Error: unsupported TopTools version.", ); + myFormatNb = theFormatNb; } @@ -451,10 +458,14 @@ void TopTools_ShapeSet::Write(Standard_OStream& OS, const Message_ProgressRange std::streamsize prec = OS.precision(15); // write the copyright - if (myFormatNb == 2) - OS << "\n" << Version2 << "\n"; + if (myFormatNb == TopTools_FormatVersion_VERSION_2) + { + OS << "\n" << Version_2 << "\n"; + } else - OS << "\n" << Version << "\n"; + { + OS << "\n" << Version_1 << "\n"; + } //----------------------------------------- // write the locations @@ -606,14 +617,22 @@ void TopTools_ShapeSet::Read(Standard_IStream& IS, const Message_ProgressRange& vers[lv] = '\0'; } - } while ( ! IS.fail() && strcmp(vers,Version) && strcmp(vers,Version2) ); + } while (!IS.fail() + && strcmp(vers, Version_1) + && strcmp(vers, Version_2)); if (IS.fail()) { std::cout << "File was not written with this version of the topology"<= TopTools_FormatVersion_VERSION_2) S.Checked (buffer[2] == '1'); else S.Checked (Standard_False); // force check at reading.. @@ -693,7 +712,7 @@ void TopTools_ShapeSet::Read(Standard_IStream& IS, const Message_ProgressRange& // check - if (myFormatNb == 1) + if (myFormatNb == TopTools_FormatVersion_VERSION_1) Check(T,S); myShapes.Add(S); diff --git a/src/TopTools/TopTools_ShapeSet.hxx b/src/TopTools/TopTools_ShapeSet.hxx index e47fe074a1..d62fe822b0 100644 --- a/src/TopTools/TopTools_ShapeSet.hxx +++ b/src/TopTools/TopTools_ShapeSet.hxx @@ -27,6 +27,7 @@ #include #include #include +#include class TopoDS_Shape; class TopTools_LocationSet; @@ -50,13 +51,10 @@ public: Standard_EXPORT virtual ~TopTools_ShapeSet(); + //! Sets the TopTools_FormatVersion Standard_EXPORT void SetFormatNb (const Standard_Integer theFormatNb); - //! two formats available for the moment: - //! First: does not write CurveOnSurface UV Points into the file - //! on reading calls Check() method. - //! Second: stores CurveOnSurface UV Points. - //! On reading format is recognized from Version string. + //! Returns the TopTools_FormatVersion Standard_EXPORT Standard_Integer FormatNb() const; //! Clears the content of the set. This method can be @@ -181,6 +179,11 @@ public: //! Returns number of shapes read from file. Standard_EXPORT Standard_Integer NbShapes() const; +public: + + static Standard_CString Version_1; + static Standard_CString Version_2; + private: //! Reads from a shape and returns it in S. diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx index fa8784f69b..febbef1242 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx @@ -252,22 +252,31 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument theApplication -> MessageDriver(); // 1. Read info // to be done TCollection_AsciiString anAbsoluteDirectory = GetDirFromFile(myFileName); - Standard_Integer aCurDocVersion = 0; + Standard_Integer aCurDocVersion = TDocStd_FormatVersion_VERSION_2; // minimum supported version TCollection_ExtendedString anInfo; const XmlObjMgt_Element anInfoElem = theElement.GetChildByTagName ("info"); if (anInfoElem != NULL) { XmlObjMgt_DOMString aDocVerStr = anInfoElem.getAttribute("DocVersion"); - if(aDocVerStr == NULL) - aCurDocVersion = 2; - else if (!aDocVerStr.GetInteger(aCurDocVersion)) { - TCollection_ExtendedString aMsg = - TCollection_ExtendedString ("Cannot retrieve the current Document version" - " attribute as \"") + aDocVerStr + "\""; - if(!aMsgDriver.IsNull()) - aMsgDriver->Send(aMsg.ToExtString(), Message_Fail); + if (aDocVerStr != NULL) + { + Standard_Integer anIntegerVersion = 0; + if (aDocVerStr.GetInteger (anIntegerVersion)) + { + aCurDocVersion = anIntegerVersion; + } + else + { + TCollection_ExtendedString aMsg = + TCollection_ExtendedString ("Cannot retrieve the current Document version" + " attribute as \"") + aDocVerStr + "\""; + if (!aMsgDriver.IsNull()) + { + aMsgDriver->Send(aMsg.ToExtString(), Message_Fail); + } + } } - + // oan: OCC22305 - check a document verison and if it's greater than // current version of storage driver set an error status and return if( aCurDocVersion > TDocStd_Document::CurrentStorageFormatVersion() ) @@ -282,7 +291,6 @@ void XmlLDrivers_DocumentRetrievalDriver::ReadFromDomDocument return; } - if( aCurDocVersion < 2) aCurDocVersion = 2; Standard_Boolean isRef = Standard_False; for (LDOM_Node aNode = anInfoElem.getFirstChild(); aNode != NULL; aNode = aNode.getNextSibling()) { diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx index 955f24cf63..869747e968 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentStorageDriver.cxx @@ -274,11 +274,14 @@ Standard_Boolean XmlLDrivers_DocumentStorageDriver::WriteToDomDocument if (TDocStd_Document::CurrentStorageFormatVersion() < aDoc->StorageFormatVersion()) { TCollection_ExtendedString anErrorString("Unacceptable storage format version, the last verson is used"); - aMessageDriver->Send (anErrorString.ToExtString(), Message_Warning); + aMessageDriver->Send (anErrorString.ToExtString(), Message_Warning); } - else + else + { aFormatVersion = aDoc->StorageFormatVersion(); - anInfoElem.setAttribute ("DocVersion", aFormatVersion); + } + const TCollection_AsciiString aStringFormatVersion (aFormatVersion); + anInfoElem.setAttribute ("DocVersion", aStringFormatVersion.ToCString()); // User info with Copyright TColStd_SequenceOfAsciiString aUserInfo; diff --git a/src/XmlMDF/XmlMDF.cxx b/src/XmlMDF/XmlMDF.cxx index 33711f40f1..5354c9d579 100644 --- a/src/XmlMDF/XmlMDF.cxx +++ b/src/XmlMDF/XmlMDF.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -107,7 +108,7 @@ Standard_Integer XmlMDF::WriteSubTree // was replaced by TDataXtd_Presentation. Therefore, for old versions // we write old name of the attribute (TPrsStd_AISPresentation). Standard_CString typeName = aDriver->TypeName().ToCString(); - if (theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < 8 && + if (theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < TDocStd_FormatVersion_VERSION_8 && strcmp(typeName, "TDataXtd_Presentation") == 0) { typeName = "TPrsStd_AISPresentation"; diff --git a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx index 17fe955c2a..9e19cacf8a 100644 --- a/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_ByteArrayDriver.cxx @@ -20,10 +20,12 @@ #include #include #include +#include #include #include #include #include + IMPLEMENT_DOMSTRING (AttributeIDString, "bytearrattguid") IMPLEMENT_STANDARD_RTTIEXT(XmlMDataStd_ByteArrayDriver,XmlMDF_ADriver) @@ -129,7 +131,7 @@ Standard_Boolean XmlMDataStd_ByteArrayDriver::Paste(const XmlObjMgt_Persistent& Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Integer aDeltaValue; if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue)) { diff --git a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx index f60b5c30d6..3b7012b463 100644 --- a/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_ExtStringArrayDriver.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -195,7 +196,7 @@ Standard_Boolean XmlMDataStd_ExtStringArrayDriver::Paste // Read delta-flag. Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Integer aDeltaValue; if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue)) { @@ -240,7 +241,7 @@ void XmlMDataStd_ExtStringArrayDriver::Paste (const Handle(TDF_Attribute)& theSo // So, if the user wants to save the document under the 7th or earlier versions, // don't apply this improvement. Standard_Character c = '-'; - if (theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 7) + if (theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_8) { // Preferrable symbols for the separator: - _ . : ^ ~ // Don't use a space as a separator: XML low-level parser sometimes "eats" it. diff --git a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx index 576e4bbef3..9e3e2245ec 100644 --- a/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_IntPackedMapDriver.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -106,7 +107,7 @@ Standard_Boolean XmlMDataStd_IntPackedMapDriver::Paste if(Ok) { Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Integer aDeltaValue; if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue)) { diff --git a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx index a82d818092..30b8c377b2 100644 --- a/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_IntegerArrayDriver.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -129,7 +130,7 @@ Standard_Boolean XmlMDataStd_IntegerArrayDriver::Paste } Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Integer aDeltaValue; if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue)) { diff --git a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx index ddc296ad5d..182332cdfa 100644 --- a/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_RealArrayDriver.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -140,7 +141,7 @@ Standard_Boolean XmlMDataStd_RealArrayDriver::Paste } Standard_Boolean aDelta(Standard_False); - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 2) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_3) { Standard_Integer aDeltaValue; if (!anElement.getAttribute(::IsDeltaOn()).GetInteger(aDeltaValue)) { diff --git a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx index c5004b5057..1d7a3fcded 100644 --- a/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx +++ b/src/XmlMDataStd/XmlMDataStd_TreeNodeDriver.cxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -118,7 +119,7 @@ void XmlMDataStd_TreeNodeDriver::Paste // tree id // A not default ID is skipped for storage version 8 and newer. if (aS->ID() != TDataStd_TreeNode::GetDefaultTreeID() || - theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < 8) + theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < TDocStd_FormatVersion_VERSION_8) { Standard_Character aGuidStr [40]; Standard_PCharacter pGuidStr=aGuidStr; diff --git a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx index 813bf7b087..a3c04f7eaf 100644 --- a/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx +++ b/src/XmlMNaming/XmlMNaming_NamedShapeDriver.cxx @@ -370,7 +370,7 @@ void XmlMNaming_NamedShapeDriver::WriteShapeSection (XmlObjMgt_Element& theEleme // Add text to the "shapes" element if (myShapeSet.NbShapes() > 0) { - myShapeSet.SetFormatNb(2); + myShapeSet.SetFormatNb(TopTools_FormatVersion_VERSION_2); LDOM_OSStream aStream (16 * 1024); // ostrstream aStream; // aStream.rdbuf() -> setbuf (0, 16380); diff --git a/src/XmlMNaming/XmlMNaming_NamingDriver.cxx b/src/XmlMNaming/XmlMNaming_NamingDriver.cxx index d89c1111a3..efd28ad13b 100644 --- a/src/XmlMNaming/XmlMNaming_NamingDriver.cxx +++ b/src/XmlMNaming/XmlMNaming_NamingDriver.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -174,7 +175,7 @@ Standard_Boolean XmlMNaming_NamingDriver::Paste } aNgName.Index(aNb); // - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 3) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_4) { XmlObjMgt_DOMString aDomEntry = anElem.getAttribute(::ContextLabelString()); if (aDomEntry != NULL) { @@ -203,8 +204,8 @@ Standard_Boolean XmlMNaming_NamingDriver::Paste std::cout << "Retrieving Context Label is NULL" <StorageVersion().IntegerValue() > 4 && - theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < 7) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_5 && + theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() < TDocStd_FormatVersion_VERSION_7) { // Orientation processing - converting from old format Handle(TNaming_NamedShape) aNS; if (aNg->Label().FindAttribute(TNaming_NamedShape::GetID(), aNS)) { @@ -223,7 +224,7 @@ Standard_Boolean XmlMNaming_NamingDriver::Paste } } } - if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() > 6) { + if(theRelocTable.GetHeaderData()->StorageVersion().IntegerValue() >= TDocStd_FormatVersion_VERSION_7) { aDOMStr = anElem.getAttribute(::OrientString()); if (!aDOMStr.GetInteger(aNb)) { diff --git a/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cxx b/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cxx index 7918e454a5..063e982d82 100644 --- a/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cxx +++ b/src/XmlMXCAFDoc/XmlMXCAFDoc_LocationDriver.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -149,7 +150,7 @@ Standard_Boolean XmlMXCAFDoc_LocationDriver::Translate return Standard_False; Standard_Integer aFileVer = theMap.GetHeaderData()->StorageVersion().IntegerValue(); - if( aFileVer > 5 && myLocations == 0 ) + if( aFileVer >= TDocStd_FormatVersion_VERSION_6 && myLocations == 0 ) { return Standard_False; } @@ -157,7 +158,7 @@ Standard_Boolean XmlMXCAFDoc_LocationDriver::Translate Standard_Integer aPower; Handle(TopLoc_Datum3D) aDatum; - if( aFileVer > 5 ) + if( aFileVer >= TDocStd_FormatVersion_VERSION_6) { // Get Location ID Standard_Integer anId; diff --git a/tests/bugs/moddata_3/bug31946 b/tests/bugs/moddata_3/bug31946 new file mode 100644 index 0000000000..5803e5ea60 --- /dev/null +++ b/tests/bugs/moddata_3/bug31946 @@ -0,0 +1,49 @@ +puts "==========" +puts "0031946: Modeling Data - replace version numbers with enumerations in TopTools and BinTools" +puts "==========" +puts "" + +pload MODELING VISUALIZATION + +box testBox 10 20 30 +incmesh testBox 0.1 + +writebrep testBox "${imagedir}/${casename}_topBox1.brep" +readbrep "${imagedir}/${casename}_topBox1.brep" topBox1 +trinfo topBox1 +checktrinfo topBox1 -tri 12 + +writebrep testBox "${imagedir}/${casename}_topBox2.brep" -noTriangles +readbrep "${imagedir}/${casename}_topBox2.brep" topBox2 +trinfo topBox2 +checktrinfo topBox2 -tri 0 + +writebrep testBox "${imagedir}/${casename}_topBox3.brep" -noTriangles on -binary off +readbrep "${imagedir}/${casename}_topBox3.brep" topBox3 +trinfo topBox3 +checktrinfo topBox3 -tri 0 + +writebrep testBox "${imagedir}/${casename}_topBox4.brep" -noTriangles off -binary off +readbrep "${imagedir}/${casename}_topBox4.brep" topBox4 +trinfo topBox4 +checktrinfo topBox4 -tri 12 + +writebrep testBox "${imagedir}/${casename}_binBox1.bbrep" -binary on +readbrep "${imagedir}/${casename}_binBox1.bbrep" binBox1 +trinfo binBox1 +checktrinfo binBox1 -tri 12 + +writebrep testBox "${imagedir}/${casename}_binBox2.bbrep" -noTriangles -binary on +readbrep "${imagedir}/${casename}_binBox2.bbrep" binBox2 +trinfo binBox2 +checktrinfo binBox2 -tri 0 + +writebrep testBox "${imagedir}/${casename}_binBox3.bbrep" -noTriangles on -binary on +readbrep "${imagedir}/${casename}_binBox3.bbrep" binBox3 +trinfo binBox3 +checktrinfo binBox3 -tri 0 + +writebrep testBox "${imagedir}/${casename}_binBox4.bbrep" -noTriangles off -binary on +readbrep "${imagedir}/${casename}_binBox4.bbrep" binBox4 +trinfo binBox4 +checktrinfo binBox4 -tri 12