-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <Model_Application.h>
}
//=======================================================================
-bool Model_Application::isLoadByDemand(std::string theID)
+bool Model_Application::isLoadByDemand(std::string 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)
-{
- 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 Model_Application::generateDocumentId()
{
int aResult;