diff --git a/adm/MODULES b/adm/MODULES index f9f9327ef4..a057fdee04 100644 --- a/adm/MODULES +++ b/adm/MODULES @@ -2,6 +2,6 @@ FoundationClasses TKernel TKMath ModelingData TKG2d TKG3d TKGeomBase TKBRep ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffset TKFeat TKMesh TKXMesh TKShHealing Visualization TKService TKV3d TKOpenGl TKMeshVS TKIVtk TKD3DHost -ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml FWOSPlugin TKTObj TKBinTObj TKXmlTObj TKVCAF +ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml TKStdL TKStd TKShape FWOSPlugin TKTObj TKBinTObj TKXmlTObj TKVCAF DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE diff --git a/adm/UDLIST b/adm/UDLIST index 585f68d306..9e959532d3 100644 --- a/adm/UDLIST +++ b/adm/UDLIST @@ -243,6 +243,12 @@ n CDF n CDM n FWOSDriver n PCDM +n StdLDrivers +n StdLPersistent +n StdObjMgt +n StdDrivers +n StdPersistent +n ShapePersistent n TDF n TDataStd n TDataXtd @@ -271,6 +277,9 @@ t TKCAF t TKCDF t TKLCAF +t TKStdL +t TKStd +t TKShape t TKTObj t TKXml t TKXmlL diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx index e5cdfd19ce..aa851d9cba 100644 --- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx +++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx @@ -70,27 +70,6 @@ Handle(CDM_Document) BinLDrivers_DocumentRetrievalDriver::CreateDocument() return new TDocStd_Document(PCDM_RetrievalDriver::GetFormat()); } -//======================================================================= -//function : SchemaName -//purpose : pure virtual method definition -//======================================================================= - -TCollection_ExtendedString BinLDrivers_DocumentRetrievalDriver::SchemaName() const -{ - TCollection_ExtendedString schemaname; - return schemaname; -} - -//======================================================================= -//function : Make -//purpose : pure virtual method definition -//======================================================================= - -void BinLDrivers_DocumentRetrievalDriver::Make (const Handle(PCDM_Document)&, - const Handle(CDM_Document)&) -{ -} - //======================================================================= //function : Read //purpose : diff --git a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx index 4b2a11d60e..97afb49c19 100644 --- a/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx +++ b/src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx @@ -55,12 +55,6 @@ public: //! Constructor Standard_EXPORT BinLDrivers_DocumentRetrievalDriver(); - //! pure virtual method definition - Standard_EXPORT virtual TCollection_ExtendedString SchemaName() const Standard_OVERRIDE; - - //! pure virtual method definition - Standard_EXPORT virtual void Make (const Handle(PCDM_Document)& PD, const Handle(CDM_Document)& TD) Standard_OVERRIDE; - //! pure virtual method definition Standard_EXPORT virtual Handle(CDM_Document) CreateDocument() Standard_OVERRIDE; diff --git a/src/OS/ApplicationFramework.tcl b/src/OS/ApplicationFramework.tcl index 1a72892b67..57ae8eab3b 100644 --- a/src/OS/ApplicationFramework.tcl +++ b/src/OS/ApplicationFramework.tcl @@ -16,15 +16,18 @@ ;# proc ApplicationFramework:toolkits { } { return [list \ - TKCDF \ - TKLCAF \ - TKVCAF \ + TKCDF \ + TKLCAF \ + TKVCAF \ TKCAF \ TKBinL \ TKXmlL \ TKBin \ TKXml \ - FWOSPlugin \ + FWOSPlugin \ + TKStdL \ + TKStd \ + TKShape \ TKTObj \ TKBinTObj \ TKXmlTObj \ @@ -34,10 +37,10 @@ proc ApplicationFramework:toolkits { } { ;# Autres UDs a prendre. ;# proc ApplicationFramework:ressources { } { - return [list \ - [list both r StdResource {}] \ + return [list \ + [list both r StdResource {}] \ [list both r XmlOcafResource {}] \ - ] + ] } ;# ;# Nom du module diff --git a/src/PCDM/PCDM.cxx b/src/PCDM/PCDM.cxx index 5c36817e33..92b50b1a0c 100644 --- a/src/PCDM/PCDM.cxx +++ b/src/PCDM/PCDM.cxx @@ -60,26 +60,6 @@ Standard_Boolean PCDM::FindStorageDriver(const Handle(CDM_Document)& aDocument) return aDocument->FindStoragePlugin(); } -//======================================================================= -//function : Schema -//purpose : returns a schema to be used during a Store or Retrieve -// operation. -// Schema will plug the schema defined by -// the SchemaName method. -//======================================================================= - -Handle(Storage_Schema) PCDM::Schema(const TCollection_ExtendedString& aSchemaName, const Handle(CDM_Application)& anApplication) { - - Handle(Resource_Manager) r = anApplication->Resources(); - if(!UTL::Find(r,aSchemaName)) { - Standard_SStream aMsg; aMsg << "could not find the plugin resource for the schema: " << TCollection_ExtendedString(aSchemaName) << (char)0; - Standard_NoSuchObject::Raise(aMsg); - } - Handle(Standard_Transient) t = Plugin::Load(UTL::GUID(UTL::Value(r,aSchemaName))); - return Handle(Storage_Schema)::DownCast (t); - -} - //======================================================================= //function : FileDriverType //purpose : diff --git a/src/PCDM/PCDM.hxx b/src/PCDM/PCDM.hxx index ae7f1d701e..4356da58cf 100644 --- a/src/PCDM/PCDM.hxx +++ b/src/PCDM/PCDM.hxx @@ -28,75 +28,23 @@ #include class CDM_Document; class PCDM_StorageDriver; -class Storage_Schema; -class TCollection_ExtendedString; -class CDM_Application; class TCollection_AsciiString; -class PCDM_Document; -class PCDM_Reader; -class PCDM_Writer; -class PCDM_RetrievalDriver; -class PCDM_StorageDriver; -class PCDM_ReferenceIterator; -class PCDM_Reference; -class PCDM_ReadWriter; -class PCDM_ReadWriter_1; - class PCDM { public: - - DEFINE_STANDARD_ALLOC - - Standard_EXPORT static Standard_Boolean FindStorageDriver (const Handle(CDM_Document)& aDocument); //! gets in the EuclidDesktop resource the plugin //! identifier of the driver plugs the driver. Standard_EXPORT static Handle(PCDM_StorageDriver) StorageDriver (const Handle(CDM_Document)& aDocument); - //! returns a schema to be used during a Store or Retrieve - //! operation. - //! Schema will plug the schema defined by - //! the SchemaName method. - Standard_EXPORT static Handle(Storage_Schema) Schema (const TCollection_ExtendedString& aSchemaName, const Handle(CDM_Application)& anApplication); - - - - -protected: - - - - - -private: - - Standard_EXPORT static PCDM_TypeOfFileDriver FileDriverType (const TCollection_AsciiString& aFileName, PCDM_BaseDriverPointer& aBaseDriver); Standard_EXPORT static PCDM_TypeOfFileDriver FileDriverType (Standard_IStream& theIStream, PCDM_BaseDriverPointer& theBaseDriver); - - -friend class PCDM_Document; -friend class PCDM_Reader; -friend class PCDM_Writer; -friend class PCDM_RetrievalDriver; -friend class PCDM_StorageDriver; -friend class PCDM_ReferenceIterator; -friend class PCDM_Reference; -friend class PCDM_ReadWriter; -friend class PCDM_ReadWriter_1; - + DEFINE_STANDARD_ALLOC }; - - - - - - #endif // _PCDM_HeaderFile diff --git a/src/PCDM/PCDM_ReadWriter.cxx b/src/PCDM/PCDM_ReadWriter.cxx index b42b8a83a8..6d2c1b25d5 100644 --- a/src/PCDM/PCDM_ReadWriter.cxx +++ b/src/PCDM/PCDM_ReadWriter.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -130,9 +129,9 @@ TCollection_ExtendedString PCDM_ReadWriter::FileFormat Open(*theFileDriver,aFileName,Storage_VSRead); theFileIsOpen=Standard_True; - Handle(Storage_Schema) s = new Storage_Schema; - Handle(Storage_HeaderData) hd = s->ReadHeaderSection(*theFileDriver); - const TColStd_SequenceOfAsciiString &refUserInfo = hd->UserInfo(); + Storage_HeaderData hd; + hd.Read (*theFileDriver); + const TColStd_SequenceOfAsciiString &refUserInfo = hd.UserInfo(); Standard_Boolean found=Standard_False; for (Standard_Integer i =1; !found && i<= refUserInfo.Length() ; i++) { if(refUserInfo(i).Search(FILE_FORMAT) != -1) { @@ -141,7 +140,12 @@ TCollection_ExtendedString PCDM_ReadWriter::FileFormat Standard_True); } } - if(!found) theFormat=s->ReadTypeSection(*theFileDriver)->Types()->Value(1); + if (!found) + { + Storage_TypeData td; + td.Read (*theFileDriver); + theFormat = td.Types()->Value(1); + } } catch (Standard_Failure) {} diff --git a/src/PCDM/PCDM_ReadWriter_1.cxx b/src/PCDM/PCDM_ReadWriter_1.cxx index 766d968c26..86fc644ab0 100644 --- a/src/PCDM/PCDM_ReadWriter_1.cxx +++ b/src/PCDM/PCDM_ReadWriter_1.cxx @@ -244,8 +244,9 @@ Standard_Integer PCDM_ReadWriter_1::ReadReferenceCounter(const TCollection_Exten theFileIsOpen=Standard_True; Handle(Storage_Schema) s = new Storage_Schema; - Handle(Storage_HeaderData) hd = s->ReadHeaderSection(*theFileDriver); - const TColStd_SequenceOfAsciiString &refUserInfo = hd->UserInfo(); + Storage_HeaderData hd; + hd.Read (*theFileDriver); + const TColStd_SequenceOfAsciiString &refUserInfo = hd.UserInfo(); for ( i =1; i<= refUserInfo.Length() ; i++) { if(refUserInfo(i).Search(REFERENCE_COUNTER) != -1) { @@ -347,8 +348,9 @@ void PCDM_ReadWriter_1::ReadUserInfo(const TCollection_ExtendedString& aFileName PCDM_ReadWriter::Open(*theFileDriver,aFileName,Storage_VSRead); Handle(Storage_Schema) s = new Storage_Schema; - Handle(Storage_HeaderData) hd = s->ReadHeaderSection(*theFileDriver); - const TColStd_SequenceOfAsciiString &refUserInfo = hd->UserInfo(); + Storage_HeaderData hd; + hd.Read (*theFileDriver); + const TColStd_SequenceOfAsciiString &refUserInfo = hd.UserInfo(); Standard_Integer debut=0,fin=0; @@ -390,8 +392,9 @@ Standard_Integer PCDM_ReadWriter_1::ReadDocumentVersion(const TCollection_Extend PCDM_ReadWriter::Open(*theFileDriver,aFileName,Storage_VSRead); theFileIsOpen=Standard_True; Handle(Storage_Schema) s = new Storage_Schema; - Handle(Storage_HeaderData) hd = s->ReadHeaderSection(*theFileDriver); - const TColStd_SequenceOfAsciiString &refUserInfo = hd->UserInfo(); + Storage_HeaderData hd; + hd.Read (*theFileDriver); + const TColStd_SequenceOfAsciiString &refUserInfo = hd.UserInfo(); static Standard_Integer i ; for ( i =1; i<= refUserInfo.Length() ; i++) { diff --git a/src/PCDM/PCDM_RetrievalDriver.cxx b/src/PCDM/PCDM_RetrievalDriver.cxx index 78446479cd..15edbd5653 100644 --- a/src/PCDM/PCDM_RetrievalDriver.cxx +++ b/src/PCDM/PCDM_RetrievalDriver.cxx @@ -31,44 +31,12 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include -#include IMPLEMENT_STANDARD_RTTIEXT(PCDM_RetrievalDriver,PCDM_Reader) -void PCDM_RetrievalDriver::RaiseIfUnknownTypes(const Handle(Storage_Schema)& aSchema, const TCollection_ExtendedString& aFileName) { - - PCDM_BaseDriverPointer theFileDriver; - TCollection_AsciiString aFileNameU(aFileName); - if(PCDM::FileDriverType(aFileNameU, theFileDriver) == PCDM_TOFD_Unknown) - return; - - PCDM_ReadWriter::Open(*theFileDriver,aFileName,Storage_VSRead); - - TColStd_SequenceOfAsciiString theUnknownTypes; - Standard_Boolean unknowns = aSchema->HasUnknownType(*theFileDriver,theUnknownTypes); - - theFileDriver->Close(); - delete theFileDriver; - - if(unknowns) { - Standard_SStream aMsg; aMsg << "cannot read: `" << aFileName << "', because the following types: "; - for (Standard_Integer i=1; i <= theUnknownTypes.Length(); i++) { - aMsg << theUnknownTypes(i); - if(i< theUnknownTypes.Length()) aMsg <<","; - } - aMsg << " have been found in it but not in the available Schema: " << aSchema->Name() << (char)0; - Standard_TypeMismatch::Raise(aMsg); - } -} - //======================================================================= //function : Read //purpose : @@ -81,181 +49,17 @@ void PCDM_RetrievalDriver::Read(Standard_IStream& /*theIStream*/, } -//======================================================================= -//function : Read -//purpose : -//======================================================================= +void PCDM_RetrievalDriver::References(const TCollection_ExtendedString& aFileName, PCDM_SequenceOfReference& theReferences, const Handle(CDM_MessageDriver)& theMsgDriver) + { PCDM_ReadWriter::Reader(aFileName)->ReadReferences(aFileName, theReferences, theMsgDriver);} -void PCDM_RetrievalDriver::Read(const TCollection_ExtendedString& theFileName, - const Handle(CDM_Document)& aNewDocument, - const Handle(CDM_Application)& theApplication) -{ - Standard_SStream aMsg; - Standard_Boolean Failure=Standard_False; - Handle(Storage_Schema) aSchema; - TColStd_SequenceOfExtendedString theExtensions; - myReaderStatus = PCDM_RS_OK; - { - try { - OCC_CATCH_SIGNALS - aSchema=PCDM::Schema(SchemaName(),theApplication); - Extensions(theFileName, theExtensions, theApplication->MessageDriver()); - LoadExtensions(aSchema,theExtensions, theApplication->MessageDriver()); - } - catch (Standard_NoSuchObject) { - aMsg << Standard_NoSuchObject::Caught() << endl; - myReaderStatus = PCDM_RS_NoSchema; - Failure=Standard_True; - } - catch (Standard_Failure) { - aMsg << Standard_Failure::Caught() << endl; - myReaderStatus = PCDM_RS_ExtensionFailure; - Failure=Standard_True; - } - if(Failure) Standard_Failure::Raise(aMsg); - } +Standard_Integer PCDM_RetrievalDriver::DocumentVersion(const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) + { return PCDM_ReadWriter::Reader(aFileName)->ReadDocumentVersion(aFileName, theMsgDriver); } - PCDM_BaseDriverPointer theFileDriver; - TCollection_AsciiString aFileNameU(theFileName); - if(PCDM::FileDriverType(aFileNameU, theFileDriver) == PCDM_TOFD_Unknown) { - myReaderStatus = PCDM_RS_UnknownFileDriver; - return; - } - { - try { - OCC_CATCH_SIGNALS - RaiseIfUnknownTypes(aSchema, theFileName); - PCDM_ReadWriter::Open(*theFileDriver,theFileName,Storage_VSRead); - } - catch (Standard_TypeMismatch) { - aMsg << Standard_TypeMismatch::Caught() << endl; - myReaderStatus = PCDM_RS_TypeNotFoundInSchema; - Failure=Standard_True; - } - catch (Standard_Failure) { - aMsg << Standard_Failure::Caught() << endl; - myReaderStatus = PCDM_RS_OpenError; - Failure=Standard_True; - } - if(Failure) Standard_Failure::Raise(aMsg); - } - - Handle(Storage_Data) theData = aSchema->Read(*theFileDriver); - Storage_Error aStatus = theData->ErrorStatus(); - if(aStatus != Storage_VSOk) { - switch (aStatus) { - case Storage_VSOpenError: - case Storage_VSNotOpen: - case Storage_VSAlreadyOpen: - myReaderStatus = PCDM_RS_OpenError; - aMsg << "Stream Open Error" << endl; - break; - case Storage_VSModeError: - myReaderStatus = PCDM_RS_WrongStreamMode; - aMsg << "Stream is opened with a wrong mode for operation" << endl; - break; - case Storage_VSSectionNotFound: - aMsg << "Section is not found" << endl; - myReaderStatus = PCDM_RS_FormatFailure; - break; - case Storage_VSFormatError: - myReaderStatus = PCDM_RS_FormatFailure; - aMsg << "Wrong format error" << endl; - break; - case Storage_VSUnknownType: - myReaderStatus = PCDM_RS_TypeFailure; - aMsg << "Try to read an unknown type" << endl; - break; - case Storage_VSTypeMismatch: - myReaderStatus = PCDM_RS_TypeFailure; - aMsg << "Try to read a wrong primitive type" << endl; - break; - default: - myReaderStatus = PCDM_RS_DriverFailure; - aMsg << "Retrieval Driver Failure" << endl; - } - Standard_Failure::Raise(aMsg); - } - - theFileDriver->Close(); - delete theFileDriver; - - Handle(Storage_HSeqOfRoot) theDocuments=theData->Roots(); - - Handle(Storage_Root) theDocument; - for(Standard_Integer i=1; i<=theDocuments->Length() && theDocument.IsNull(); i++) { - theDocument=theDocuments->Value(i); - } - - if(theDocument.IsNull()) { - Standard_SStream anErrorMsg; - anErrorMsg << "could not find any document in this file" << (char) 0; - myReaderStatus = PCDM_RS_NoDocument; - Standard_Failure::Raise(anErrorMsg); - } - Handle(Standard_Persistent) theObject=theDocument->Object(); - Handle(PCDM_Document) thePDocument = Handle(PCDM_Document)::DownCast (theObject); - - - { - try { - OCC_CATCH_SIGNALS - Make(thePDocument,aNewDocument); - } - catch (Standard_Failure) { - aMsg << "Error during Make: "; - aMsg << Standard_Failure::Caught() << (char)0; - myReaderStatus = PCDM_RS_MakeFailure; - Failure=Standard_True; - } - } - -// read comments - aNewDocument->SetComments(theData->Comments()); - - PCDM_DriverError_Raise_if(Failure,aMsg); -} - -void PCDM_RetrievalDriver::References(const TCollection_ExtendedString& aFileName, PCDM_SequenceOfReference& theReferences, const Handle(CDM_MessageDriver)& theMsgDriver) { - - PCDM_ReadWriter::Reader(aFileName)->ReadReferences(aFileName, theReferences, theMsgDriver); -} - -void PCDM_RetrievalDriver::Extensions(const TCollection_ExtendedString& aFileName, TColStd_SequenceOfExtendedString& theExtensions, const Handle(CDM_MessageDriver)& theMsgDriver) { - - PCDM_ReadWriter::Reader(aFileName)->ReadExtensions(aFileName,theExtensions, theMsgDriver); -} - - - -Standard_Integer PCDM_RetrievalDriver::DocumentVersion(const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) { - - return PCDM_ReadWriter::Reader(aFileName)->ReadDocumentVersion(aFileName, theMsgDriver); -} -Standard_Integer PCDM_RetrievalDriver::ReferenceCounter(const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) { - - return PCDM_ReadWriter::Reader(aFileName)->ReadReferenceCounter(aFileName, theMsgDriver); -} -void PCDM_RetrievalDriver::LoadExtensions(const Handle(Storage_Schema)& , const TColStd_SequenceOfExtendedString& , const Handle(CDM_MessageDriver)&) {} - - -//======================================================================= -//function : Format -//purpose : -//======================================================================= +Standard_Integer PCDM_RetrievalDriver::ReferenceCounter(const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver) + { return PCDM_ReadWriter::Reader(aFileName)->ReadReferenceCounter(aFileName, theMsgDriver); } void PCDM_RetrievalDriver::SetFormat (const TCollection_ExtendedString& aformat) -{ - myFormat = aformat; -} - - -//======================================================================= -//function : Format -//purpose : -//======================================================================= + { myFormat = aformat; } TCollection_ExtendedString PCDM_RetrievalDriver::GetFormat () const -{ - return myFormat; -} + { return myFormat; } diff --git a/src/PCDM/PCDM_RetrievalDriver.hxx b/src/PCDM/PCDM_RetrievalDriver.hxx index 1a04b9ca21..9cdf056a1b 100644 --- a/src/PCDM/PCDM_RetrievalDriver.hxx +++ b/src/PCDM/PCDM_RetrievalDriver.hxx @@ -20,94 +20,49 @@ #include #include -#include #include #include -#include #include -#include -class Standard_NoSuchObject; -class PCDM_DriverError; + class CDM_MetaData; -class TCollection_ExtendedString; -class CDM_Document; -class CDM_Application; -class PCDM_Document; -class Storage_Schema; class CDM_MessageDriver; class TCollection_AsciiString; - +class TCollection_ExtendedString; class PCDM_RetrievalDriver; DEFINE_STANDARD_HANDLE(PCDM_RetrievalDriver, PCDM_Reader) - class PCDM_RetrievalDriver : public PCDM_Reader { + friend Standard_EXPORT void PCDM_ReferenceIterator::Init (const Handle(CDM_MetaData)& aMetaData); public: + Standard_EXPORT static Standard_Integer DocumentVersion ( + const TCollection_ExtendedString& theFileName, + const Handle(CDM_MessageDriver)& theMsgDriver); - - //! Warning - raises DriverError if an error occurs during inside the - //! Make method. - //! retrieves the content of the file into a new Document. - //! - //! by default Read will use the Schema method to read the file - //! into a persistent document. and the Make method to build a - //! transient document. - Standard_EXPORT virtual void Read (const TCollection_ExtendedString& aFileName, const Handle(CDM_Document)& aNewDocument, const Handle(CDM_Application)& anApplication) Standard_OVERRIDE; + Standard_EXPORT static Standard_Integer ReferenceCounter ( + const TCollection_ExtendedString& theFileName, + const Handle(CDM_MessageDriver)& theMsgDriver); Standard_EXPORT virtual void Read (Standard_IStream& theIStream, const Handle(Storage_Data)& theStorageData, const Handle(CDM_Document)& theDoc, const Handle(CDM_Application)& theApplication) Standard_OVERRIDE; - - Standard_EXPORT virtual void Make (const Handle(PCDM_Document)& aPCDM, const Handle(CDM_Document)& aNewDocument) = 0; - - Standard_EXPORT virtual TCollection_ExtendedString SchemaName() const = 0; - - Standard_EXPORT virtual void LoadExtensions (const Handle(Storage_Schema)& aSchema, const TColStd_SequenceOfExtendedString& Extensions, const Handle(CDM_MessageDriver)& theMsgDriver); - - Standard_EXPORT static void RaiseIfUnknownTypes (const Handle(Storage_Schema)& aSchema, const TCollection_ExtendedString& aFileName); - - Standard_EXPORT static Standard_Integer DocumentVersion (const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver); - - Standard_EXPORT static Standard_Integer ReferenceCounter (const TCollection_ExtendedString& aFileName, const Handle(CDM_MessageDriver)& theMsgDriver); - + Standard_EXPORT void SetFormat (const TCollection_ExtendedString& aformat); - + Standard_EXPORT TCollection_ExtendedString GetFormat() const; - -friend - Standard_EXPORT void PCDM_ReferenceIterator::Init (const Handle(CDM_MetaData)& aMetaData); - - DEFINE_STANDARD_RTTIEXT(PCDM_RetrievalDriver,PCDM_Reader) -protected: - - - - private: - - - Standard_EXPORT static void References (const TCollection_ExtendedString& aFileName, PCDM_SequenceOfReference& theReferences, const Handle(CDM_MessageDriver)& theMsgDriver); - - Standard_EXPORT static void Extensions (const TCollection_ExtendedString& aFileName, TColStd_SequenceOfExtendedString& theExtensions, const Handle(CDM_MessageDriver)& theMsgDriver); - - Standard_EXPORT static void UserInfo (const TCollection_ExtendedString& aFileName, const TCollection_AsciiString& Start, const TCollection_AsciiString& End, TColStd_SequenceOfExtendedString& theUserInfo, const Handle(CDM_MessageDriver)& theMsgDriver); + Standard_EXPORT static void References ( + const TCollection_ExtendedString& theFileName, + PCDM_SequenceOfReference& theReferences, + const Handle(CDM_MessageDriver)& theMsgDriver); TCollection_ExtendedString myFormat; - - }; - - - - - - #endif // _PCDM_RetrievalDriver_HeaderFile diff --git a/src/PCDM/PCDM_StorageDriver.cxx b/src/PCDM/PCDM_StorageDriver.cxx index 0b6212622d..2438ebbb8f 100644 --- a/src/PCDM/PCDM_StorageDriver.cxx +++ b/src/PCDM/PCDM_StorageDriver.cxx @@ -44,7 +44,7 @@ IMPLEMENT_STANDARD_RTTIEXT(PCDM_StorageDriver,PCDM_Writer) void PCDM_StorageDriver::Write(const Handle(CDM_Document)& aDocument, const TCollection_ExtendedString& aFileName) { - Handle(Storage_Schema) theSchema=PCDM::Schema(SchemaName(),aDocument->Application()); + Handle(Storage_Schema) theSchema = new Storage_Schema; TColStd_SequenceOfExtendedString theExtensions; aDocument->Extensions(theExtensions); diff --git a/src/ShapePersistent/FILES b/src/ShapePersistent/FILES new file mode 100644 index 0000000000..5385b7cd7d --- /dev/null +++ b/src/ShapePersistent/FILES @@ -0,0 +1,3 @@ +FILES +ShapePersistent.cxx +ShapePersistent.hxx diff --git a/src/ShapePersistent/ShapePersistent.cxx b/src/ShapePersistent/ShapePersistent.cxx new file mode 100644 index 0000000000..7670fa9c6a --- /dev/null +++ b/src/ShapePersistent/ShapePersistent.cxx @@ -0,0 +1,23 @@ +// Copyright (c) 2015 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. + +#include +#include + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void ShapePersistent::BindTypes (StdObjMgt_MapOfInstantiators& /*theMap*/) +{ +} diff --git a/src/ShapePersistent/ShapePersistent.hxx b/src/ShapePersistent/ShapePersistent.hxx new file mode 100644 index 0000000000..04e6334756 --- /dev/null +++ b/src/ShapePersistent/ShapePersistent.hxx @@ -0,0 +1,29 @@ +// Copyright (c) 2015 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 _ShapePersistent_HeaderFile +#define _ShapePersistent_HeaderFile + +#include + +class StdObjMgt_MapOfInstantiators; + +class ShapePersistent +{ +public: + //! Register types. + Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); +}; + +#endif diff --git a/src/StdDrivers/FILES b/src/StdDrivers/FILES new file mode 100644 index 0000000000..0526d273d0 --- /dev/null +++ b/src/StdDrivers/FILES @@ -0,0 +1,4 @@ +StdDrivers.cxx +StdDrivers.hxx +StdDrivers_DocumentRetrievalDriver.cxx +StdDrivers_DocumentRetrievalDriver.hxx diff --git a/src/StdDrivers/StdDrivers.cxx b/src/StdDrivers/StdDrivers.cxx new file mode 100644 index 0000000000..32e8bf84a7 --- /dev/null +++ b/src/StdDrivers/StdDrivers.cxx @@ -0,0 +1,67 @@ +// Created on: 2000-09-07 +// Created by: TURIN Anatoliy +// Copyright (c) 2000-2015 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. + +#include +#include + +#include +#include +#include + +#include +#include +#include + +static Standard_GUID StdRetrievalDriver ("ad696001-5b34-11d1-b5ba-00a0c9064368"); + +//======================================================================= +//function : Factory +//purpose : Depending from the ID, returns a list of storage +// or retrieval attribute drivers. Used for plugin +//======================================================================= +Handle(Standard_Transient) StdDrivers::Factory (const Standard_GUID& aGUID) +{ + if (aGUID == StdRetrievalDriver) + { +#ifdef OCCT_DEBUG + cout << "StdDrivers : Retrieval Plugin" << endl; +#endif + + static Handle(StdDrivers_DocumentRetrievalDriver) model_rd = new StdDrivers_DocumentRetrievalDriver; + return model_rd; + } + + Standard_Failure::Raise ("StdDrivers : unknown GUID"); + return NULL; +} + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void StdDrivers::BindTypes (StdObjMgt_MapOfInstantiators& theMap) +{ + StdLPersistent ::BindTypes (theMap); + StdPersistent ::BindTypes (theMap); + ShapePersistent::BindTypes (theMap); +} + + +#ifdef _MSC_VER +#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */ +#endif + +// Declare entry point PLUGINFACTORY +PLUGIN (StdDrivers) diff --git a/src/StdDrivers/StdDrivers.hxx b/src/StdDrivers/StdDrivers.hxx new file mode 100644 index 0000000000..efd48fe00a --- /dev/null +++ b/src/StdDrivers/StdDrivers.hxx @@ -0,0 +1,41 @@ +// Copyright (c) 2015 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 _StdDrivers_HeaderFile +#define _StdDrivers_HeaderFile + +#include +#include +#include + +class Standard_Transient; +class Standard_GUID; +class StdObjMgt_MapOfInstantiators; + + +class StdDrivers +{ + friend class StdDrivers_DocumentRetrievalDriver; + +public: + //! Depending from the ID, returns a list of storage + //! or retrieval attribute drivers. Used for plugin + Standard_EXPORT static Handle(Standard_Transient) Factory (const Standard_GUID& aGUID); + + //! Register types. + Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); + + DEFINE_STANDARD_ALLOC +}; + +#endif // _StdDrivers_HeaderFile diff --git a/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cxx b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cxx new file mode 100644 index 0000000000..4f2cfc1500 --- /dev/null +++ b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.cxx @@ -0,0 +1,26 @@ +// Copyright (c) 2015 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. + +#include +#include + +IMPLEMENT_STANDARD_RTTIEXT (StdDrivers_DocumentRetrievalDriver, StdLDrivers_DocumentRetrievalDriver) + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void StdDrivers_DocumentRetrievalDriver::BindTypes (StdObjMgt_MapOfInstantiators& theMap) +{ + StdDrivers::BindTypes (theMap); +} diff --git a/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx new file mode 100644 index 0000000000..3cbb65be3e --- /dev/null +++ b/src/StdDrivers/StdDrivers_DocumentRetrievalDriver.hxx @@ -0,0 +1,29 @@ +// Copyright (c) 2015 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 _StdDrivers_DocumentRetrievalDriver_HeaderFile +#define _StdDrivers_DocumentRetrievalDriver_HeaderFile + +#include + +//! retrieval driver of a Part document +class StdDrivers_DocumentRetrievalDriver : public StdLDrivers_DocumentRetrievalDriver +{ +public: + //! Register types. + Standard_EXPORT virtual void BindTypes (StdObjMgt_MapOfInstantiators& theMap); + + DEFINE_STANDARD_RTTIEXT (StdDrivers_DocumentRetrievalDriver, StdLDrivers_DocumentRetrievalDriver) +}; + +#endif // _StdDrivers_DocumentRetrievalDriver_HeaderFile diff --git a/src/StdLDrivers/FILES b/src/StdLDrivers/FILES new file mode 100644 index 0000000000..8d1600fdab --- /dev/null +++ b/src/StdLDrivers/FILES @@ -0,0 +1,4 @@ +StdLDrivers.cxx +StdLDrivers.hxx +StdLDrivers_DocumentRetrievalDriver.cxx +StdLDrivers_DocumentRetrievalDriver.hxx diff --git a/src/StdLDrivers/StdLDrivers.cxx b/src/StdLDrivers/StdLDrivers.cxx new file mode 100644 index 0000000000..73fcdfd1d8 --- /dev/null +++ b/src/StdLDrivers/StdLDrivers.cxx @@ -0,0 +1,61 @@ +// Created on: 2000-09-07 +// Created by: TURIN Anatoliy +// Copyright (c) 2000-2015 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. + +#include +#include +#include + +#include +#include +#include + +static Standard_GUID StdLRetrievalDriver ("bd696001-5b34-11d1-b5ba-00a0c9064368"); + +//======================================================================= +//function : Factory +//purpose : Depending from the ID, returns a list of storage +// or retrieval attribute drivers. Used for plugin +//======================================================================= +Handle(Standard_Transient) StdLDrivers::Factory (const Standard_GUID& aGUID) +{ + if (aGUID == StdLRetrievalDriver) + { +#ifdef OCCT_DEBUG + cout << "StdLDrivers : Retrieval Plugin" << endl; +#endif + + static Handle(StdLDrivers_DocumentRetrievalDriver) model_rd = new StdLDrivers_DocumentRetrievalDriver; + return model_rd; + } + + Standard_Failure::Raise ("StdLDrivers : unknown GUID"); + return NULL; +} + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void StdLDrivers::BindTypes (StdObjMgt_MapOfInstantiators& theMap) +{ + StdLPersistent::BindTypes (theMap); +} + +#ifdef _MSC_VER +#pragma warning(disable:4190) /* disable warning on C++ type returned by C function; should be OK for C++ usage */ +#endif + +// Declare entry point PLUGINFACTORY +PLUGIN (StdLDrivers) diff --git a/src/StdLDrivers/StdLDrivers.hxx b/src/StdLDrivers/StdLDrivers.hxx new file mode 100644 index 0000000000..1db43de441 --- /dev/null +++ b/src/StdLDrivers/StdLDrivers.hxx @@ -0,0 +1,41 @@ +// Copyright (c) 2015 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 _StdLDrivers_HeaderFile +#define _StdLDrivers_HeaderFile + +#include +#include +#include + +class Standard_Transient; +class Standard_GUID; +class StdObjMgt_MapOfInstantiators; + + +class StdLDrivers +{ + friend class StdLDrivers_DocumentRetrievalDriver; + +public: + //! Depending from the ID, returns a list of storage + //! or retrieval attribute drivers. Used for plugin + Standard_EXPORT static Handle(Standard_Transient) Factory (const Standard_GUID& aGUID); + + //! Register types. + Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); + + DEFINE_STANDARD_ALLOC +}; + +#endif // _StdLDrivers_HeaderFile diff --git a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx new file mode 100644 index 0000000000..d93e00d1c5 --- /dev/null +++ b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.cxx @@ -0,0 +1,310 @@ +// Copyright (c) 2015 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. + +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +IMPLEMENT_STANDARD_RTTIEXT (StdLDrivers_DocumentRetrievalDriver, PCDM_RetrievalDriver) + +//======================================================================= +//function : CreateDocument +//purpose : Create an empty TDocStd_Document +//======================================================================= +Handle(CDM_Document) StdLDrivers_DocumentRetrievalDriver::CreateDocument() +{ + return new TDocStd_Document (PCDM_RetrievalDriver::GetFormat()); +} + +//======================================================================= +//function : Read +//purpose : Retrieve the content of a file into a new document +//======================================================================= +void StdLDrivers_DocumentRetrievalDriver::Read (const TCollection_ExtendedString& theFileName, + const Handle(CDM_Document)& theNewDocument, + const Handle(CDM_Application)&) +{ + Standard_Integer i; + + // Create a driver appropriate for the given file + PCDM_BaseDriverPointer aFileDriver; + if (PCDM::FileDriverType (TCollection_AsciiString (theFileName), aFileDriver) == PCDM_TOFD_Unknown) + { + myReaderStatus = PCDM_RS_UnknownFileDriver; + return; + } + + // Try to open the file + { + Standard_SStream aMsg; + try + { + OCC_CATCH_SIGNALS + PCDM_ReadWriter::Open (*aFileDriver, theFileName, Storage_VSRead); + myReaderStatus = PCDM_RS_OK; + } + catch (Standard_Failure) + { + aMsg << Standard_Failure::Caught() << endl; + myReaderStatus = PCDM_RS_OpenError; + } + + if (myReaderStatus != PCDM_RS_OK) + { + Standard_Failure::Raise (aMsg); + return; + } + } + + // Read header section + Storage_HeaderData hData; + if (!hData.Read (*aFileDriver)) + { + RaiseOnStorageError (hData.ErrorStatus()); + return; + } + + // Read type section + Storage_TypeData tData; + if (!tData.Read (*aFileDriver)) + { + RaiseOnStorageError (tData.ErrorStatus()); + return; + } + + // Read root section + Storage_RootData rData; + if (!rData.Read (*aFileDriver)) + { + RaiseOnStorageError (rData.ErrorStatus()); + return; + } + + if (rData.NumberOfRoots() < 1) + { + myReaderStatus = PCDM_RS_NoDocument; + + Standard_SStream aMsg; + aMsg << "could not find any document in this file" << endl; + Standard_Failure::Raise (aMsg); + + return; + } + + // Select instantiators for the used types + NCollection_Array1 + anInstantiators (1, tData.NumberOfTypes()); + { + StdObjMgt_MapOfInstantiators aMapOfInstantiators; + BindTypes (aMapOfInstantiators); + + TColStd_SequenceOfAsciiString anUnknownTypes; + Standard_Integer aCurTypeNum; + TCollection_AsciiString aCurTypeName; + + for (i = 1; i <= tData.NumberOfTypes(); i++) + { + aCurTypeName = tData.Type (i); + aCurTypeNum = tData.Type (aCurTypeName); + + StdObjMgt_Persistent::Instantiator anInstantiator; + if (aMapOfInstantiators.Find (aCurTypeName, anInstantiator)) + anInstantiators (aCurTypeNum) = anInstantiator; + else + anUnknownTypes.Append (aCurTypeName); + } + + if (!anUnknownTypes.IsEmpty()) + { + myReaderStatus = PCDM_RS_TypeNotFoundInSchema; + + Standard_SStream aMsg; + aMsg << "cannot read: `" << theFileName + << "' because it contains the following unknown types: "; + for (i = 1; i <= anUnknownTypes.Length(); i++) + { + aMsg << anUnknownTypes(i); + if (i < anUnknownTypes.Length()) aMsg << ","; + else aMsg << endl; + } + + Standard_Failure::Raise (aMsg); + return; + } + } + + // Read and parse reference section + StdObjMgt_ReadData aReadData (*aFileDriver, hData.NumberOfObjects()); + + if (RaiseOnStorageError (aFileDriver->BeginReadRefSection())) + return; + + Standard_Integer len = aFileDriver->RefSectionSize(); + for (i = 1; i <= len; i++) + { + Standard_Integer aRef = 0, aType = 0; + Storage_Error anError; + try + { + OCC_CATCH_SIGNALS + aFileDriver->ReadReferenceType (aRef, aType); + anError = Storage_VSOk; + } + catch (Storage_StreamTypeMismatchError) + { + anError = Storage_VSTypeMismatch; + } + + if (RaiseOnStorageError (anError)) + return; + + aReadData.CreateObject (aRef, anInstantiators (aType)); + } + + if (RaiseOnStorageError (aFileDriver->EndReadRefSection())) + return; + + // Read and parse data section + if (RaiseOnStorageError (aFileDriver->BeginReadDataSection())) + return; + + for (i = 1; i <= hData.NumberOfObjects(); i++) + { + Handle(StdObjMgt_Persistent) aPersistent = aReadData.Object (i); + if (!aPersistent.IsNull()) + { + Standard_Integer aRef = 0, aType = 0; + Storage_Error anError; + try + { + OCC_CATCH_SIGNALS + aFileDriver->ReadPersistentObjectHeader (aRef, aType); + aFileDriver->BeginReadPersistentObjectData(); + aPersistent->Read (aReadData); + aFileDriver->EndReadPersistentObjectData(); + anError = Storage_VSOk; + } + catch (Storage_StreamTypeMismatchError) { anError = Storage_VSTypeMismatch; } + catch (Storage_StreamFormatError ) { anError = Storage_VSFormatError; } + catch (Storage_StreamReadError ) { anError = Storage_VSFormatError; } + + if (RaiseOnStorageError (anError)) + return; + } + } + + if (RaiseOnStorageError (aFileDriver->EndReadDataSection())) + return; + + // Close the file + aFileDriver->Close(); + delete aFileDriver; + + // Initialize transient document using the root object and comments + Handle(Storage_HSeqOfRoot) aRoots = rData.Roots(); + + Handle(Storage_Root) aFirstRoot = aRoots->First(); + + Handle(StdObjMgt_Persistent) aFirstRootObject = + aReadData.Object (aFirstRoot->Reference()); + + Handle(StdLPersistent_PDocStd_Document) aPDocument = + Handle(StdLPersistent_PDocStd_Document)::DownCast (aFirstRootObject); + + if (!aPDocument.IsNull()) + aPDocument->Import (theNewDocument); + + theNewDocument->SetComments (hData.Comments()); +} + +//======================================================================= +//function : RaiseOnStorageError +//purpose : Update the reader status and raise an exception +// appropriate for the given storage error +//======================================================================= +Standard_Boolean StdLDrivers_DocumentRetrievalDriver::RaiseOnStorageError (Storage_Error theError) +{ + Standard_SStream aMsg; + + switch (theError) + { + case Storage_VSOk: + return Standard_False; + + case Storage_VSOpenError: + case Storage_VSNotOpen: + case Storage_VSAlreadyOpen: + myReaderStatus = PCDM_RS_OpenError; + aMsg << "Stream Open Error" << endl; + break; + + case Storage_VSModeError: + myReaderStatus = PCDM_RS_WrongStreamMode; + aMsg << "Stream is opened with a wrong mode for operation" << endl; + break; + + case Storage_VSSectionNotFound: + myReaderStatus = PCDM_RS_FormatFailure; + aMsg << "Section is not found" << endl; + break; + + case Storage_VSFormatError: + myReaderStatus = PCDM_RS_FormatFailure; + aMsg << "Wrong format error" << endl; + break; + + case Storage_VSUnknownType: + myReaderStatus = PCDM_RS_TypeFailure; + aMsg << "Try to read an unknown type" << endl; + break; + + case Storage_VSTypeMismatch: + myReaderStatus = PCDM_RS_TypeFailure; + aMsg << "Try to read a wrong primitive type" << endl; + break; + + default: + myReaderStatus = PCDM_RS_DriverFailure; + aMsg << "Retrieval Driver Failure" << endl; + } + + Standard_Failure::Raise (aMsg); + return Standard_True; +} + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void StdLDrivers_DocumentRetrievalDriver::BindTypes (StdObjMgt_MapOfInstantiators& theMap) +{ + StdLDrivers::BindTypes (theMap); +} diff --git a/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx new file mode 100644 index 0000000000..af63116504 --- /dev/null +++ b/src/StdLDrivers/StdLDrivers_DocumentRetrievalDriver.hxx @@ -0,0 +1,44 @@ +// Copyright (c) 2015 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 _StdLDrivers_DocumentRetrievalDriver_HeaderFile +#define _StdLDrivers_DocumentRetrievalDriver_HeaderFile + +#include +#include + +class StdObjMgt_MapOfInstantiators; + +//! retrieval driver of a Part document +class StdLDrivers_DocumentRetrievalDriver : public PCDM_RetrievalDriver +{ +public: + //! Create an empty TDocStd_Document. + Standard_EXPORT virtual Handle(CDM_Document) CreateDocument(); + + //! Retrieve the content of a file into a new document. + Standard_EXPORT virtual void Read (const TCollection_ExtendedString& theFileName, + const Handle(CDM_Document)& theNewDocument, + const Handle(CDM_Application)& theApplication); + + DEFINE_STANDARD_RTTIEXT (StdLDrivers_DocumentRetrievalDriver, PCDM_RetrievalDriver) + +private: + //! Update the reader status and raise an exception appropriate for the given storage error. + Standard_EXPORT Standard_Boolean RaiseOnStorageError (Storage_Error theError); + + //! Register types. + Standard_EXPORT virtual void BindTypes (StdObjMgt_MapOfInstantiators& theMap); +}; + +#endif // _StdLDrivers_DocumentRetrievalDriver_HeaderFile diff --git a/src/StdLPersistent/FILES b/src/StdLPersistent/FILES new file mode 100644 index 0000000000..df9d0dc9fd --- /dev/null +++ b/src/StdLPersistent/FILES @@ -0,0 +1,16 @@ +FILES +StdLPersistent.cxx +StdLPersistent.hxx +StdLPersistent_PCollection_HExtendedString.cxx +StdLPersistent_PCollection_HExtendedString.hxx +StdLPersistent_PColStd_HArray1.hxx +StdLPersistent_PColStd_HArray1Base.cxx +StdLPersistent_PColStd_HArray1Base.hxx +StdLPersistent_PDataStd_Integer.cxx +StdLPersistent_PDataStd_Integer.hxx +StdLPersistent_PDataStd_Name.cxx +StdLPersistent_PDataStd_Name.hxx +StdLPersistent_PDF_Data.cxx +StdLPersistent_PDF_Data.hxx +StdLPersistent_PDocStd_Document.cxx +StdLPersistent_PDocStd_Document.hxx diff --git a/src/StdLPersistent/StdLPersistent.cxx b/src/StdLPersistent/StdLPersistent.cxx new file mode 100644 index 0000000000..e5e23f49e4 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent.cxx @@ -0,0 +1,43 @@ +// Copyright (c) 2015 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. + +#include +#include + +#include +#include +#include +#include +#include +#include + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void StdLPersistent::BindTypes (StdObjMgt_MapOfInstantiators& theMap) +{ + theMap.Bind ("PDocStd_Document"); + theMap.Bind ("PDF_Data"); + theMap.Bind ("PDataStd_Name"); + theMap.Bind ("PDataStd_Integer"); + + theMap.Bind + ("PColStd_HArray1OfInteger"); + + theMap.Bind + ("PDF_HAttributeArray1"); + + theMap.Bind + ("PCollection_HExtendedString"); +} diff --git a/src/StdLPersistent/StdLPersistent.hxx b/src/StdLPersistent/StdLPersistent.hxx new file mode 100644 index 0000000000..9356495e74 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent.hxx @@ -0,0 +1,29 @@ +// Copyright (c) 2015 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 _StdLPersistent_HeaderFile +#define _StdLPersistent_HeaderFile + +#include + +class StdObjMgt_MapOfInstantiators; + +class StdLPersistent +{ +public: + //! Register types. + Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); +}; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PColStd_HArray1.hxx b/src/StdLPersistent/StdLPersistent_PColStd_HArray1.hxx new file mode 100644 index 0000000000..f1e2c0c37f --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PColStd_HArray1.hxx @@ -0,0 +1,62 @@ +// Copyright (c) 2015 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 _StdLPersistent_PColStd_HArray1_HeaderFile +#define _StdLPersistent_PColStd_HArray1_HeaderFile + +#include + +#include + +#include +#include + +#include + +class StdObjMgt_Persistent; + + +template +class StdLPersistent_PColStd_HArray1 : public StdLPersistent_PColStd_HArray1Base +{ +public: + //! Get the value. + const NCollection_Array1& Array() const { return *myArray; } + +protected: + virtual void CreateArray (const Standard_Integer theLowerBound, + const Standard_Integer theUpperBound) + { + myArray = new NCollection_Array1 (theLowerBound, theUpperBound); + } + + virtual void ReadValue (StdObjMgt_ReadData& theReadData, + const Standard_Integer theIndex) + { + Type aValue; + theReadData >> aValue; + myArray->SetValue (theIndex, aValue); + } + +private: + NCollection_Handle> myArray; +}; + +typedef StdLPersistent_PColStd_HArray1 + StdLPersistent_PColStd_HArray1OfInteger; + +typedef StdLPersistent_PColStd_HArray1 + StdLPersistent_PDF_HAttributeArray1; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PColStd_HArray1Base.cxx b/src/StdLPersistent/StdLPersistent_PColStd_HArray1Base.cxx new file mode 100644 index 0000000000..571ebbe805 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PColStd_HArray1Base.cxx @@ -0,0 +1,37 @@ +// Copyright (c) 2015 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. + +#include + +#include + +//======================================================================= +//function : Read +//purpose : Read persistent data from a file +//======================================================================= +void StdLPersistent_PColStd_HArray1Base::Read (StdObjMgt_ReadData& theReadData) +{ + Standard_Integer aLowerBound, anUpperBound; + theReadData >> aLowerBound >> anUpperBound; + CreateArray (aLowerBound, anUpperBound); + + theReadData.Driver().BeginReadObjectData(); + + Standard_Integer aSize; + theReadData >> aSize; + + for (Standard_Integer i = aLowerBound; i <= anUpperBound; i++) + ReadValue (theReadData, i); + + theReadData.Driver().EndReadObjectData(); +} diff --git a/src/StdLPersistent/StdLPersistent_PColStd_HArray1Base.hxx b/src/StdLPersistent/StdLPersistent_PColStd_HArray1Base.hxx new file mode 100644 index 0000000000..cf1cdf51e2 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PColStd_HArray1Base.hxx @@ -0,0 +1,35 @@ +// Copyright (c) 2015 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 _StdLPersistent_PColStd_HArray1Base_HeaderFile +#define _StdLPersistent_PColStd_HArray1Base_HeaderFile + +#include + + +class StdLPersistent_PColStd_HArray1Base : public StdObjMgt_Persistent +{ +public: + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData); + +protected: + virtual void CreateArray (const Standard_Integer theLowerBound, + const Standard_Integer theUpperBound) = 0; + + virtual void ReadValue (StdObjMgt_ReadData& theReadData, + const Standard_Integer theIndex) = 0; +}; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PCollection_HExtendedString.cxx b/src/StdLPersistent/StdLPersistent_PCollection_HExtendedString.cxx new file mode 100644 index 0000000000..5f2dfd52e7 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PCollection_HExtendedString.cxx @@ -0,0 +1,40 @@ +// Copyright (c) 2015 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. + +#include + +#include + +#include + +//======================================================================= +//function : Read +//purpose : Read persistent data from a file +//======================================================================= +void StdLPersistent_PCollection_HExtendedString::Read (StdObjMgt_ReadData& theReadData) +{ + theReadData.Driver().BeginReadObjectData(); + + Standard_Integer aSize; + theReadData >> aSize; + myValue = new TCollection_HExtendedString (aSize, 0); + + for (Standard_Integer i = 1; i <= aSize; i++) + { + Standard_ExtCharacter aChar; + theReadData >> aChar; + myValue->SetValue (i, aChar); + } + + theReadData.Driver().EndReadObjectData(); +} diff --git a/src/StdLPersistent/StdLPersistent_PCollection_HExtendedString.hxx b/src/StdLPersistent/StdLPersistent_PCollection_HExtendedString.hxx new file mode 100644 index 0000000000..acb5d3ce37 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PCollection_HExtendedString.hxx @@ -0,0 +1,36 @@ +// Copyright (c) 2015 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 _StdLPersistent_PCollection_HExtendedString_HeaderFile +#define _StdLPersistent_PCollection_HExtendedString_HeaderFile + +#include + +class TCollection_HExtendedString; + + +class StdLPersistent_PCollection_HExtendedString : public StdObjMgt_Persistent +{ +public: + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData); + + //! Get the value. + Handle(TCollection_HExtendedString) Value() const { return myValue; } + +private: + Handle(TCollection_HExtendedString) myValue; +}; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PDF_Data.cxx b/src/StdLPersistent/StdLPersistent_PDF_Data.cxx new file mode 100644 index 0000000000..0ff63ea5ec --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDF_Data.cxx @@ -0,0 +1,98 @@ +// Copyright (c) 2015 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. + +#include + +#include + +#include +#include + +//! Create a transient label tree from persistent data +class StdLPersistent_PDF_Data::Parser +{ +public: + //! Start parsing a persistent data. + Parser (const StdLPersistent_PDF_Data& theSource) + : myLabelsIter (theSource.myLabels->Array()) + , myAttribIter (theSource.myAttributes->Array()) {} + + //! Fill a transient label with data. + void FillLabel (TDF_Label theLabel) + { + Standard_Integer i; + + // Read count of attributes + myLabelsIter.Next(); + Standard_Integer anAttribCount = myLabelsIter.Value(); + + // Add attributes to the label + for (i = 0 ; i < anAttribCount; i++) + { + // read persistent attribute + const Handle(StdObjMgt_Persistent)& aPAttrib = myAttribIter.Value(); + myAttribIter.Next(); + + // create transient attribute and add it to the label + if (!aPAttrib.IsNull()) + { + Handle(TDF_Attribute) aTAttrib = aPAttrib->ImportAttribute(); + if (!aTAttrib.IsNull()) + theLabel.AddAttribute (aTAttrib); + } + } + + // Read count of child labels + myLabelsIter.Next(); + Standard_Integer aSubLabelsCount = myLabelsIter.Value(); + + // Create child labels + for (i = 0 ; i < aSubLabelsCount; i++) + { + // read tag of child label + myLabelsIter.Next(); + Standard_Integer aSubLabelTag = myLabelsIter.Value(); + + // create and fill child label + TDF_Label aSubLabel = theLabel.FindChild (aSubLabelTag, Standard_True); + FillLabel (aSubLabel); + } + } + +private: + NCollection_Array1::Iterator myLabelsIter; + NCollection_Array1::Iterator myAttribIter; +}; + +//======================================================================= +//function : Read +//purpose : Read persistent data from a file +//======================================================================= +void StdLPersistent_PDF_Data::Read (StdObjMgt_ReadData& theReadData) +{ + theReadData >> myVersion >> myLabels >> myAttributes; +} + +//======================================================================= +//function : Import +//purpose : Import transient data from the persistent data +//======================================================================= +Handle(TDF_Data) StdLPersistent_PDF_Data::Import() const +{ + if (myLabels.IsNull() || myAttributes.IsNull()) + return NULL; + + Handle(TDF_Data) aData = new TDF_Data; + Parser (*this).FillLabel (aData->Root()); + return aData; +} diff --git a/src/StdLPersistent/StdLPersistent_PDF_Data.hxx b/src/StdLPersistent/StdLPersistent_PDF_Data.hxx new file mode 100644 index 0000000000..eb2e13a323 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDF_Data.hxx @@ -0,0 +1,43 @@ +// Copyright (c) 2015 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 _StdLPersistent_PDF_Data_HeaderFile +#define _StdLPersistent_PDF_Data_HeaderFile + +#include + +#include + +class TDF_Data; + + +class StdLPersistent_PDF_Data : public StdObjMgt_Persistent +{ +public: + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData); + + //! Import transient data from the persistent data. + Standard_EXPORT Handle(TDF_Data) Import() const; + +private: + class Parser; + +private: + Standard_Integer myVersion; + Handle(StdLPersistent_PColStd_HArray1OfInteger) myLabels; + Handle(StdLPersistent_PDF_HAttributeArray1) myAttributes; +}; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PDataStd_Integer.cxx b/src/StdLPersistent/StdLPersistent_PDataStd_Integer.cxx new file mode 100644 index 0000000000..2203e3153f --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDataStd_Integer.cxx @@ -0,0 +1,38 @@ +// Copyright (c) 2015 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. + +#include + +#include + +#include + +//======================================================================= +//function : Read +//purpose : Read persistent data from a file +//======================================================================= +void StdLPersistent_PDataStd_Integer::Read (StdObjMgt_ReadData& theReadData) +{ + theReadData >> myValue; +} + +//======================================================================= +//function : ImportAttribute +//purpose : Import transient attribuite from the persistent data +//======================================================================= +Handle(TDF_Attribute) StdLPersistent_PDataStd_Integer::ImportAttribute() const +{ + Handle(TDataStd_Integer) aValue = new TDataStd_Integer; + aValue->Set (myValue); + return aValue; +} diff --git a/src/StdLPersistent/StdLPersistent_PDataStd_Integer.hxx b/src/StdLPersistent/StdLPersistent_PDataStd_Integer.hxx new file mode 100644 index 0000000000..7dd29030b8 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDataStd_Integer.hxx @@ -0,0 +1,34 @@ +// Copyright (c) 2015 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 _StdLPersistent_PDataStd_Integer_HeaderFile +#define _StdLPersistent_PDataStd_Integer_HeaderFile + +#include + + +class StdLPersistent_PDataStd_Integer : public StdObjMgt_Persistent +{ +public: + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData); + + //! Import transient attribuite from the persistent data. + Standard_EXPORT virtual Handle(TDF_Attribute) ImportAttribute() const; + +private: + Standard_Integer myValue; +}; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PDataStd_Name.cxx b/src/StdLPersistent/StdLPersistent_PDataStd_Name.cxx new file mode 100644 index 0000000000..ce8d076d54 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDataStd_Name.cxx @@ -0,0 +1,43 @@ +// Copyright (c) 2015 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. + +#include +#include + +#include + +#include +#include + +//======================================================================= +//function : Read +//purpose : Read persistent data from a file +//======================================================================= +void StdLPersistent_PDataStd_Name::Read (StdObjMgt_ReadData& theReadData) +{ + theReadData >> myString; +} + +//======================================================================= +//function : ImportAttribute +//purpose : Import transient attribuite from the persistent data +//======================================================================= +Handle(TDF_Attribute) StdLPersistent_PDataStd_Name::ImportAttribute() const +{ + if (myString.IsNull() || myString->Value().IsNull()) + return NULL; + + Handle(TDataStd_Name) aName = new TDataStd_Name; + aName->Set (myString->Value()->String()); + return aName; +} diff --git a/src/StdLPersistent/StdLPersistent_PDataStd_Name.hxx b/src/StdLPersistent/StdLPersistent_PDataStd_Name.hxx new file mode 100644 index 0000000000..e0d2d11df3 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDataStd_Name.hxx @@ -0,0 +1,36 @@ +// Copyright (c) 2015 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 _StdLPersistent_PDataStd_Name_HeaderFile +#define _StdLPersistent_PDataStd_Name_HeaderFile + +#include + +class StdLPersistent_PCollection_HExtendedString; + + +class StdLPersistent_PDataStd_Name : public StdObjMgt_Persistent +{ +public: + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData); + + //! Import transient attribuite from the persistent data. + Standard_EXPORT virtual Handle(TDF_Attribute) ImportAttribute() const; + +private: + Handle(StdLPersistent_PCollection_HExtendedString) myString; +}; + +#endif diff --git a/src/StdLPersistent/StdLPersistent_PDocStd_Document.cxx b/src/StdLPersistent/StdLPersistent_PDocStd_Document.cxx new file mode 100644 index 0000000000..cee3e24574 --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDocStd_Document.cxx @@ -0,0 +1,44 @@ +// Copyright (c) 2015 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. + +#include +#include + +#include + +#include +#include + +//======================================================================= +//function : Read +//purpose : Read persistent data from a file +//======================================================================= +void StdLPersistent_PDocStd_Document::Read (StdObjMgt_ReadData& theReadData) +{ + theReadData >> myData; +} + +//======================================================================= +//function : Import +//purpose : Import transient document from the persistent data +//======================================================================= +void StdLPersistent_PDocStd_Document::Import (const Handle(CDM_Document)& theDocument) const +{ + Handle(TDocStd_Document) aDocument = Handle(TDocStd_Document)::DownCast (theDocument); + if (aDocument.IsNull() || myData.IsNull()) + return; + + Handle(TDF_Data) aData = myData->Import(); + aDocument->SetData (aData); + TDocStd_Owner::SetDocument (aData, aDocument); +} diff --git a/src/StdLPersistent/StdLPersistent_PDocStd_Document.hxx b/src/StdLPersistent/StdLPersistent_PDocStd_Document.hxx new file mode 100644 index 0000000000..2a71a8315b --- /dev/null +++ b/src/StdLPersistent/StdLPersistent_PDocStd_Document.hxx @@ -0,0 +1,37 @@ +// Copyright (c) 2015 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 _StdLPersistent_PDocStd_Document_HeaderFile +#define _StdLPersistent_PDocStd_Document_HeaderFile + +#include + +class CDM_Document; +class StdLPersistent_PDF_Data; + + +class StdLPersistent_PDocStd_Document : public StdObjMgt_Persistent +{ +public: + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData); + + //! Import transient document from the persistent data. + Standard_EXPORT void Import (const Handle(CDM_Document)& theDocument) const; + +private: + Handle(StdLPersistent_PDF_Data) myData; +}; + +#endif diff --git a/src/StdObjMgt/FILES b/src/StdObjMgt/FILES new file mode 100644 index 0000000000..9ac838a3f2 --- /dev/null +++ b/src/StdObjMgt/FILES @@ -0,0 +1,6 @@ +StdObjMgt_MapOfInstantiators.cxx +StdObjMgt_MapOfInstantiators.hxx +StdObjMgt_Persistent.cxx +StdObjMgt_Persistent.hxx +StdObjMgt_ReadData.cxx +StdObjMgt_ReadData.hxx diff --git a/src/StdObjMgt/StdObjMgt_MapOfInstantiators.cxx b/src/StdObjMgt/StdObjMgt_MapOfInstantiators.cxx new file mode 100644 index 0000000000..bf02db366f --- /dev/null +++ b/src/StdObjMgt/StdObjMgt_MapOfInstantiators.cxx @@ -0,0 +1,15 @@ +// Copyright (c) 2015 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. + + +#include diff --git a/src/StdObjMgt/StdObjMgt_MapOfInstantiators.hxx b/src/StdObjMgt/StdObjMgt_MapOfInstantiators.hxx new file mode 100644 index 0000000000..791acdf6c1 --- /dev/null +++ b/src/StdObjMgt/StdObjMgt_MapOfInstantiators.hxx @@ -0,0 +1,45 @@ +// Copyright (c) 2015 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 _StdObjMgt_MapOfInstantiators_HeaderFile +#define _StdObjMgt_MapOfInstantiators_HeaderFile + +#include +#include +#include + + +class StdObjMgt_MapOfInstantiators + : public NCollection_DataMap +{ +public: + template + void Bind (const TCollection_AsciiString& theTypeName) + { + NCollection_DataMap + ::Bind (theTypeName, &Instantiate); + } + + DEFINE_STANDARD_ALLOC + +private: + template + static Handle(StdObjMgt_Persistent) Instantiate() + { return new Type; } +}; + +#endif // _StdObjMgt_MapOfInstantiators_HeaderFile diff --git a/src/StdObjMgt/StdObjMgt_Persistent.cxx b/src/StdObjMgt/StdObjMgt_Persistent.cxx new file mode 100644 index 0000000000..ad1b42ef71 --- /dev/null +++ b/src/StdObjMgt/StdObjMgt_Persistent.cxx @@ -0,0 +1,25 @@ +// Copyright (c) 2015 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. + +#include + +//======================================================================= +//function : ImportAttribute +//purpose : Import transient attribuite from the persistent data +//! (to be overriden by attribute classes; +//! returns a null handle by default for non-attribute classes) +//======================================================================= +Handle(TDF_Attribute) StdObjMgt_Persistent::ImportAttribute() const +{ + return Handle(TDF_Attribute)(); +} diff --git a/src/StdObjMgt/StdObjMgt_Persistent.hxx b/src/StdObjMgt/StdObjMgt_Persistent.hxx new file mode 100644 index 0000000000..87f06e573b --- /dev/null +++ b/src/StdObjMgt/StdObjMgt_Persistent.hxx @@ -0,0 +1,43 @@ +// Copyright (c) 2015 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 _StdObjMgt_Persistent_HeaderFile +#define _StdObjMgt_Persistent_HeaderFile + + +#include +#include +#include + +class StdObjMgt_ReadData; +class TDF_Attribute; + + +//! Root class for a temporary object that reads data from a file and then +//! creates transient object using the data. +class StdObjMgt_Persistent : public Standard_Transient +{ +public: + //! Create a derived class instance. + typedef Handle(StdObjMgt_Persistent) (*Instantiator)(); + + //! Read persistent data from a file. + Standard_EXPORT virtual void Read (StdObjMgt_ReadData& theReadData) = 0; + + //! Import transient attribuite from the persistent data + //! (to be overriden by attribute classes; + //! returns a null handle by default for non-attribute classes). + Standard_EXPORT virtual Handle(TDF_Attribute) ImportAttribute() const; +}; + +#endif // _StdObjMgt_Persistent_HeaderFile diff --git a/src/StdObjMgt/StdObjMgt_ReadData.cxx b/src/StdObjMgt/StdObjMgt_ReadData.cxx new file mode 100644 index 0000000000..c6636004d3 --- /dev/null +++ b/src/StdObjMgt/StdObjMgt_ReadData.cxx @@ -0,0 +1,31 @@ +// Copyright (c) 2015 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. + +#include + + +StdObjMgt_ReadData::StdObjMgt_ReadData (Storage_BaseDriver& theDriver, + const Standard_Integer theNumberOfObjects) + : myDriver (&theDriver) + , myPersistentObjects (1, theNumberOfObjects) {} + +void StdObjMgt_ReadData::ReadReference (Handle(StdObjMgt_Persistent)& theTarget) +{ + Standard_Integer aRef; + myDriver->GetReference (aRef); + + if (aRef) + theTarget = Object (aRef); + else + theTarget.Nullify(); +} diff --git a/src/StdObjMgt/StdObjMgt_ReadData.hxx b/src/StdObjMgt/StdObjMgt_ReadData.hxx new file mode 100644 index 0000000000..342eac0e54 --- /dev/null +++ b/src/StdObjMgt/StdObjMgt_ReadData.hxx @@ -0,0 +1,61 @@ +// Copyright (c) 2015 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 _StdObjMgt_ReadData_HeaderFile +#define _StdObjMgt_ReadData_HeaderFile + +#include +#include +#include +#include + + +//! Auxiliary data used to read persistent objects from a file. +class StdObjMgt_ReadData +{ +public: + Standard_EXPORT StdObjMgt_ReadData (Storage_BaseDriver& theDriver, + const Standard_Integer theNumberOfObjects); + + void CreateObject (const Standard_Integer theRef, + StdObjMgt_Persistent::Instantiator theInstantiator) + { myPersistentObjects (theRef) = theInstantiator(); } + + Handle(StdObjMgt_Persistent) Object (const Standard_Integer theRef) const + { return myPersistentObjects (theRef); } + + Storage_BaseDriver& Driver() const + { return *myDriver; } + + Standard_EXPORT void ReadReference (Handle(StdObjMgt_Persistent)& theTarget); + + template + StdObjMgt_ReadData& operator >> (Type& aValue) + { + *myDriver >> aValue; + return *this; + } + + template + StdObjMgt_ReadData& operator >> (Handle(Type)& theTarget) + { + ReadReference (theTarget); + return *this; + } + +private: + Storage_BaseDriver* myDriver; + NCollection_Array1 myPersistentObjects; +}; + +#endif // _StdObjMgt_ReadData_HeaderFile diff --git a/src/StdPersistent/FILES b/src/StdPersistent/FILES new file mode 100644 index 0000000000..e60a9fa4df --- /dev/null +++ b/src/StdPersistent/FILES @@ -0,0 +1,3 @@ +FILES +StdPersistent.cxx +StdPersistent.hxx diff --git a/src/StdPersistent/StdPersistent.cxx b/src/StdPersistent/StdPersistent.cxx new file mode 100644 index 0000000000..783a9571fb --- /dev/null +++ b/src/StdPersistent/StdPersistent.cxx @@ -0,0 +1,23 @@ +// Copyright (c) 2015 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. + +#include +#include + +//======================================================================= +//function : BindTypes +//purpose : Register types +//======================================================================= +void StdPersistent::BindTypes (StdObjMgt_MapOfInstantiators& /*theMap*/) +{ +} diff --git a/src/StdPersistent/StdPersistent.hxx b/src/StdPersistent/StdPersistent.hxx new file mode 100644 index 0000000000..8ca11064af --- /dev/null +++ b/src/StdPersistent/StdPersistent.hxx @@ -0,0 +1,29 @@ +// Copyright (c) 2015 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 _StdPersistent_HeaderFile +#define _StdPersistent_HeaderFile + +#include + +class StdObjMgt_MapOfInstantiators; + +class StdPersistent +{ +public: + //! Register types. + Standard_EXPORT static void BindTypes (StdObjMgt_MapOfInstantiators& theMap); +}; + +#endif diff --git a/src/StdResource/Plugin b/src/StdResource/Plugin index 516a2ad535..b346df48f4 100755 --- a/src/StdResource/Plugin +++ b/src/StdResource/Plugin @@ -3,6 +3,14 @@ ! a148e300-5740-11d1-a904-080036aaa103.Location: FWOSPlugin ! +! standard attribute drivers plugin +! +ad696001-5b34-11d1-b5ba-00a0c9064368.Location: TKStd +! +! standard attribute drivers plugin +! +bd696001-5b34-11d1-b5ba-00a0c9064368.Location: TKStdL +! ! XmlOcaf Document Plugin ! 03a56820-8269-11d5-aab2-0050044b1af1.Location: TKXml diff --git a/src/StdResource/Standard b/src/StdResource/Standard index 72ba56bba3..8c27410afa 100755 --- a/src/StdResource/Standard +++ b/src/StdResource/Standard @@ -1,9 +1,15 @@ -formatlist:XmlOcaf|BinOcaf +formatlist:MDTV-Standard|XmlOcaf|BinOcaf ! ! Default format xml.FileFormat: XmlOcaf cbf.FileFormat: BinOcaf ! +! standard attributes +! +MDTV-Standard.Description: Standard Document Version 1.0 +MDTV-Standard.FileExtension: std +MDTV-Standard.RetrievalPlugin: ad696001-5b34-11d1-b5ba-00a0c9064368 +! ! XmlOcaf format ! XmlOcaf.Description: Xml Document Version 1.0 diff --git a/src/StdResource/StandardLite b/src/StdResource/StandardLite index 15449cd94f..b5c386548f 100755 --- a/src/StdResource/StandardLite +++ b/src/StdResource/StandardLite @@ -1,4 +1,11 @@ -formatlist:BinLOcaf|XmlLOcaf +formatlist:OCC-StdLite|BinLOcaf|XmlLOcaf +! +! +! Lite attributes +! +OCC-StdLite.Description: Lite Document Version 1.0 +OCC-StdLite.FileExtension: stdl +OCC-StdLite.RetrievalPlugin: bd696001-5b34-11d1-b5ba-00a0c9064368 ! ! BinLOcaf format ! diff --git a/src/Storage/Storage_HeaderData.cxx b/src/Storage/Storage_HeaderData.cxx index c29a4827fa..0433e5af14 100644 --- a/src/Storage/Storage_HeaderData.cxx +++ b/src/Storage/Storage_HeaderData.cxx @@ -13,9 +13,11 @@ // commercial license or contractual agreement. -#include +#include #include -#include +#include +#include +#include #include #include @@ -25,6 +27,98 @@ Storage_HeaderData::Storage_HeaderData() : myNBObj(0), myErrorStatus(Storage_VSO { } +Standard_Boolean Storage_HeaderData::Read (Storage_BaseDriver& theDriver) +{ + // Check driver open mode + if (theDriver.OpenMode() != Storage_VSRead + && theDriver.OpenMode() != Storage_VSReadWrite) + { + myErrorStatus = Storage_VSModeError; + myErrorStatusExt = "OpenMode"; + return Standard_False; + } + + // Read info section + myErrorStatus = theDriver.BeginReadInfoSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "BeginReadInfoSection"; + return Standard_False; + } + + { + try + { + OCC_CATCH_SIGNALS + theDriver.ReadInfo (myNBObj, + myStorageVersion, + myDate, + mySchemaName, + mySchemaVersion, + myApplicationName, + myApplicationVersion, + myDataType, + myUserInfo); + } + catch (Storage_StreamTypeMismatchError) + { + myErrorStatus = Storage_VSTypeMismatch; + myErrorStatusExt = "ReadInfo"; + return Standard_False; + } + catch (Storage_StreamExtCharParityError) + { + myErrorStatus = Storage_VSExtCharParityError; + myErrorStatusExt = "ReadInfo"; + return Standard_False; + } + } + + myErrorStatus = theDriver.EndReadInfoSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "EndReadInfoSection"; + return Standard_False; + } + + // Read comment section + myErrorStatus = theDriver.BeginReadCommentSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "BeginReadCommentSection"; + return Standard_False; + } + + { + try + { + OCC_CATCH_SIGNALS + theDriver.ReadComment (myComments); + } + catch (Storage_StreamTypeMismatchError) + { + myErrorStatus = Storage_VSTypeMismatch; + myErrorStatusExt = "ReadComment"; + return Standard_False; + } + catch (Storage_StreamExtCharParityError) + { + myErrorStatus = Storage_VSExtCharParityError; + myErrorStatusExt = "ReadComment"; + return Standard_False; + } + } + + myErrorStatus = theDriver.EndReadCommentSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "EndReadCommentSection"; + return Standard_False; + } + + return Standard_True; +} + TCollection_AsciiString Storage_HeaderData::CreationDate() const { return myDate; diff --git a/src/Storage/Storage_HeaderData.hxx b/src/Storage/Storage_HeaderData.hxx index 0eb38e73ae..930bb2324e 100644 --- a/src/Storage/Storage_HeaderData.hxx +++ b/src/Storage/Storage_HeaderData.hxx @@ -28,6 +28,7 @@ #include #include class Storage_Schema; +class Storage_BaseDriver; class TCollection_AsciiString; class TCollection_ExtendedString; @@ -43,6 +44,8 @@ public: Standard_EXPORT Storage_HeaderData(); + + Standard_EXPORT Standard_Boolean Read (Storage_BaseDriver& theDriver); //! return the creation date Standard_EXPORT TCollection_AsciiString CreationDate() const; diff --git a/src/Storage/Storage_Root.cxx b/src/Storage/Storage_Root.cxx index c0b6da4892..1184ba59bc 100644 --- a/src/Storage/Storage_Root.cxx +++ b/src/Storage/Storage_Root.cxx @@ -21,23 +21,27 @@ IMPLEMENT_STANDARD_RTTIEXT(Storage_Root,MMgt_TShared) -Storage_Root::Storage_Root() : myRef(0) -{ -} +Storage_Root::Storage_Root() + : myRef (0) {} -Storage_Root::Storage_Root(const TCollection_AsciiString& aName,const Handle(Standard_Persistent)& anObject) : myRef(0) -{ - myName = aName; - myObject = anObject; - - if (!anObject.IsNull()) { - myType = anObject->DynamicType()->Name(); - } -} +Storage_Root::Storage_Root (const TCollection_AsciiString& theName, + const Handle(Standard_Persistent)& theObject) + : myName (theName) + , myObject (theObject) + , myRef (0) +{} -void Storage_Root::SetName(const TCollection_AsciiString& aName) +Storage_Root::Storage_Root (const TCollection_AsciiString& theName, + const Standard_Integer theRef, + const TCollection_AsciiString& theType) + : myName (theName) + , myType (theType) + , myRef (theRef) +{} + +void Storage_Root::SetName (const TCollection_AsciiString& theName) { - myName = aName; + myName = theName; } TCollection_AsciiString Storage_Root::Name() const @@ -48,10 +52,6 @@ TCollection_AsciiString Storage_Root::Name() const void Storage_Root::SetObject(const Handle(Standard_Persistent)& anObject) { myObject = anObject; - - if (!anObject.IsNull()) { - myType = anObject->DynamicType()->Name(); - } } Handle(Standard_Persistent) Storage_Root::Object() const diff --git a/src/Storage/Storage_Root.hxx b/src/Storage/Storage_Root.hxx index 82f233513a..62dbfa29c7 100644 --- a/src/Storage/Storage_Root.hxx +++ b/src/Storage/Storage_Root.hxx @@ -53,9 +53,14 @@ public: Standard_EXPORT Storage_Root(); - Standard_EXPORT Storage_Root(const TCollection_AsciiString& aName, const Handle(Standard_Persistent)& anObject); + Standard_EXPORT Storage_Root (const TCollection_AsciiString& theName, + const Handle(Standard_Persistent)& theObject); + + Standard_EXPORT Storage_Root (const TCollection_AsciiString& theName, + const Standard_Integer theRef, + const TCollection_AsciiString& theType); - Standard_EXPORT void SetName (const TCollection_AsciiString& aName); + Standard_EXPORT void SetName (const TCollection_AsciiString& theName); //! Returns the name of this root object. diff --git a/src/Storage/Storage_RootData.cxx b/src/Storage/Storage_RootData.cxx index 6588486cd1..a4b103b703 100644 --- a/src/Storage/Storage_RootData.cxx +++ b/src/Storage/Storage_RootData.cxx @@ -13,13 +13,14 @@ // commercial license or contractual agreement. -#include #include -#include -#include -#include +#include +#include #include -#include +#include +#include +#include +#include #include IMPLEMENT_STANDARD_RTTIEXT(Storage_RootData,MMgt_TShared) @@ -28,6 +29,57 @@ Storage_RootData::Storage_RootData() : myErrorStatus(Storage_VSOk) { } +Standard_Boolean Storage_RootData::Read (Storage_BaseDriver& theDriver) +{ + // Check driver open mode + if (theDriver.OpenMode() != Storage_VSRead + && theDriver.OpenMode() != Storage_VSReadWrite) + { + myErrorStatus = Storage_VSModeError; + myErrorStatusExt = "OpenMode"; + return Standard_False; + } + + // Read root section + myErrorStatus = theDriver.BeginReadRootSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "BeginReadRootSection"; + return Standard_False; + } + + TCollection_AsciiString aRootName, aTypeName; + Standard_Integer aRef; + + Standard_Integer len = theDriver.RootSectionSize(); + for (Standard_Integer i = 1; i <= len; i++) + { + try + { + OCC_CATCH_SIGNALS + theDriver.ReadRoot (aRootName, aRef, aTypeName); + } + catch (Storage_StreamTypeMismatchError) + { + myErrorStatus = Storage_VSTypeMismatch; + myErrorStatusExt = "ReadRoot"; + return Standard_False; + } + + Handle(Storage_Root) aRoot = new Storage_Root (aRootName, aRef, aTypeName); + myObjects.Bind (aRootName, aRoot); + } + + myErrorStatus = theDriver.EndReadRootSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "EndReadRootSection"; + return Standard_False; + } + + return Standard_True; +} + Standard_Integer Storage_RootData::NumberOfRoots() const { return myObjects.Extent(); diff --git a/src/Storage/Storage_RootData.hxx b/src/Storage/Storage_RootData.hxx index 5069f0162a..c49d2fee12 100644 --- a/src/Storage/Storage_RootData.hxx +++ b/src/Storage/Storage_RootData.hxx @@ -29,6 +29,7 @@ #include class Standard_NoSuchObject; class Storage_Schema; +class Storage_BaseDriver; class Storage_Root; class TCollection_AsciiString; class Standard_Persistent; @@ -45,6 +46,8 @@ public: Standard_EXPORT Storage_RootData(); + + Standard_EXPORT Standard_Boolean Read (Storage_BaseDriver& theDriver); //! returns the number of roots. Standard_EXPORT Standard_Integer NumberOfRoots() const; diff --git a/src/Storage/Storage_Schema.cxx b/src/Storage/Storage_Schema.cxx index 0e9bbddba4..2167cabaee 100644 --- a/src/Storage/Storage_Schema.cxx +++ b/src/Storage/Storage_Schema.cxx @@ -287,7 +287,6 @@ Storage_Schema::Storage_Schema() Clear(); ResetDefaultCallBack(); myCallBackState = Standard_False; - myNestedState = Standard_False; } //======================================================================= @@ -365,11 +364,11 @@ void Storage_Schema::Write } for (posto = 1; posto <= plist->Length(); posto++) { - AddTypeSelection(plist->Value(posto)->Object()); +// AddTypeSelection(plist->Value(posto)->Object()); } for (posfrom = plist->Length() + 1; posfrom <= iData->myPtoA.Length(); posfrom++) { - AddTypeSelection(iData->myPtoA.Value(posfrom)); +// AddTypeSelection(iData->myPtoA.Value(posfrom)); } // ...and now we write @@ -442,7 +441,7 @@ void Storage_Schema::Write errorContext = "WriteRoot"; for (i = 1; i <= plist->Length(); i++) { - f.WriteRoot(plist->Value(i)->Name(),i,plist->Value(i)->Type()); + f.WriteRoot(plist->Value(i)->Name(),i,"PDocStd_Document"); } errorContext = "EndWriteRootSection"; @@ -499,378 +498,6 @@ void Storage_Schema::Write Clear(); } -//======================================================================= -//function : Read -//purpose : ...and read a Storage file -//Arguments: -// s: driver to read -//======================================================================= - -Handle(Storage_Data) Storage_Schema::Read(Storage_BaseDriver& f) const -{ - Handle(Storage_Data) dData = new Storage_Data; - Storage_Error errorCode; -static Standard_Boolean result; -static Standard_Integer len; -static Standard_Integer i; - i = 0 ; - Handle(Standard_Persistent) per; - Handle(Storage_HArrayOfCallBack) theCallBack; - - Handle(Storage_InternalData) iData = dData->InternalData(); - Handle(Storage_TypeData) tData = dData->TypeData(); - Handle(Storage_RootData) rData = dData->RootData(); - Handle(Storage_HeaderData) hData = dData->HeaderData(); - - if ((f.OpenMode() == Storage_VSRead) || (f.OpenMode() == Storage_VSReadWrite)) { - - Storage_Schema::ISetCurrentData(dData); - - // IReadHeaderSection can set an error status - // - result = IReadHeaderSection(f,hData); - - if (result) { - Handle(Storage_CallBack) accallBack; - Standard_Integer p; - TCollection_AsciiString typeName; - - iData->myReadArray = new Storage_HPArray(1,dData->NumberOfObjects()); - - // IReadTypeSection can set an error status - // - result = IReadTypeSection(f,tData); - - if (result) { - len = dData->NumberOfTypes(); - theCallBack = new Storage_HArrayOfCallBack(1,len); - { - try { - OCC_CATCH_SIGNALS - for (i = 1; i <= len; i++) { - typeName = tData->Type(i); - p = tData->Type(typeName); - theCallBack->SetValue(p,CallBackSelection(typeName)); - } - } - catch(Storage_StreamUnknownTypeError) { - result = Standard_False; - dData->SetErrorStatus(Storage_VSUnknownType); - dData->SetErrorStatusExtension(typeName); - } - } - } - else { - dData->SetErrorStatus(tData->ErrorStatus()); - dData->SetErrorStatusExtension(tData->ErrorStatusExtension()); - } - } - else { - dData->SetErrorStatus(hData->ErrorStatus()); - dData->SetErrorStatusExtension(hData->ErrorStatusExtension()); - } - - if (result) { - result = IReadRootSection(f,rData); - dData->SetErrorStatus(rData->ErrorStatus()); - if (!result) dData->SetErrorStatusExtension(rData->ErrorStatusExtension()); - } - - if (result) { - Standard_Integer otype, oref = 0; - - errorCode = f.BeginReadRefSection(); - - if (errorCode == Storage_VSOk) { - { - try { - OCC_CATCH_SIGNALS - len = f.RefSectionSize(); - - for (i = 1; i <= len; i++) { - f.ReadReferenceType(oref,otype); - iData->myReadArray->ChangeValue(oref) = theCallBack->Value(otype)->New(); - if (!iData->myReadArray->ChangeValue(oref).IsNull()) iData->myReadArray->ChangeValue(oref)->_typenum = otype; - } - } - catch(Storage_StreamTypeMismatchError) { - TCollection_AsciiString aOref = oref; - result = Standard_False; - dData->SetErrorStatus(Storage_VSTypeMismatch); - dData->SetErrorStatusExtension(aOref); - } - } - - if (result) { - errorCode = f.EndReadRefSection(); - result = (errorCode == Storage_VSOk); - dData->SetErrorStatus(errorCode); - if (!result) dData->SetErrorStatusExtension("EndReadRefSection"); - } - } - else { - result = Standard_False; - dData->SetErrorStatus(errorCode); - dData->SetErrorStatusExtension("BeginReadRefSection"); - } - } - - if (result) { - errorCode = f.BeginReadDataSection(); - result = (errorCode == Storage_VSOk); - dData->SetErrorStatus(errorCode); - if (!result) dData->SetErrorStatusExtension("BeginReadDataSection"); - } - - if (result) { - Handle(Storage_Schema) me = this; - Handle(Storage_CallBack) rcback; - - { - try { - OCC_CATCH_SIGNALS - for (i = 1; i <= dData->NumberOfObjects(); i++) { - Handle(Standard_Persistent) pobj = iData->myReadArray->Value(i); - if (!pobj.IsNull()) { - rcback = theCallBack->Value(pobj->_typenum); - rcback->Read(pobj,f,me); - pobj->_typenum = 0; - } - } - } - catch(Storage_StreamTypeMismatchError) { - result = Standard_False; - dData->SetErrorStatus(Storage_VSTypeMismatch); - dData->SetErrorStatusExtension(i-1); - } - catch(Storage_StreamFormatError) { - result = Standard_False; - dData->SetErrorStatus(Storage_VSFormatError); - dData->SetErrorStatusExtension(i-1); - } - catch(Storage_StreamReadError) { - result = Standard_False; - dData->SetErrorStatus(Storage_VSFormatError); - dData->SetErrorStatusExtension(i-1); - } - } - - if (result) { - Handle(Storage_HSeqOfRoot) rlist = rData->Roots(); - Handle(Storage_Root) rroot; - - for(i = 1; i <= dData->NumberOfRoots(); i++) { - rroot = rlist->Value(i); - rData->UpdateRoot(rroot->Name(),iData->myReadArray->Value(rroot->Reference())); - } - - errorCode = f.EndReadDataSection(); - result = (errorCode == Storage_VSOk); - dData->SetErrorStatus(errorCode); - if (!result) dData->SetErrorStatusExtension("EndReadDataSection"); - } - } - } - else { - dData->SetErrorStatus(Storage_VSModeError); - dData->SetErrorStatusExtension("OpenMode"); - } - - iData->Clear(); - Clear(); - - return dData; -} - -//======================================================================= -//function : ReadHeaderSection -//purpose : read the header part of the stream -//Arguments: -// s: driver to read -//======================================================================= - -Handle(Storage_HeaderData) Storage_Schema::ReadHeaderSection - (Storage_BaseDriver& s) const -{ - Handle(Storage_HeaderData) result = new Storage_HeaderData; - - if ((s.OpenMode() == Storage_VSRead) || (s.OpenMode() == Storage_VSReadWrite)) { - IReadHeaderSection(s,result); - } - else { - result->SetErrorStatus(Storage_VSModeError); - result->SetErrorStatusExtension("OpenMode"); - } - - return result; -} - -//======================================================================= -//function : ReadTypeSection -//purpose : fill the TypeData with the names of the type used -// in a stream -//Arguments: -// s: driver to read -//======================================================================= - -Handle(Storage_TypeData) Storage_Schema::ReadTypeSection - (Storage_BaseDriver& f) const -{ - Handle(Storage_TypeData) result = new Storage_TypeData; - - if ((f.OpenMode() == Storage_VSRead) || (f.OpenMode() == Storage_VSReadWrite)) { - IReadTypeSection(f,result); - } - else { - result->SetErrorStatus(Storage_VSModeError); - result->SetErrorStatusExtension("OpenMode"); - } - - return result; -} - -//======================================================================= -//function : ReadRootSection -//purpose : read root part of the file -//Arguments: -// s: driver to read -//======================================================================= - -Handle(Storage_RootData) Storage_Schema::ReadRootSection - (Storage_BaseDriver& f) const -{ - Handle(Storage_RootData) result = new Storage_RootData; - - if ((f.OpenMode() == Storage_VSRead) || (f.OpenMode() == Storage_VSReadWrite)) { - IReadRootSection(f,result); - } - else { - result->SetErrorStatus(Storage_VSModeError); - result->SetErrorStatusExtension("OpenMode"); - } - - return result; -} - -//======================================================================= -//function : SchemaKnownTypes -//purpose : returns the known types of a schema -//======================================================================= - -const TColStd_SequenceOfAsciiString& Storage_Schema::SchemaKnownTypes() const -{ - static TColStd_SequenceOfAsciiString aSeq; - return aSeq; -} - -//======================================================================= -//function : GetAllSchemaKnownTypes -//purpose : returns the all known types of a schema and their -// nested schemes. -//PTV : add get of all known type for inheritance of schemas -//======================================================================= - -Handle(TColStd_HSequenceOfAsciiString) Storage_Schema:: - GetAllSchemaKnownTypes() const -{ - Handle(TColStd_HSequenceOfAsciiString) aSeqOfType = new TColStd_HSequenceOfAsciiString; - const TColStd_SequenceOfAsciiString& alocalTypeList = SchemaKnownTypes(); - - for (Standard_Integer k = 1; k <= alocalTypeList.Length(); k++) - aSeqOfType->Append(alocalTypeList.Value(k)); - - // get nested schemas - Handle(Storage_HArrayOfSchema) aNestedSchemas = NestedSchemas(); - if (!aNestedSchemas.IsNull()) - { - for (Standard_Integer i = aNestedSchemas->Lower(); i <= aNestedSchemas->Upper(); i++) - { - Handle(Storage_Schema) aSchema = aNestedSchemas->Value(i); - if (aSchema.IsNull()) - continue; - - Handle(TColStd_HSequenceOfAsciiString) typeList = aSchema->GetAllSchemaKnownTypes(); - for (Standard_Integer j = 1; j <= typeList->Length(); j++) - aSeqOfType->Append(typeList->Value(j)); - } - } - - return aSeqOfType; -} - -//======================================================================= -//function : HasUnknownType -//purpose : indicates whether the are types in the driver -// which are not known from the schema and for which -// no callbacks have been set. The unknown types can -// be read in . -//======================================================================= - -Standard_Boolean Storage_Schema::HasUnknownType - (Storage_BaseDriver& f, - TColStd_SequenceOfAsciiString& theUnknownTypes) const -{ - Standard_Boolean result = Standard_False; - Handle(TColStd_HSequenceOfAsciiString) typeList = GetAllSchemaKnownTypes(); - - Handle(Storage_TypeData) tData; - - tData = ReadTypeSection(f); - - result = (tData->ErrorStatus() != Storage_VSOk); - - if (!result) { - Standard_Integer i; - TColStd_MapOfAsciiString names; - - for (i = 1; i <= typeList->Length(); i++) { - names.Add(typeList->Value(i)); - } - - Handle(TColStd_HSequenceOfAsciiString) flist = tData->Types(); - - for (i = 1; i <= flist->Length(); i++) { - if (!names.Contains(flist->Value(i))) { - theUnknownTypes.Append(flist->Value(i)); - result = Standard_True; - } - } - } - - return result; -} - -//======================================================================= -//function : SetNestedSchemas -//purpose : -//======================================================================= - -void Storage_Schema::SetNestedSchemas - (const Handle(Storage_HArrayOfSchema)& theSchemas) -{ - myArrayOfSchema = theSchemas; -} - -//======================================================================= -//function : ClearNestedSchemas -//purpose : -//======================================================================= - -void Storage_Schema::ClearNestedSchemas() -{ - myArrayOfSchema.Nullify(); -} - -//======================================================================= -//function : NestedSchemas -//purpose : -//======================================================================= - -Handle(Storage_HArrayOfSchema) Storage_Schema::NestedSchemas() const -{ - return myArrayOfSchema; -} - //======================================================================= //function : AddReadUnknownTypeCallBack //purpose : add two functions to the callback list @@ -995,92 +622,6 @@ Handle(Storage_CallBack) Storage_Schema::DefaultCallBack() const return myDefaultCallBack; } -//======================================================================= -//function : ResolveUnknownType -//purpose : -//======================================================================= - -Handle(Storage_CallBack) Storage_Schema::ResolveUnknownType - (const TCollection_AsciiString& aTypeName, - const Handle(Standard_Persistent)& p, - const Storage_SolveMode aMode) const -{ - Handle(Storage_CallBack) theCallBack; - - if (!myArrayOfSchema.IsNull()) { - Standard_Integer i; - Standard_Boolean IsNotFound = Standard_True; - Standard_Boolean AlreadyMatched; - - for(i = myArrayOfSchema->Lower(); i <= myArrayOfSchema->Upper() && IsNotFound; i++) { - Handle(Storage_Schema) aSchema = myArrayOfSchema->Value(i); - - if (!aSchema.IsNull()) { - AlreadyMatched = aSchema->SetNested(); - if (!AlreadyMatched) { - if (aMode == Storage_WriteSolve || aMode == Storage_ReadSolve) { - theCallBack = aSchema->CallBackSelection(aTypeName); - } - else if (aMode == Storage_AddSolve) { - theCallBack = aSchema->AddTypeSelection(p); - } - aSchema->UnsetNested(); - IsNotFound = theCallBack.IsNull(); - } - } - } - } - - if (!myNestedState && theCallBack.IsNull()) { - if (myCallBack.IsBound(aTypeName)) { - theCallBack = myCallBack.Find(aTypeName)->CallBack(); - } - else if (myCallBackState == Standard_True) { - theCallBack = myDefaultCallBack; - } - else { - Clear(); - Standard_SStream aMsg; - - aMsg << "Unknown type " << aTypeName << " in schema "; - - if (!myName.IsEmpty()) { - aMsg << myName; - } - - Storage_StreamUnknownTypeError::Raise(aMsg); - } - } - - return theCallBack; -} - -//======================================================================= -//function : CallBackSelection -//purpose : -//======================================================================= - -Handle(Storage_CallBack) Storage_Schema::CallBackSelection - (const TCollection_AsciiString&) const -{ - Handle(Storage_CallBack) theCallBack; - - return theCallBack; -} - -//======================================================================= -//function : AddTypeSelection -//purpose : -//======================================================================= - -Handle(Storage_CallBack) Storage_Schema::AddTypeSelection - (const Handle(Standard_Persistent)&) const -{ - Handle(Storage_CallBack) theCallBack; - - return theCallBack; -} - //======================================================================= //function : BindType //purpose : @@ -1120,29 +661,6 @@ Handle(Storage_CallBack) Storage_Schema::TypeBinding return result; } -//======================================================================= -//function : ReadPersistentReference -//purpose : -//======================================================================= - -void Storage_Schema::ReadPersistentReference - (Handle(Standard_Persistent)& sp, - Storage_BaseDriver& f) -{ - Standard_Integer ref; - - f.GetReference(ref); - - if (ref != 0) { - Handle(Storage_InternalData) iData = Storage_Schema::ICurrentData()->InternalData(); - - sp = iData->myReadArray->Value(ref); - } - else { - sp.Nullify(); - } -} - //======================================================================= //function : AddPersistent //purpose : @@ -1208,126 +726,6 @@ void Storage_Schema::Clear() const Storage_Schema::ICurrentData().Nullify(); } -//======================================================================= -//function : IReadHeaderSection -//purpose : -//======================================================================= - -Standard_Boolean Storage_Schema::IReadHeaderSection - (Storage_BaseDriver& f, - const Handle(Storage_HeaderData)& iData) const -{ - Standard_Boolean result = Standard_False; - Storage_Error errorCode; - TCollection_AsciiString uinfo,mStorageVersion,mDate,mSchemaName,mSchemaVersion,mApplicationVersion; - TCollection_ExtendedString mApplicationName,mDataType; - TColStd_SequenceOfAsciiString mUserInfo; - TColStd_SequenceOfExtendedString mComment; - Standard_Integer mNBObj; - - errorCode = f.BeginReadInfoSection(); - - if (errorCode == Storage_VSOk) { - { - try { - OCC_CATCH_SIGNALS - f.ReadInfo(mNBObj, - mStorageVersion, - mDate, - mSchemaName, - mSchemaVersion, - mApplicationName, - mApplicationVersion, - mDataType, - mUserInfo); - } - catch(Storage_StreamTypeMismatchError) { - iData->SetErrorStatus(Storage_VSTypeMismatch); - iData->SetErrorStatusExtension("ReadInfo"); - return Standard_False; - } - catch(Storage_StreamExtCharParityError) { - iData->SetErrorStatus(Storage_VSExtCharParityError); - iData->SetErrorStatusExtension("ReadInfo"); - return Standard_False; - } - } - - - errorCode = f.EndReadInfoSection(); - - iData->SetErrorStatus(errorCode); - - result = (errorCode == Storage_VSOk); - - if (result) { - Standard_Integer i; - - iData->SetNumberOfObjects(mNBObj); - iData->SetStorageVersion(mStorageVersion); - iData->SetCreationDate(mDate); - iData->SetSchemaName(mSchemaName); - iData->SetSchemaVersion(mSchemaVersion); - iData->SetApplicationName(mApplicationName); - iData->SetApplicationVersion(mApplicationVersion); - iData->SetDataType(mDataType); - - for (i = 1; i <= mUserInfo.Length(); i++) { - iData->AddToUserInfo(mUserInfo.Value(i)); - } - - errorCode = f.BeginReadCommentSection(); - - if (errorCode == Storage_VSOk) { - { - { - try { - OCC_CATCH_SIGNALS - f.ReadComment(mComment); - } - catch(Storage_StreamTypeMismatchError) { - iData->SetErrorStatus(Storage_VSTypeMismatch); - iData->SetErrorStatusExtension("ReadComment"); - return Standard_False; - } - catch(Storage_StreamExtCharParityError) { - iData->SetErrorStatus(Storage_VSExtCharParityError); - iData->SetErrorStatusExtension("ReadComment"); - return Standard_False; - } - } - } - - errorCode = f.EndReadCommentSection(); - iData->SetErrorStatus(errorCode); - iData->SetErrorStatusExtension("EndReadCommentSection"); - result = (errorCode == Storage_VSOk); - - if (result) { - for (i = 1; i <= mComment.Length(); i++) { - iData->AddToComments(mComment.Value(i)); - } - } - } - else { - result = Standard_False; - iData->SetErrorStatus(errorCode); - iData->SetErrorStatusExtension("BeginReadCommentSection"); - } - } - else { - iData->SetErrorStatusExtension("EndReadInfoSection"); - } - } - else { - iData->SetErrorStatus(errorCode); - iData->SetErrorStatusExtension("BeginReadInfoSection"); - } - - return result; -} - - #ifdef DATATYPE_MIGRATION //======================================================================= // environment variable CSF_MIGRATION_TYPES should define full path of a file @@ -1392,124 +790,6 @@ Standard_Boolean Storage_Schema::CheckTypeMigration( } #endif -//======================================================================= -//function : IReadTypeSection -//purpose : -//======================================================================= - -Standard_Boolean Storage_Schema::IReadTypeSection - (Storage_BaseDriver& f, - const Handle(Storage_TypeData)& tData) const -{ -static Standard_Boolean result; - TCollection_AsciiString typeName; - Standard_Integer typeNum; - - Storage_Error errorCode; - Standard_Integer len,i; - - result = Standard_False; - errorCode = f.BeginReadTypeSection(); - - if (errorCode == Storage_VSOk) { - try { - OCC_CATCH_SIGNALS - len = f.TypeSectionSize(); - - for (i = 1; i <= len; i++) { - f.ReadTypeInformations(typeNum,typeName); -#ifdef DATATYPE_MIGRATION - TCollection_AsciiString newName; - if(CheckTypeMigration(typeName, newName)) { -#ifdef OCCT_DEBUG - cout << "CheckTypeMigration:OldType = " <SetErrorStatus(errorCode); - if (!result) tData->SetErrorStatusExtension("EndReadTypeSection"); - } - } - else { - tData->SetErrorStatus(errorCode); - tData->SetErrorStatusExtension("BeginReadTypeSection"); - } - - return result; -} - -//======================================================================= -//function : IReadRootSection -//purpose : -//======================================================================= - -Standard_Boolean Storage_Schema::IReadRootSection - (Storage_BaseDriver& f, - const Handle(Storage_RootData)& rData) const -{ -static Standard_Boolean result; - Standard_Integer len,i,ref; - Storage_Error errorCode; - Handle(Standard_Persistent) p; - Handle(Storage_Root) aRoot; - - result = Standard_False; - errorCode = f.BeginReadRootSection(); - - if (errorCode == Storage_VSOk) { - TCollection_AsciiString rootName,typeName; - - try { - OCC_CATCH_SIGNALS - len = f.RootSectionSize(); - - for (i = 1; i <= len; i++) { - f.ReadRoot(rootName,ref,typeName); - aRoot = new Storage_Root(rootName,p); - aRoot->SetReference(ref); - aRoot->SetType(typeName); - rData->AddRoot(aRoot); - } - result = Standard_True; - } - catch(Storage_StreamTypeMismatchError) { - result = Standard_False; - rData->SetErrorStatus(Storage_VSTypeMismatch); - rData->SetErrorStatusExtension("ReadRoot"); - } - - if (result) { - errorCode = f.EndReadRootSection(); - result = (errorCode == Storage_VSOk); - - rData->SetErrorStatus(errorCode); - if (!result) rData->SetErrorStatusExtension("EndReadRootSection"); - } - } - else { - rData->SetErrorStatus(errorCode); - rData->SetErrorStatusExtension("BeginReadRootSection"); - } - - return result; -} - //======================================================================= //function : ISetCurrentData //purpose : @@ -1562,41 +842,3 @@ TCollection_AsciiString Storage_Schema::ICreationDate() TCollection_AsciiString t(nowstr); return t; } - -//======================================================================= -//function : SetNested -//purpose : -//======================================================================= - -Standard_Boolean Storage_Schema::SetNested() -{ - Standard_Boolean result = myNestedState; - - myNestedState = Standard_True; - - return result; -} - -//======================================================================= -//function : IsNested -//purpose : -//======================================================================= - -Standard_Boolean Storage_Schema::IsNested() const -{ - return myNestedState; -} - -//======================================================================= -//function : UnsetNested -//purpose : -//======================================================================= - -Standard_Boolean Storage_Schema::UnsetNested() -{ - Standard_Boolean result = myNestedState; - - myNestedState = Standard_False; - - return result; -} diff --git a/src/Storage/Storage_Schema.hxx b/src/Storage/Storage_Schema.hxx index 9b9b3c400a..d867427ffa 100644 --- a/src/Storage/Storage_Schema.hxx +++ b/src/Storage/Storage_Schema.hxx @@ -107,50 +107,6 @@ public: //! to be stored together. Standard_EXPORT void Write (Storage_BaseDriver& s, const Handle(Storage_Data)& aData) const; - //! Returns the data read from the container defined - //! by the driver s. The retrieval operation is - //! performed according to the data schema with - //! which this algorithm is working. - //! These data are aggregated in a Storage_Data - //! object which may be browsed in order to extract - //! the root objects from the container. - Standard_EXPORT Handle(Storage_Data) Read (Storage_BaseDriver& s) const; - - //! read the header part of the stream - //! Arguments: - //! s: driver to read - Standard_EXPORT Handle(Storage_HeaderData) ReadHeaderSection (Storage_BaseDriver& s) const; - - //! fill the TypeData with the names of the type used - //! in a stream - //! Arguments: - //! s: driver to read - Standard_EXPORT Handle(Storage_TypeData) ReadTypeSection (Storage_BaseDriver& s) const; - - //! read root part of the file - //! Arguments: - //! s: driver to read - Standard_EXPORT Handle(Storage_RootData) ReadRootSection (Storage_BaseDriver& s) const; - - //! returns the known types of a schema - Standard_EXPORT virtual const TColStd_SequenceOfAsciiString& SchemaKnownTypes() const; - - //! indicates whether the are types in the driver - //! which are not known from the schema and for which - //! no callbacks have been set. The unknown types can - //! be read in . - Standard_EXPORT Standard_Boolean HasUnknownType (Storage_BaseDriver& aDriver, TColStd_SequenceOfAsciiString& theUnknownTypes) const; - - //! returns the all known types of a schema and their - //! nested schemes. - Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) GetAllSchemaKnownTypes() const; - - Standard_EXPORT void SetNestedSchemas (const Handle(Storage_HArrayOfSchema)& theSchemas); - - Standard_EXPORT void ClearNestedSchemas(); - - Standard_EXPORT Handle(Storage_HArrayOfSchema) NestedSchemas() const; - //! return a current date string Standard_EXPORT static TCollection_AsciiString ICreationDate(); @@ -204,18 +160,10 @@ public: //! UseDefaultCallBack() is set. Standard_EXPORT Handle(Storage_CallBack) DefaultCallBack() const; - Standard_EXPORT virtual Handle(Storage_CallBack) CallBackSelection (const TCollection_AsciiString& tName) const; - - Standard_EXPORT virtual Handle(Storage_CallBack) AddTypeSelection (const Handle(Standard_Persistent)& sp) const; - void WritePersistentObjectHeader (const Handle(Standard_Persistent)& sp, Storage_BaseDriver& s); - void ReadPersistentObjectHeader (Storage_BaseDriver& s); - void WritePersistentReference (const Handle(Standard_Persistent)& sp, Storage_BaseDriver& s); - Standard_EXPORT void ReadPersistentReference (Handle(Standard_Persistent)& sp, Storage_BaseDriver& s); - Standard_EXPORT Standard_Boolean AddPersistent (const Handle(Standard_Persistent)& sp, const Standard_CString tName) const; Standard_EXPORT Standard_Boolean PersistentToAdd (const Handle(Standard_Persistent)& sp) const; @@ -226,11 +174,6 @@ public: DEFINE_STANDARD_RTTIEXT(Storage_Schema,MMgt_TShared) protected: - - - Standard_EXPORT Standard_Boolean IsNested() const; - - Standard_EXPORT Handle(Storage_CallBack) ResolveUnknownType (const TCollection_AsciiString& aTypeName, const Handle(Standard_Persistent)& aPers, const Storage_SolveMode aMode) const; Standard_Boolean HasTypeBinding (const TCollection_AsciiString& aTypeName) const; @@ -242,19 +185,8 @@ protected: private: - - Standard_EXPORT Standard_Boolean SetNested(); - - Standard_EXPORT Standard_Boolean UnsetNested(); - Standard_EXPORT void Clear() const; - Standard_EXPORT Standard_Boolean IReadHeaderSection (Storage_BaseDriver& s, const Handle(Storage_HeaderData)& iData) const; - - Standard_EXPORT Standard_Boolean IReadTypeSection (Storage_BaseDriver& s, const Handle(Storage_TypeData)& tData) const; - - Standard_EXPORT Standard_Boolean IReadRootSection (Storage_BaseDriver& s, const Handle(Storage_RootData)& rData) const; - Standard_EXPORT static void ISetCurrentData (const Handle(Storage_Data)& dData); Standard_EXPORT static Handle(Storage_Data)& ICurrentData(); @@ -264,10 +196,6 @@ private: Handle(Storage_CallBack) myDefaultCallBack; TCollection_AsciiString myName; TCollection_AsciiString myVersion; - Handle(Storage_HArrayOfSchema) myArrayOfSchema; - Standard_Boolean myNestedState; - - }; diff --git a/src/Storage/Storage_Schema.lxx b/src/Storage/Storage_Schema.lxx index 84e25a55f4..a8ee2dac8f 100644 --- a/src/Storage/Storage_Schema.lxx +++ b/src/Storage/Storage_Schema.lxx @@ -22,13 +22,6 @@ inline void Storage_Schema::WritePersistentObjectHeader(const Handle(Standard_Pe f.WritePersistentObjectHeader(sp->_refnum,sp->_typenum); } -inline void Storage_Schema::ReadPersistentObjectHeader(Storage_BaseDriver& f) -{ - Standard_Integer i,j; - - f.ReadPersistentObjectHeader(i,j); -} - inline Standard_Boolean Storage_Schema::HasTypeBinding(const TCollection_AsciiString& aTypeName) const { return Storage_Schema::ICurrentData()->InternalData()->myTypeBinding.IsBound(aTypeName); diff --git a/src/Storage/Storage_TypeData.cxx b/src/Storage/Storage_TypeData.cxx index 4922f41419..8a6e8e10ce 100644 --- a/src/Storage/Storage_TypeData.cxx +++ b/src/Storage/Storage_TypeData.cxx @@ -13,10 +13,11 @@ // commercial license or contractual agreement. +#include #include -#include -#include #include +#include +#include #include IMPLEMENT_STANDARD_RTTIEXT(Storage_TypeData,MMgt_TShared) @@ -25,6 +26,56 @@ Storage_TypeData::Storage_TypeData() : myErrorStatus(Storage_VSOk) { } +Standard_Boolean Storage_TypeData::Read (Storage_BaseDriver& theDriver) +{ + // Check driver open mode + if (theDriver.OpenMode() != Storage_VSRead + && theDriver.OpenMode() != Storage_VSReadWrite) + { + myErrorStatus = Storage_VSModeError; + myErrorStatusExt = "OpenMode"; + return Standard_False; + } + + // Read type section + myErrorStatus = theDriver.BeginReadTypeSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "BeginReadTypeSection"; + return Standard_False; + } + + Standard_Integer aTypeNum; + TCollection_AsciiString aTypeName; + + Standard_Integer len = theDriver.TypeSectionSize(); + for (Standard_Integer i = 1; i <= len; i++) + { + try + { + OCC_CATCH_SIGNALS + theDriver.ReadTypeInformations (aTypeNum, aTypeName); + } + catch (Storage_StreamTypeMismatchError) + { + myErrorStatus = Storage_VSTypeMismatch; + myErrorStatusExt = "ReadTypeInformations"; + return Standard_False; + } + + myPt.Add (aTypeName, aTypeNum); + } + + myErrorStatus = theDriver.EndReadTypeSection(); + if (myErrorStatus != Storage_VSOk) + { + myErrorStatusExt = "EndReadTypeSection"; + return Standard_False; + } + + return Standard_True; +} + Standard_Integer Storage_TypeData::NumberOfTypes() const { return myPt.Extent(); diff --git a/src/Storage/Storage_TypeData.hxx b/src/Storage/Storage_TypeData.hxx index 0726e2d213..b2feca1a8d 100644 --- a/src/Storage/Storage_TypeData.hxx +++ b/src/Storage/Storage_TypeData.hxx @@ -29,6 +29,7 @@ #include class Standard_NoSuchObject; class Storage_Schema; +class Storage_BaseDriver; class TCollection_AsciiString; @@ -43,8 +44,19 @@ public: Standard_EXPORT Storage_TypeData(); + + Standard_EXPORT Standard_Boolean Read (Storage_BaseDriver& theDriver); Standard_EXPORT Standard_Integer NumberOfTypes() const; + + //! add a type to the list + Standard_EXPORT void AddType (const TCollection_AsciiString& aName, const Standard_Integer aTypeNum); + + //! returns the name of the type with number + Standard_EXPORT TCollection_AsciiString Type (const Standard_Integer aTypeNum) const; + + //! returns the name of the type with number + Standard_EXPORT Standard_Integer Type (const TCollection_AsciiString& aTypeName) const; Standard_EXPORT Standard_Boolean IsType (const TCollection_AsciiString& aName) const; @@ -58,15 +70,6 @@ public: Standard_EXPORT void Clear(); - //! add a type to the list - Standard_EXPORT void AddType (const TCollection_AsciiString& aName, const Standard_Integer aTypeNum); - - //! returns the name of the type with number - Standard_EXPORT TCollection_AsciiString Type (const Standard_Integer aTypeNum) const; - - //! returns the name of the type with number - Standard_EXPORT Standard_Integer Type (const TCollection_AsciiString& aTypeName) const; - friend class Storage_Schema; diff --git a/src/TKShape/CMakeLists.txt b/src/TKShape/CMakeLists.txt new file mode 100644 index 0000000000..51ec161be1 --- /dev/null +++ b/src/TKShape/CMakeLists.txt @@ -0,0 +1,3 @@ +project(TKShape) + +OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKShape/EXTERNLIB b/src/TKShape/EXTERNLIB new file mode 100644 index 0000000000..6d653e133d --- /dev/null +++ b/src/TKShape/EXTERNLIB @@ -0,0 +1,4 @@ +TKernel +TKG2d +TKMath +TKCDF diff --git a/src/TKShape/FILES b/src/TKShape/FILES new file mode 100644 index 0000000000..c999897bf1 --- /dev/null +++ b/src/TKShape/FILES @@ -0,0 +1,2 @@ +PACKAGES +EXTERNLIB diff --git a/src/TKShape/PACKAGES b/src/TKShape/PACKAGES new file mode 100644 index 0000000000..78502df69d --- /dev/null +++ b/src/TKShape/PACKAGES @@ -0,0 +1 @@ +ShapePersistent diff --git a/src/TKStd/CMakeLists.txt b/src/TKStd/CMakeLists.txt new file mode 100644 index 0000000000..c4621eab98 --- /dev/null +++ b/src/TKStd/CMakeLists.txt @@ -0,0 +1,3 @@ +project(TKStd) + +OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKStd/EXTERNLIB b/src/TKStd/EXTERNLIB new file mode 100644 index 0000000000..4ff518ab88 --- /dev/null +++ b/src/TKStd/EXTERNLIB @@ -0,0 +1,9 @@ +TKCDF +TKernel +TKCAF +TKShape +TKLCAF +TKStdL +TKG3d +TKMath +TKG2d diff --git a/src/TKStd/FILES b/src/TKStd/FILES new file mode 100644 index 0000000000..c999897bf1 --- /dev/null +++ b/src/TKStd/FILES @@ -0,0 +1,2 @@ +PACKAGES +EXTERNLIB diff --git a/src/TKStd/PACKAGES b/src/TKStd/PACKAGES new file mode 100644 index 0000000000..c6bcead911 --- /dev/null +++ b/src/TKStd/PACKAGES @@ -0,0 +1,2 @@ +StdDrivers +StdPersistent diff --git a/src/TKStdL/CMakeLists.txt b/src/TKStdL/CMakeLists.txt new file mode 100644 index 0000000000..a855644935 --- /dev/null +++ b/src/TKStdL/CMakeLists.txt @@ -0,0 +1,3 @@ +project(TKStdL) + +OCCT_INCLUDE_CMAKE_FILE (adm/cmake/occt_toolkit) diff --git a/src/TKStdL/EXTERNLIB b/src/TKStdL/EXTERNLIB new file mode 100644 index 0000000000..fad76526d3 --- /dev/null +++ b/src/TKStdL/EXTERNLIB @@ -0,0 +1,4 @@ +TKCDF +TKernel +TKShape +TKLCAF diff --git a/src/TKStdL/FILES b/src/TKStdL/FILES new file mode 100644 index 0000000000..c999897bf1 --- /dev/null +++ b/src/TKStdL/FILES @@ -0,0 +1,2 @@ +PACKAGES +EXTERNLIB diff --git a/src/TKStdL/PACKAGES b/src/TKStdL/PACKAGES new file mode 100644 index 0000000000..893f13689c --- /dev/null +++ b/src/TKStdL/PACKAGES @@ -0,0 +1,3 @@ +StdLDrivers +StdLPersistent +StdObjMgt diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx index b60f794f6c..b08d16d4a2 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.cxx @@ -170,25 +170,6 @@ Handle(CDM_Document) XmlLDrivers_DocumentRetrievalDriver::CreateDocument() return new TDocStd_Document(PCDM_RetrievalDriver::GetFormat()); } -//======================================================================= -//function : SchemaName -//purpose : pure virtual method definition -//======================================================================= -TCollection_ExtendedString XmlLDrivers_DocumentRetrievalDriver::SchemaName() const -{ - TCollection_ExtendedString schemaname; - return schemaname; -} - -//======================================================================= -//function : Make -//purpose : pure virtual method definition -//======================================================================= -void XmlLDrivers_DocumentRetrievalDriver::Make (const Handle(PCDM_Document)&, - const Handle(CDM_Document)&) -{ -} - //======================================================================= //function : Read //purpose : diff --git a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx index 5bfcbb1b19..db895dcda5 100644 --- a/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx +++ b/src/XmlLDrivers/XmlLDrivers_DocumentRetrievalDriver.hxx @@ -47,10 +47,6 @@ public: Standard_EXPORT XmlLDrivers_DocumentRetrievalDriver(); - Standard_EXPORT virtual TCollection_ExtendedString SchemaName() const Standard_OVERRIDE; - - Standard_EXPORT virtual void Make (const Handle(PCDM_Document)& PD, const Handle(CDM_Document)& TD) Standard_OVERRIDE; - Standard_EXPORT virtual Handle(CDM_Document) CreateDocument() Standard_OVERRIDE; Standard_EXPORT virtual void Read (const TCollection_ExtendedString& theFileName, const Handle(CDM_Document)& theNewDocument, const Handle(CDM_Application)& theApplication) Standard_OVERRIDE;