Copyright update 2022

[modules/shaper.git] / src / Model / Model_Application.cpp

diff --git a/src/Model/Model_Application.cpp b/src/Model/Model_Application.cpp
index 0d5e6eeb0c3bda1424481d14a9ae0bab13836bae..a7d5e0c7ba72a937e3e021b1586cc9c5c22113a8 100644 (file)
--- a/src/Model/Model_Application.cpp
+++ b/src/Model/Model_Application.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -21,8 +21,12 @@
 #include <Model_Document.h>
 
 #include <ModelAPI_Events.h>
+#include <ModelAPI_Tools.h>
 
-#include <PCDM_RetrievalDriver.hxx>
+#include <Locale_Convert.h>
+
+#include <BinDrivers_DocumentRetrievalDriver.hxx>
+#include <BinDrivers_DocumentStorageDriver.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Model_Application, TDocStd_Application)
 
@@ -60,7 +64,7 @@ void Model_Application::createDocument(const int theDocID)
 }
 
 //=======================================================================
-bool Model_Application::loadDocument(const std::string theDocName, const int theDocID)
+bool Model_Application::loadDocument(const std::wstring theDocName, const int theDocID)
 {
   static const std::string thePartKind("Part"); // root document is never loaded here
   std::shared_ptr<Model_Document> aNew(new Model_Document(theDocID, thePartKind));
@@ -69,7 +73,7 @@ bool Model_Application::loadDocument(const std::string theDocName, const int the
   bool aRes = true;
   // load it if it must be loaded by demand
   if (myLoadedByDemand.find(theDocName) != myLoadedByDemand.end() && !myPath.empty()) {
-    aRes = aNew->load(myPath.c_str(), theDocName.c_str(), aNew);
+    aRes = aNew->load(myPath.c_str(), Locale::Convert::toString(theDocName).c_str(), aNew);
     myLoadedByDemand.erase(theDocName);  // done, don't do it anymore
   } else { // error
     aRes = false;
@@ -131,13 +135,13 @@ const std::string& Model_Application::loadPath() const
 }
 
 //=======================================================================
-void Model_Application::setLoadByDemand(std::string theID, const int theDocID)
+void Model_Application::setLoadByDemand(std::wstring theID, const int theDocID)
 {
   myLoadedByDemand[theID] = theDocID;
 }
 
 //=======================================================================
-bool Model_Application::isLoadByDemand(std::string theID, const int theDocIndex)
+bool Model_Application::isLoadByDemand(std::wstring theID, const int theDocIndex)
 {
   return myLoadedByDemand.find(theID) != myLoadedByDemand.end() &&
     myLoadedByDemand[theID] == theDocIndex;
@@ -151,7 +155,7 @@ int Model_Application::generateDocumentId()
   for(aResult = int(myDocs.size()); true; aResult++) {
     if (myDocs.find(aResult) == myDocs.end()) {
       bool aFound = false;
-      std::map<std::string, int>::iterator aLBDIter = myLoadedByDemand.begin();
+      std::map<std::wstring, int>::iterator aLBDIter = myLoadedByDemand.begin();
       for(; aLBDIter != myLoadedByDemand.end(); aLBDIter++) {
         if (aLBDIter->second == aResult) {
           aFound = true;
@@ -171,11 +175,10 @@ Model_Application::Model_Application()
   static Handle(Model_Application) TheKeepHandle;
   TheKeepHandle = this;
   // additional file format supported
-  static TCollection_ExtendedString THE_DOC_FORMAT("BinOcaf"/*"BinShaperPart"*/);
+  static TCollection_ExtendedString THE_DOC_FORMAT("BinShaperPart");
   static TCollection_ExtendedString THE_FILE_EXT("shaperpart");
-  Handle(PCDM_RetrievalDriver) aReader =
-      Handle(PCDM_RetrievalDriver)::DownCast(TheKeepHandle->ReaderFromFormat("BinOcaf"));
-  Handle(PCDM_StorageDriver) aWriter = TheKeepHandle->WriterFromFormat("BinOcaf");
+  Handle(PCDM_RetrievalDriver) aReader = new BinDrivers_DocumentRetrievalDriver;
+  Handle(PCDM_StorageDriver) aWriter = new BinDrivers_DocumentStorageDriver;
   TheKeepHandle->DefineFormat(THE_DOC_FORMAT, "Shaper Part document", THE_FILE_EXT,
                               aReader, aWriter);
 }