mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
716cf4d96b
1. Unification of usage of a storage version of an OCAF document by XML and binary file formats.
2. A new format version enumeration in TDocStd package: TDocStd_FormatVersion.
3. Removal of unnecessary methods for storage version like XmlLDrivers::StorageVersion() and BinLDrivers::StorageVersion().
4. Support of old documents (storage version <= 9) in binary file format (came from ESA).
New files:
- TDocStd_FormatVersion.hxx: a new storage format version enumeration for an OCAF document.
Modified files:
- CDM_Document.hxx and cxx: removal of storage format version property (moved to TDocStd_Document).
- TDocStd_Document.hxx and cxx: a storage format version property (moved from CDM_Document).
- BinLDrivers_DocumentSection.hxx and cxx: support of old document storage version in binary file format.
- BinDrivers_DocumentStorageDriver.hxx and cxx,
- BinLDrivers_DocumentStorageDriver.hxx and cxx,
- BinLDrivers_DocumentRetrievalDriver.cxx,
- XmlLDrivers_DocumentRetrievalDriver.cxx,
- XmlLDrivers_DocumentStorageDriver.cxx: usage of document storage version from TDocStd_Document in storage and retrieval drivers.
- DDocStd_ApplicationCommands.cxx: draw-command name StorageVersion is replaced by StorageFormatVersion (to be the same everywhere). A corresponding script is corrected too.
New test:
- bugs caf bug29217: a test case for old document storage version in binary file format. It checks several attributes saved by the version TDocStd_FormatVersion_VERSION_7 (old) and the latest version.
Modified test:
- caf presentation M1: the test used a file in the current folder, not in {imagedir} like all other tests.
- bugs caf bug28691
Documentation:
- dox/upgrade/upgrade.md
// All remarks are fixed.
126 lines
4.7 KiB
C++
126 lines
4.7 KiB
C++
// Created on: 2002-10-29
|
|
// Created by: Michael SAZONOV
|
|
// Copyright (c) 2002-2014 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 <BinDrivers_DocumentStorageDriver.hxx>
|
|
|
|
#include <BinDrivers.hxx>
|
|
#include <BinLDrivers_DocumentSection.hxx>
|
|
#include <BinMDF_ADriver.hxx>
|
|
#include <BinMDF_ADriverTable.hxx>
|
|
#include <BinMNaming_NamedShapeDriver.hxx>
|
|
#include <Message_Messenger.hxx>
|
|
#include <Standard_ErrorHandler.hxx>
|
|
#include <Standard_NotImplemented.hxx>
|
|
#include <Standard_Type.hxx>
|
|
#include <TCollection_AsciiString.hxx>
|
|
#include <TNaming_NamedShape.hxx>
|
|
|
|
IMPLEMENT_STANDARD_RTTIEXT(BinDrivers_DocumentStorageDriver,BinLDrivers_DocumentStorageDriver)
|
|
|
|
//=======================================================================
|
|
//function : BinDrivers_DocumentStorageDriver
|
|
//purpose : Constructor
|
|
//=======================================================================
|
|
BinDrivers_DocumentStorageDriver::BinDrivers_DocumentStorageDriver ()
|
|
{
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : AttributeDrivers
|
|
//purpose :
|
|
//=======================================================================
|
|
|
|
Handle(BinMDF_ADriverTable) BinDrivers_DocumentStorageDriver::AttributeDrivers
|
|
(const Handle(Message_Messenger)& theMessageDriver)
|
|
{
|
|
return BinDrivers::AttributeDrivers (theMessageDriver);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : IsWithTriangles
|
|
//purpose :
|
|
//=======================================================================
|
|
Standard_Boolean BinDrivers_DocumentStorageDriver::IsWithTriangles() const
|
|
{
|
|
if (myDrivers.IsNull())
|
|
{
|
|
return Standard_False;
|
|
}
|
|
|
|
Handle(BinMDF_ADriver) aDriver;
|
|
myDrivers->GetDriver (STANDARD_TYPE(TNaming_NamedShape), aDriver);
|
|
Handle(BinMNaming_NamedShapeDriver) aShapesDriver = Handle(BinMNaming_NamedShapeDriver)::DownCast(aDriver);
|
|
return !aShapesDriver.IsNull()
|
|
&& aShapesDriver->IsWithTriangles();
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : SetWithTriangles
|
|
//purpose :
|
|
//=======================================================================
|
|
void BinDrivers_DocumentStorageDriver::SetWithTriangles (const Handle(Message_Messenger)& theMessageDriver,
|
|
const Standard_Boolean theWithTriangulation)
|
|
{
|
|
if (myDrivers.IsNull())
|
|
{
|
|
myDrivers = AttributeDrivers (theMessageDriver);
|
|
}
|
|
if (myDrivers.IsNull())
|
|
{
|
|
return;
|
|
}
|
|
|
|
Handle(BinMDF_ADriver) aDriver;
|
|
myDrivers->GetDriver (STANDARD_TYPE(TNaming_NamedShape), aDriver);
|
|
Handle(BinMNaming_NamedShapeDriver) aShapesDriver = Handle(BinMNaming_NamedShapeDriver)::DownCast(aDriver);
|
|
if (aShapesDriver.IsNull())
|
|
{
|
|
throw Standard_NotImplemented("Internal Error - TNaming_NamedShape is not found!");
|
|
}
|
|
|
|
aShapesDriver->SetWithTriangles (theWithTriangulation);
|
|
}
|
|
|
|
//=======================================================================
|
|
//function : WriteShapeSection
|
|
//purpose : Implements WriteShapeSection
|
|
//=======================================================================
|
|
void BinDrivers_DocumentStorageDriver::WriteShapeSection
|
|
(BinLDrivers_DocumentSection& theSection,
|
|
Standard_OStream& theOS,
|
|
const Standard_Integer theDocVer,
|
|
const Message_ProgressRange& theRange)
|
|
{
|
|
const Standard_Size aShapesSectionOffset = (Standard_Size) theOS.tellp();
|
|
|
|
Handle(BinMDF_ADriver) aDriver;
|
|
if (myDrivers->GetDriver(STANDARD_TYPE(TNaming_NamedShape), aDriver))
|
|
{
|
|
try {
|
|
OCC_CATCH_SIGNALS
|
|
Handle(BinMNaming_NamedShapeDriver) aNamedShapeDriver =
|
|
Handle(BinMNaming_NamedShapeDriver)::DownCast (aDriver);
|
|
aNamedShapeDriver->WriteShapeSection (theOS, theRange);
|
|
}
|
|
catch(Standard_Failure const& anException) {
|
|
TCollection_ExtendedString anErrorStr ("BinDrivers_DocumentStorageDriver, Shape Section :");
|
|
myMsgDriver->Send (anErrorStr + anException.GetMessageString(), Message_Fail);
|
|
}
|
|
}
|
|
|
|
// Write the section info in the TOC.
|
|
theSection.Write (theOS, aShapesSectionOffset, theDocVer);
|
|
}
|