From: akl <akl@opencascade.com>
Date: Wed, 24 Apr 2013 13:54:21 +0000 (+0000)
Subject: Correction of dumped string to initialize of NoteBook by a new instance of the study.
X-Git-Tag: V7_2_0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4d9b8d713f6b7d4788df5c2ee0b5f4b9f3b2d20c;p=modules%2Fkernel.git

Correction of dumped string to initialize of NoteBook by a new instance of the study.
---

diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
index d5a380a9f..56cde9e3c 100644
--- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
+++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.cxx
@@ -945,7 +945,7 @@ std::string SALOMEDSImpl_Study::_GetNoteBookAccess()
 {
   std::string accessor = _GetNoteBookAccessor();
   std::string notebook = "import salome_notebook\n";
-  notebook += accessor+" = salome_notebook."+accessor + "\n";
+  notebook += accessor+" = salome_notebook.NoteBook(";
   return notebook;
 }
 
@@ -1271,13 +1271,15 @@ bool SALOMEDSImpl_Study::DumpStudy(const std::string& thePath,
   sfp << "import sys" << std::endl;
   sfp << "import " << aBatchModeScript << std::endl << std::endl;
 
+  std::string aStudyVar = "salome.myStudy";
   // initialization function
   sfp << aBatchModeScript << ".salome_init()" << std::endl;
-  if ( !isMultiFile )
-    sfp << "theStudy = salome.myStudy" <<std::endl << std::endl;
-
+  if ( !isMultiFile ) {
+    sfp << "theStudy = " << aStudyVar <<std::endl << std::endl;
+    aStudyVar = "theStudy";
+  }
   // notebook initialization
-  sfp << _GetNoteBookAccess();
+  sfp << _GetNoteBookAccess() << aStudyVar << ")" <<std::endl;
 
   // extend sys.path with the directory where the script is being dumped to
   sfp << "sys.path.insert( 0, r\'" << thePath << "\')" << std::endl << std::endl;