Fix for generated names wrong index. Map now properly cleared.

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

diff --git a/src/Model/Model_Application.h b/src/Model/Model_Application.h
index 3593decbadfb2bd9826181201c7902b18fc9d908..b91f69a81f98d1c2ed73dcfab282c502c9bd207f 100644 (file)
--- a/src/Model/Model_Application.h
+++ b/src/Model/Model_Application.h
@@ -1,9 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_Application.hxx
-// Created:     28 Dec 2011
-// Author:      Mikhail PONIKAROV
-// Copyright:   CEA 2011
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef Model_Application_H_
 #define Model_Application_H_
@@ -30,10 +43,10 @@ public:
   // CASCADE RTTI
   /// Definition of "Handles" usage
   /// \param Model_Application is the class name that is covered by the OCCT Handle
-  DEFINE_STANDARD_RTTI(Model_Application);
+  DEFINE_STANDARD_RTTIEXT(Model_Application, TDocStd_Application)
 
   //! Retuns the application: one per process
-  MODEL_EXPORT static Handle_Model_Application getApplication();
+  MODEL_EXPORT static Handle(Model_Application) getApplication();
   //! Returns the document by the identifier
   //! \returns false of document is not yet created/not loaded
   MODEL_EXPORT std::shared_ptr<Model_Document> document(const int theDocID);
@@ -61,9 +74,9 @@ public:
   //! Returns the path for the loaded by demand documents
   const std::string& loadPath() const;
   //! Defines that specified document must be loaded by demand
-  void setLoadByDemand(std::string theID);
+  void setLoadByDemand(std::string theID, const int theDocID);
   //! Returns true if specified document must be loaded by demand
-  bool isLoadByDemand(std::string theID);
+  bool isLoadByDemand(std::string theID, const int theDocIndex);
   //! Closes and removes the documents that are not loaded by demand and
   //! not in the given list
   void removeUselessDocuments(std::list<std::shared_ptr<ModelAPI_Document> > theUsedDocs);
@@ -88,8 +101,8 @@ public:
   std::map<int, std::shared_ptr<Model_Document> > myDocs;
   /// Path for the loaded by demand documents
   std::string myPath;
-  /// Path for the loaded by demand documents
-  std::set<std::string> myLoadedByDemand;
+  /// Path for the loaded by demand documents (and the persistent ID as the value)
+  std::map<std::string, int> myLoadedByDemand;
 };
 
 #endif