From f10e318a662216eceb59760b72335133f2638182 Mon Sep 17 00:00:00 2001
From: ouv <ouv@opencascade.com>
Date: Tue, 29 Mar 2011 07:37:14 +0000
Subject: [PATCH] Issue 0013373: EDF PAL 273 : Option Single/Multi file dump

---
 src/ENGINE/VISU_Engine_i.cc   |  3 ++-
 src/ENGINE/VISU_Engine_i.hh   |  1 +
 src/VISU_I/VISU_DumpPython.cc | 13 ++++++++++---
 src/VISU_I/VISU_Gen_i.hh      |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index 37ee82ea..c0ccce70 100644
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -488,9 +488,10 @@ namespace VISU{
   }
   Engines::TMPFile* VISU_Gen_i::DumpPython(CORBA::Object_ptr theStudy,
                                            CORBA::Boolean theIsPublished,
+                                           CORBA::Boolean theIsMultiFile,
                                            CORBA::Boolean& theIsValidScript)
   {
-    return myVisuGen->DumpPython(theStudy, theIsPublished, theIsValidScript);
+    return myVisuGen->DumpPython(theStudy, theIsPublished, theIsMultiFile, theIsValidScript);
   }
 
   VISU::ColoredPrs3dCache_ptr
diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index 70deb929..dbb80c5e 100644
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -243,6 +243,7 @@ namespace VISU
     // inherited methods from Engines::Component
     virtual Engines::TMPFile* DumpPython(CORBA::Object_ptr theStudy,
 		                         CORBA::Boolean theIsPublished,
+			                 CORBA::Boolean theIsMultiFile,
 			                 CORBA::Boolean& theIsValidScript);   
 
     virtual
diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index 04b04ed9..38b1318d 100644
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -2297,6 +2297,7 @@ namespace VISU
   VISU_Gen_i::
   DumpPython(CORBA::Object_ptr theStudy,
 	     CORBA::Boolean theIsPublished,
+	     CORBA::Boolean theIsMultiFile,
 	     CORBA::Boolean& theIsValidScript)
   {
     theIsValidScript = false;
@@ -2314,14 +2315,17 @@ namespace VISU
 #define aStr cout
 #endif
 
-    std::string aPrefix(PREFIX);
-    aStr<<"def RebuildData(theStudy):"<<endl;
+    std::string aPrefix = theIsMultiFile ? PREFIX : "";
+    if( theIsMultiFile )
+      aStr<<"def RebuildData(theStudy):"<<endl;
     aStr<<aPrefix<<"from batchmode_salome import orb, naming_service, lcc, myStudyManager"<<endl;
     aStr<<aPrefix<<"import SALOME_MED"<<endl;
     aStr<<aPrefix<<"import SALOMEDS"<<endl;
     aStr<<aPrefix<<"import VISU"<<endl;
     aStr<<aPrefix<<"import visu"<<endl;
     aStr<<endl;
+    if( !theIsMultiFile )
+      aStr<<"theStudy = salome.myStudy"<<endl;
     aStr<<aPrefix<<"aVisu = visu.Initialize(orb,naming_service,lcc,myStudyManager,theStudy,0)"<<endl;
     aStr<<aPrefix<<"aSComponent = visu.PublishComponent(theStudy)"<<endl;
     aStr<<aPrefix<<"aMed = lcc.FindOrLoadComponent('FactoryServer','MED')"<<endl;
@@ -2403,10 +2407,13 @@ namespace VISU
       }
     }
 
-    aStr<<aPrefix<<"pass"<<endl;
+    if( theIsMultiFile )
+      aStr<<aPrefix<<"pass"<<endl;
 
     if(theIsPublished) { //SRN: define function for Animation
 
+      aPrefix = PREFIX;
+
       //Define a function that find a SObject by its father's path and its name
       aStr<<endl;
       aStr<<endl;
diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index 70e3833f..a3ae8fa2 100644
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -315,6 +315,7 @@ namespace VISU
     Engines::TMPFile*
     DumpPython(CORBA::Object_ptr theStudy,
 	       CORBA::Boolean theIsPublished,
+	       CORBA::Boolean theIsMultiFile,
 	       CORBA::Boolean& theIsValidScript);
 
     // inherited methods from SALOMEDS::Driver
-- 
2.30.2