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

0029220: Application Framework - replace CDM_MessageDriver interface by Message_Messenger.

Browse Source
This commit is contained in:
szy
2017-12-13 15:27:50 +03:00
committed by bugmaster
parent 31e026ba63
commit 83ae35919c
398 changed files with 1452 additions and 1824 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BinLDrivers/BinLDrivers.cxx
View File

@@ -22,7 +22,7 @@
#include <BinMDF_ADriverTable.hxx>
#include <BinMDocStd.hxx>
#include <BinMFunction.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <Plugin_Macro.hxx>
#include <Standard_Failure.hxx>
#include <Standard_GUID.hxx>
@@ -81,7 +81,7 @@ void BinLDrivers::DefineFormat (const Handle(TDocStd_Application)& theApp)
//=======================================================================
Handle(BinMDF_ADriverTable) BinLDrivers::AttributeDrivers
(const Handle(CDM_MessageDriver)& aMsgDrv)
(const Handle(Message_Messenger)& aMsgDrv)
{
Handle(BinMDF_ADriverTable) aTable = new BinMDF_ADriverTable;

4
src/BinLDrivers/BinLDrivers.hxx
View File

@@ -21,7 +21,7 @@
class Standard_Transient;
class Standard_GUID;
class BinMDF_ADriverTable;
class CDM_MessageDriver;
class Message_Messenger;
class TCollection_AsciiString;
class BinLDrivers_DocumentStorageDriver;
class BinLDrivers_DocumentRetrievalDriver;
@@ -39,7 +39,7 @@ public:
Standard_EXPORT static void DefineFormat (const Handle(TDocStd_Application)& theApp);
//! Creates a table of the supported drivers' types
Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& MsgDrv);
Standard_EXPORT static Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& MsgDrv);
//! returns last storage version
Standard_EXPORT static TCollection_AsciiString StorageVersion();

100
src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.cxx
View File

@@ -24,7 +24,7 @@
#include <BinObjMgt_Persistent.hxx>
#include <CDM_Application.hxx>
#include <CDM_Document.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <FSD_BinaryFile.hxx>
#include <FSD_FileHeader.hxx>
#include <OSD_OpenFile.hxx>
@@ -120,7 +120,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
Handle(TDocStd_Document)::DownCast(theDoc);
if (aDoc.IsNull()) {
#ifdef OCCT_DEBUG
WriteMessage (aMethStr + "error: null document");
myMsgDriver->Send (aMethStr + "error: null document", Message_Fail);
#endif
myReaderStatus = PCDM_RS_NoDocument;
return;
@@ -154,7 +154,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
// 1.a Version of writer
if (!aHeaderData->StorageVersion().IsIntegerValue()) {
// file has no format version
WriteMessage (aMethStr + "error: file has no format version");
myMsgDriver->Send (aMethStr + "error: file has no format version", Message_Fail);
myReaderStatus = PCDM_RS_FormatFailure;
return;
}
@@ -164,9 +164,9 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
if (!CheckDocumentVersion(aFileVer, aCurrVer)) {
myReaderStatus = PCDM_RS_NoVersion;
// file was written with another version
WriteMessage (aMethStr + "error: wrong file version: " +
aHeaderData->StorageVersion() + " while current is " +
BinLDrivers::StorageVersion());
myMsgDriver->Send (aMethStr + "error: wrong file version: " +
aHeaderData->StorageVersion() + " while current is " +
BinLDrivers::StorageVersion(), Message_Fail);
return;
}
@@ -185,14 +185,14 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
else if (begin) {
if ( aFileVer < 8 ) {
#ifdef DATATYPE_MIGRATION
TCollection_AsciiString newName;
if(Storage_Schema::CheckTypeMigration(aStr, newName)) {
TCollection_AsciiString newName;
if(Storage_Schema::CheckTypeMigration(aStr, newName)) {
#ifdef OCCT_DEBUG
cout << "CheckTypeMigration:OldType = " <<aStr << " Len = "<<aStr.Length()<<endl;
cout << "CheckTypeMigration:NewType = " <<newName << " Len = "<< newName.Length()<<endl;
cout << "CheckTypeMigration:OldType = " <<aStr << " Len = "<<aStr.Length()<<endl;
cout << "CheckTypeMigration:NewType = " <<newName << " Len = "<< newName.Length()<<endl;
#endif
aStr = newName;
}
aStr = newName;
}
#endif
}
aTypeNames.Append (aStr);
@@ -208,11 +208,11 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
if (myDrivers->GetDriver(i).IsNull())
myMapUnsupported.Add(i);
if (!myMapUnsupported.IsEmpty()) {
WriteMessage (aMethStr + "warning: "
"the following attributes have no driver:");
myMsgDriver->Send (aMethStr + "warning: "
"the following attributes have no driver:", Message_Warning);
for (i=1; i <= aTypeNames.Length(); i++)
if (myMapUnsupported.Contains(i))
WriteMessage (aTypeNames(i));
myMsgDriver->Send (aTypeNames(i), Message_Warning);
}
// propagate the opened document version to data drivers
@@ -238,7 +238,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
if (theIStream.eof()) {
// There is no shape section in the file.
WriteMessage (aMethStr + "error: shape section is not found");
myMsgDriver->Send (aMethStr + "error: shape section is not found", Message_Fail);
myReaderStatus = PCDM_RS_ReaderException;
return;
}
@@ -249,7 +249,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
for (; anIterS.More(); anIterS.Next()) {
BinLDrivers_DocumentSection& aCurSection = anIterS.ChangeValue();
if (aCurSection.IsPostRead() == Standard_False) {
theIStream.seekg ((std::streamsize)aCurSection.Offset());
theIStream.seekg ((streampos) aCurSection.Offset());
if (aCurSection.Name().IsEqual ((Standard_CString)SHAPESECTION_POS))
ReadShapeSection (aCurSection, theIStream);
else
@@ -269,7 +269,7 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
if (aShapeLabel.Length() > 0) {
// version 2+(with shapes) and higher goes here
if(aShapeLabel.Length() <= 0 || aShapeLabel != SHAPESECTION_POS) {
WriteMessage (aMethStr + "error: Format failure");
myMsgDriver->Send (aMethStr + "error: Format failure", Message_Fail);
myReaderStatus = PCDM_RS_FormatFailure;
return;
}
@@ -285,13 +285,13 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
cout <<"aShapeSectionPos = " <<aShapeSectionPos <<endl;
#endif
if(aShapeSectionPos) {
aDocumentPos = theIStream.tellg();
theIStream.seekg((streampos) aShapeSectionPos);
aDocumentPos = theIStream.tellg();
theIStream.seekg((streampos) aShapeSectionPos);
CheckShapeSection(aShapeSectionPos, theIStream);
// Read Shapes
BinLDrivers_DocumentSection aCurSection;
ReadShapeSection (aCurSection, theIStream, Standard_False);
CheckShapeSection(aShapeSectionPos, theIStream);
// Read Shapes
BinLDrivers_DocumentSection aCurSection;
ReadShapeSection (aCurSection, theIStream, Standard_False);
}
}
} // end of reading Sections or shape section
@@ -321,8 +321,8 @@ void BinLDrivers_DocumentRetrievalDriver::Read (Standard_IStream&
for (; aSectIter.More(); aSectIter.Next()) {
BinLDrivers_DocumentSection& aCurSection = aSectIter.ChangeValue();
if (aCurSection.IsPostRead()) {
theIStream.seekg ((std::streamsize)aCurSection.Offset());
ReadSection (aCurSection, theDoc, theIStream);
theIStream.seekg ((streampos) aCurSection.Offset());
ReadSection (aCurSection, theDoc, theIStream);
}
}
}
@@ -359,31 +359,31 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
else
tAtt = aDriver->NewEmpty();
if (tAtt->Label().IsNull())
theLabel.AddAttribute (tAtt);
theLabel.AddAttribute (tAtt);
else
WriteMessage (aMethStr +
"warning: attempt to attach attribute " +
aDriver->TypeName() + " to a second label");
myMsgDriver->Send (aMethStr +
"warning: attempt to attach attribute " +
aDriver->TypeName() + " to a second label", Message_Warning);
Standard_Boolean ok = aDriver->Paste (myPAtt, tAtt, myRelocTable);
if (!ok) {
// error converting persistent to transient
WriteMessage (aMethStr + "warning: failure reading attribute " +
aDriver->TypeName());
myMsgDriver->Send (aMethStr + "warning: failure reading attribute " +
aDriver->TypeName(), Message_Warning);
}
else if (!isBound)
myRelocTable.Bind (anID, tAtt);
}
else if (!myMapUnsupported.Contains(myPAtt.TypeId()))
WriteMessage (aMethStr + "warning: type ID not registered in header: "
+ myPAtt.TypeId());
myMsgDriver->Send (aMethStr + "warning: type ID not registered in header: "
+ myPAtt.TypeId(), Message_Warning);
// read next attribute
theIS >> myPAtt;
}
if (!theIS || myPAtt.TypeId() != BinLDrivers_ENDATTRLIST) {
// unexpected EOF or garbage data
WriteMessage (aMethStr + "error: unexpected EOF or garbage data");
myMsgDriver->Send (aMethStr + "error: unexpected EOF or garbage data", Message_Fail);
myReaderStatus = PCDM_RS_UnrecognizedFileFormat;
return -1;
}
@@ -414,7 +414,7 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
}
if (aTag != BinLDrivers_ENDLABEL) {
// invalid end label marker
WriteMessage (aMethStr + "error: invalid end label marker");
myMsgDriver->Send (aMethStr + "error: invalid end label marker", Message_Fail);
myReaderStatus = PCDM_RS_UnrecognizedFileFormat;
return -1;
}
@@ -428,25 +428,11 @@ Standard_Integer BinLDrivers_DocumentRetrievalDriver::ReadSubTree
//=======================================================================
Handle(BinMDF_ADriverTable) BinLDrivers_DocumentRetrievalDriver::AttributeDrivers
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
{
return BinLDrivers::AttributeDrivers (theMessageDriver);
}
//=======================================================================
//function : WriteMessage
//purpose : write theMessage to the MessageDriver of
// theApplication
//=======================================================================
void BinLDrivers_DocumentRetrievalDriver::WriteMessage
(const TCollection_ExtendedString& theMsg)
{
if (!myMsgDriver.IsNull())
myMsgDriver->Write (theMsg.ToExtString());
}
//=======================================================================
//function : ReadSection
//purpose :
@@ -467,13 +453,13 @@ void BinLDrivers_DocumentRetrievalDriver::ReadSection
void BinLDrivers_DocumentRetrievalDriver::ReadShapeSection
(BinLDrivers_DocumentSection& theSection,
Standard_IStream& /*theIS*/,
const Standard_Boolean isMess)
Standard_IStream& /*theIS*/,
const Standard_Boolean isMess)
{
if(isMess && theSection.Length()) {
const TCollection_ExtendedString aMethStr ("BinLDrivers_DocumentRetrievalDriver: ");
WriteMessage (aMethStr + "warning: Geometry is not supported by Lite schema. ");
myMsgDriver->Send (aMethStr + "warning: Geometry is not supported by Lite schema. ", Message_Warning);
}
}
@@ -482,8 +468,8 @@ void BinLDrivers_DocumentRetrievalDriver::ReadShapeSection
//purpose :
//=======================================================================
void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
const Storage_Position& ShapeSectionPos,
Standard_IStream& IS)
const Storage_Position& ShapeSectionPos,
Standard_IStream& IS)
{
if (!IS.eof())
{
@@ -493,7 +479,7 @@ void BinLDrivers_DocumentRetrievalDriver::CheckShapeSection(
#endif
if(ShapeSectionPos != endPos) {
const TCollection_ExtendedString aMethStr ("BinLDrivers_DocumentRetrievalDriver: ");
WriteMessage (aMethStr + "warning: Geometry is not supported by Lite schema. ");
myMsgDriver->Send (aMethStr + "warning: Geometry is not supported by Lite schema. ", Message_Warning);
}
}
}

11
src/BinLDrivers/BinLDrivers_DocumentRetrievalDriver.hxx
View File

@@ -31,7 +31,7 @@
#include <Storage_Data.hxx>
class BinMDF_ADriverTable;
class CDM_MessageDriver;
class Message_Messenger;
class TCollection_ExtendedString;
class PCDM_Document;
class CDM_Document;
@@ -66,7 +66,7 @@ public:
const Handle(CDM_Document)& theDoc,
const Handle(CDM_Application)& theApplication) Standard_OVERRIDE;
Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver);
Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& theMsgDriver);
@@ -101,20 +101,15 @@ protected:
//! The default implementation: if the version of the file is greater than the
//! current or lesser than 2, then return false, else true
Standard_EXPORT virtual Standard_Boolean CheckDocumentVersion (const Standard_Integer theFileVersion, const Standard_Integer theCurVersion);
//! write theMessage to the MessageDriver of the
//! Application
Standard_EXPORT void WriteMessage (const TCollection_ExtendedString& theMessage);
Handle(BinMDF_ADriverTable) myDrivers;
BinObjMgt_RRelocationTable myRelocTable;
Handle(Message_Messenger) myMsgDriver;
private:
BinObjMgt_Persistent myPAtt;
Handle(CDM_MessageDriver) myMsgDriver;
TColStd_MapOfInteger myMapUnsupported;
BinLDrivers_VectorOfDocumentSection mySections;

26
src/BinLDrivers/BinLDrivers_DocumentStorageDriver.cxx
View File

@@ -23,7 +23,7 @@
#include <BinObjMgt_Persistent.hxx>
#include <CDM_Application.hxx>
#include <CDM_Document.hxx>
#include <CDM_MessageDriver.hxx>
#include <Message_Messenger.hxx>
#include <FSD_BinaryFile.hxx>
#include <FSD_FileHeader.hxx>
#include <OSD_OpenFile.hxx>
@@ -158,7 +158,7 @@ void BinLDrivers_DocumentStorageDriver::Write (const Handle(CDM_Document)& theDo
if (!myRelocTable.Extent()) {
// No objects written
#ifdef OCCT_DEBUG
WriteMessage ("BinLDrivers_DocumentStorageDriver, no objects written");
myMsgDriver->Send ("BinLDrivers_DocumentStorageDriver, no objects written", Message_Info);
#endif
SetIsError(Standard_True);
SetStoreStatus(PCDM_SS_No_Obj);
@@ -168,9 +168,8 @@ void BinLDrivers_DocumentStorageDriver::Write (const Handle(CDM_Document)& theDo
if (!theOStream) {
// A problem with the stream
#ifdef OCCT_DEBUG
TCollection_ExtendedString anErrorStr ("Error: ");
WriteMessage (anErrorStr + "BinLDrivers_DocumentStorageDriver, Problem with the file stream, rdstate="
+ (Standard_Integer )theOStream.rdstate());
TCollection_ExtendedString anErrorStr ("BinLDrivers_DocumentStorageDriver, Problem with the file stream, rdstate = ");
myMsgDriver->Send (anErrorStr + (Standard_Integer )theOStream.rdstate(), Message_Info);
#endif
SetIsError(Standard_True);
SetStoreStatus(PCDM_SS_WriteFailure);
@@ -194,7 +193,7 @@ void BinLDrivers_DocumentStorageDriver::UnsupportedAttrMsg
if (!myMapUnsupported.Contains(theType)) {
myMapUnsupported.Add(theType);
#ifdef OCCT_DEBUG
WriteMessage (aMsg + theType->Name() + " not found");
myMsgDriver->Send (aMsg + theType->Name() + " not found", Message_Info);
#endif
}
}
@@ -281,7 +280,7 @@ void BinLDrivers_DocumentStorageDriver::WriteSubTree
//=======================================================================
Handle(BinMDF_ADriverTable) BinLDrivers_DocumentStorageDriver::AttributeDrivers
(const Handle(CDM_MessageDriver)& theMessageDriver)
(const Handle(Message_Messenger)& theMessageDriver)
{
return BinLDrivers::AttributeDrivers (theMessageDriver);
}
@@ -479,19 +478,6 @@ void BinLDrivers_DocumentStorageDriver::WriteInfoSection
}
//=======================================================================
//function : WriteMessage
//purpose : write theMessage to the MessageDriver of the
// Application
//=======================================================================
void BinLDrivers_DocumentStorageDriver::WriteMessage
(const TCollection_ExtendedString& theMsg)
{
if (!myMsgDriver.IsNull())
myMsgDriver->Write (theMsg.ToExtString());
}
//=======================================================================
//function : AddSection
//purpose :

11
src/BinLDrivers/BinLDrivers_DocumentStorageDriver.hxx
View File

@@ -30,7 +30,7 @@
#include <Standard_Boolean.hxx>
#include <Standard_Type.hxx>
class BinMDF_ADriverTable;
class CDM_MessageDriver;
class Message_Messenger;
class TCollection_ExtendedString;
class CDM_Document;
class TDF_Label;
@@ -57,7 +57,7 @@ public:
//! Write <theDocument> to theOStream
Standard_EXPORT virtual void Write (const Handle(CDM_Document)& theDocument, Standard_OStream& theOStream) Standard_OVERRIDE;
Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(CDM_MessageDriver)& theMsgDriver);
Standard_EXPORT virtual Handle(BinMDF_ADriverTable) AttributeDrivers (const Handle(Message_Messenger)& theMsgDriver);
//! Create a section that should be written after the OCAF data
Standard_EXPORT void AddSection (const TCollection_AsciiString& theName, const Standard_Boolean isPostRead = Standard_True);
@@ -78,14 +78,10 @@ protected:
//! defines the procedure of writing a shape section to file
Standard_EXPORT virtual void WriteShapeSection (BinLDrivers_DocumentSection& theDocSection, Standard_OStream& theOS);
//! write theMessage to the MessageDriver of the
//! Application
Standard_EXPORT void WriteMessage (const TCollection_ExtendedString& theMessage);
Handle(BinMDF_ADriverTable) myDrivers;
BinObjMgt_SRelocationTable myRelocTable;
Handle(Message_Messenger) myMsgDriver;
private:
@@ -102,7 +98,6 @@ private:
Standard_EXPORT void UnsupportedAttrMsg (const Handle(Standard_Type)& theType);
BinObjMgt_Persistent myPAtt;
Handle(CDM_MessageDriver) myMsgDriver;
TDF_LabelList myEmptyLabels;
TColStd_MapOfTransient myMapUnsupported;
TColStd_IndexedMapOfTransient myTypesMap;