-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: Model_Application.cxx
-// Created: Fri Sep 2 2011
-// Author: Mikhail PONIKAROV
+// 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>
+//
#include <Model_Application.h>
#include <Model_Document.h>
#include <ModelAPI_Events.h>
-#ifdef OCAFBROWSER
-#include <DFBrowserAPI_PluginMgr.h>
-#include <DFBrowserAPI_Communicator.h>
-
-static bool FirstCall = true;
-#endif
-
-IMPLEMENT_STANDARD_HANDLE(Model_Application, TDocStd_Application)
IMPLEMENT_STANDARD_RTTIEXT(Model_Application, TDocStd_Application)
static Handle_Model_Application TheApplication = new Model_Application;
//=======================================================================
Handle(Model_Application) Model_Application::getApplication()
{
-#ifdef OCAFBROWSER
- if (FirstCall) {
- DFBrowserAPI_PluginMgr::activateBrowser("OCAFBrowser.dll", TheApplication);
- FirstCall = false;
- }
-#endif
return TheApplication;
}
}
//=======================================================================
-void Model_Application::setLoadByDemand(std::string theID)
+void Model_Application::setLoadByDemand(std::string theID, const int theDocID)
{
- myLoadedByDemand.insert(theID);
+ myLoadedByDemand[theID] = theDocID;
}
//=======================================================================
-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;
}
//=======================================================================
int Model_Application::generateDocumentId()
{
- int aResult = int(myDocs.size());
- for(; myDocs.find(aResult) != myDocs.end(); aResult++) {} // count until the result id is unique
+ 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::string, int>::iterator aLBDIter = myLoadedByDemand.begin();
+ for(; aLBDIter != myLoadedByDemand.end(); aLBDIter++) {
+ if (aLBDIter->second == aResult) {
+ aFound = true;
+ break;
+ }
+ }
+ if (!aFound) break;
+ }
+ }
return aResult;
}