X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Application.cpp;h=7ffbf61a5712f1ba4423ec53a578a9e04a834597;hb=81baa77e52cb1ade2bfbe5b21e893cc34b03c323;hp=50fa75c0478896d638676807d39ea928d8dad73b;hpb=5b6031b015602aa07f5a6fc668c13ac3faf7a8a9;p=modules%2Fshaper.git

diff --git a/src/Model/Model_Application.cpp b/src/Model/Model_Application.cpp
index 50fa75c04..7ffbf61a5 100644
--- a/src/Model/Model_Application.cpp
+++ b/src/Model/Model_Application.cpp
@@ -1,13 +1,32 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:	Model_Application.cxx
-// Created:	Fri Sep 2 2011
-// Author:	Mikhail PONIKAROV
+// Copyright (C) 2014-2020  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include <Model_Application.h>
 #include <Model_Document.h>
 
 #include <ModelAPI_Events.h>
+#include <ModelAPI_Tools.h>
+
+#include <Locale_Convert.h>
+
+#include <BinDrivers_DocumentRetrievalDriver.hxx>
+#include <BinDrivers_DocumentStorageDriver.hxx>
 
 IMPLEMENT_STANDARD_RTTIEXT(Model_Application, TDocStd_Application)
 
@@ -45,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));
@@ -54,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;
@@ -116,42 +135,36 @@ const std::string& Model_Application::loadPath() const
 }
 
 //=======================================================================
-void Model_Application::setLoadByDemand(std::string theID)
+void Model_Application::setLoadByDemand(std::wstring theID, const int theDocID)
 {
-  myLoadedByDemand.insert(theID);
+  myLoadedByDemand[theID] = theDocID;
 }
 
 //=======================================================================
-bool Model_Application::isLoadByDemand(std::string theID)
+bool Model_Application::isLoadByDemand(std::wstring theID, const int theDocIndex)
 {
-  return myLoadedByDemand.find(theID) != myLoadedByDemand.end();
+  return myLoadedByDemand.find(theID) != myLoadedByDemand.end() &&
+    myLoadedByDemand[theID] == theDocIndex;
 }
 
 //=======================================================================
-void Model_Application::removeUselessDocuments(
-  std::list<std::shared_ptr<ModelAPI_Document> > theUsedDocs)
+int Model_Application::generateDocumentId()
 {
-  std::map<int, std::shared_ptr<Model_Document> >::iterator aDoc = myDocs.begin();
-  while(aDoc != myDocs.end()) {
-    bool aFound = false;
-    std::list<std::shared_ptr<ModelAPI_Document> >::iterator aUsed = theUsedDocs.begin();
-    for(; !aFound && aUsed != theUsedDocs.end(); aUsed++) {
-      aFound = aDoc->second == *aUsed;
-    }
-    if (!aFound) { // remove the useless
-      aDoc->second->close();
-      myDocs.erase(aDoc);
-      aDoc = myDocs.begin();
-    } else {
-      aDoc++;
+  int aResult;
+  // count until the result id is unique
+  for(aResult = int(myDocs.size()); true; aResult++) {
+    if (myDocs.find(aResult) == myDocs.end()) {
+      bool aFound = false;
+      std::map<std::wstring, int>::iterator aLBDIter = myLoadedByDemand.begin();
+      for(; aLBDIter != myLoadedByDemand.end(); aLBDIter++) {
+        if (aLBDIter->second == aResult) {
+          aFound = true;
+          break;
+        }
+      }
+      if (!aFound) break;
     }
   }
-}
-
-int Model_Application::generateDocumentId()
-{
-  int aResult = int(myDocs.size());
-  for(; myDocs.find(aResult) != myDocs.end(); aResult++) {} // count until the result id is unique
   return aResult;
 }
 
@@ -161,6 +174,13 @@ Model_Application::Model_Application()
   // store handle to the application to avoid nullification
   static Handle(Model_Application) TheKeepHandle;
   TheKeepHandle = this;
+  // additional file format supported
+  static TCollection_ExtendedString THE_DOC_FORMAT("BinShaperPart");
+  static TCollection_ExtendedString THE_FILE_EXT("shaperpart");
+  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);
 }
 
 //=======================================================================