From 2613378e60ff5e517b2bf73699184d0c6f636bb8 Mon Sep 17 00:00:00 2001 From: skv Date: Fri, 29 Jul 2016 11:57:56 +0300 Subject: [PATCH] 0027726: List of formats supported by TDocStd_Application Minor corrections and implementation of ABV remark --- src/CDF/CDF_Application.cxx | 16 +++++------ src/CDF/CDF_Application.hxx | 6 ++--- src/TDocStd/TDocStd_Application.cxx | 42 +++++++++++++++++++++++++++-- src/TDocStd/TDocStd_Application.hxx | 14 ++++++++-- 4 files changed, 63 insertions(+), 15 deletions(-) diff --git a/src/CDF/CDF_Application.cxx b/src/CDF/CDF_Application.cxx index 3f61b100be..31ad3665b5 100644 --- a/src/CDF/CDF_Application.cxx +++ b/src/CDF/CDF_Application.cxx @@ -418,7 +418,7 @@ Handle(PCDM_Reader) CDF_Application::ReaderFromFormat(const TCollection_Extended { // check map of readers Handle(PCDM_RetrievalDriver) aReader; - if (myReaders.Find (theFormat, aReader)) + if (myReaders.FindFromKey (theFormat, aReader)) return aReader; // support of legacy method of loading reader as plugin @@ -426,7 +426,7 @@ Handle(PCDM_Reader) CDF_Application::ReaderFromFormat(const TCollection_Extended aResourceName += ".RetrievalPlugin"; if (!UTL::Find(Resources(), aResourceName)) { - myReaders.Bind(theFormat, aReader); + myReaders.Add(theFormat, aReader); Standard_SStream aMsg; aMsg << "Could not found the item:" << aResourceName <<(char)0; myRetrievableStatus = PCDM_RS_WrongResource; @@ -449,7 +449,7 @@ Handle(PCDM_Reader) CDF_Application::ReaderFromFormat(const TCollection_Extended } catch (Standard_Failure) { - myReaders.Bind(theFormat, aReader); + myReaders.Add(theFormat, aReader); myRetrievableStatus = PCDM_RS_WrongResource; Standard_Failure::Caught()->Reraise(); } @@ -462,7 +462,7 @@ Handle(PCDM_Reader) CDF_Application::ReaderFromFormat(const TCollection_Extended } // record in map - myReaders.Bind (theFormat, aReader); + myReaders.Add(theFormat, aReader); return aReader; } @@ -474,7 +474,7 @@ Handle(PCDM_StorageDriver) CDF_Application::WriterFromFormat(const TCollection_E { // check map of writers Handle(PCDM_StorageDriver) aDriver; - if (myWriters.Find (theFormat, aDriver)) + if (myWriters.FindFromKey(theFormat, aDriver)) return aDriver; // support of legacy method of loading reader as plugin @@ -482,7 +482,7 @@ Handle(PCDM_StorageDriver) CDF_Application::WriterFromFormat(const TCollection_E aResourceName += ".StoragePlugin"; if(!UTL::Find(Resources(), aResourceName)) { - myWriters.Bind (theFormat, aDriver); + myWriters.Add(theFormat, aDriver); Standard_SStream aMsg; aMsg << "Could not found the resource definition:" << aResourceName <<(char)0; Standard_NoSuchObject::Raise(aMsg); @@ -504,7 +504,7 @@ Handle(PCDM_StorageDriver) CDF_Application::WriterFromFormat(const TCollection_E } catch (Standard_Failure) { - myWriters.Bind (theFormat, aDriver); + myWriters.Add(theFormat, aDriver); myRetrievableStatus = PCDM_RS_WrongResource; Standard_Failure::Caught()->Reraise(); } @@ -518,7 +518,7 @@ Handle(PCDM_StorageDriver) CDF_Application::WriterFromFormat(const TCollection_E } // record in map - myWriters.Bind(theFormat, aDriver); + myWriters.Add(theFormat, aDriver); return aDriver; } diff --git a/src/CDF/CDF_Application.hxx b/src/CDF/CDF_Application.hxx index 926f47e7e6..60ed7e7c2c 100644 --- a/src/CDF/CDF_Application.hxx +++ b/src/CDF/CDF_Application.hxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include class Standard_NoSuchObject; class CDF_Session; @@ -164,8 +164,8 @@ protected: Standard_EXPORT CDF_Application(); PCDM_ReaderStatus myRetrievableStatus; - NCollection_DataMap myReaders; - NCollection_DataMap myWriters; + NCollection_IndexedDataMap myReaders; + NCollection_IndexedDataMap myWriters; private: diff --git a/src/TDocStd/TDocStd_Application.cxx b/src/TDocStd/TDocStd_Application.cxx index 6dc0854185..681abe21a9 100644 --- a/src/TDocStd/TDocStd_Application.cxx +++ b/src/TDocStd/TDocStd_Application.cxx @@ -129,8 +129,46 @@ void TDocStd_Application::DefineFormat (const TCollection_AsciiString& theFormat theWriter->SetFormat(theFormat); // register drivers - myReaders.Bind (theFormat, theReader); - myWriters.Bind (theFormat, theWriter); + myReaders.Add(theFormat, theReader); + myWriters.Add(theFormat, theWriter); +} + +//======================================================================= +//function : ReadingFormats +//purpose : +//======================================================================= + +void TDocStd_Application::ReadingFormats(TColStd_SequenceOfAsciiString &theFormats) +{ + theFormats.Clear(); + + NCollection_IndexedDataMap::Iterator + anIter(myReaders); + for (; anIter.More(); anIter.Next()) { + Handle(PCDM_RetrievalDriver) aDriver = anIter.Value(); + if (aDriver.IsNull() == Standard_False) { + theFormats.Append(anIter.Key()); + } + } +} + +//======================================================================= +//function : WritingFormats +//purpose : +//======================================================================= + +void TDocStd_Application::WritingFormats(TColStd_SequenceOfAsciiString &theFormats) +{ + theFormats.Clear(); + + NCollection_IndexedDataMap::Iterator + anIter(myWriters); + for (; anIter.More(); anIter.Next()) { + Handle(PCDM_StorageDriver) aDriver = anIter.Value(); + if (aDriver.IsNull() == Standard_False) { + theFormats.Append(anIter.Key()); + } + } } //======================================================================= diff --git a/src/TDocStd/TDocStd_Application.hxx b/src/TDocStd/TDocStd_Application.hxx index 6cdb9db10c..eae5f954d2 100644 --- a/src/TDocStd/TDocStd_Application.hxx +++ b/src/TDocStd/TDocStd_Application.hxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include @@ -149,7 +149,17 @@ public: const TCollection_AsciiString& theExtension, const Handle(PCDM_RetrievalDriver)& theReader, const Handle(PCDM_StorageDriver)& theWriter); - + + //! Returns the sequence of reading formats supported by the application. + //! + //! @param theFormats - sequence of reading formats. Output parameter. + Standard_EXPORT void ReadingFormats(TColStd_SequenceOfAsciiString &theFormats); + + //! Returns the sequence of writing formats supported by the application. + //! + //! @param theFormats - sequence of writing formats. Output parameter. + Standard_EXPORT void WritingFormats(TColStd_SequenceOfAsciiString &theFormats); + //! returns the number of documents handled by the current applicative session. Standard_EXPORT Standard_Integer NbDocuments() const;