From: mpv <mikhail.ponikarov@opencascade.com>
Date: Tue, 14 May 2019 08:42:34 +0000 (+0300)
Subject: Fix for the tuleap issue #16931: Windows version: Dump Python: new blank line between... 
X-Git-Tag: VEDF2019Lot4~101^2~75
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4a66ee35ad980e8cc68ea3a51e29a33affec294f;p=modules%2Fshaper.git

Fix for the tuleap issue #16931: Windows version: Dump Python: new blank line between each line
---

diff --git a/src/SHAPERGUI/SHAPERGUI_DataModel.cpp b/src/SHAPERGUI/SHAPERGUI_DataModel.cpp
index b08f83b80..efb30f936 100644
--- a/src/SHAPERGUI/SHAPERGUI_DataModel.cpp
+++ b/src/SHAPERGUI/SHAPERGUI_DataModel.cpp
@@ -197,32 +197,34 @@ bool SHAPERGUI_DataModel::dumpPython(const QString& thePath, CAM_Study* theStudy
     ModelAPI_Session::get()->finishOperation();
 
     if (QFile::exists(aFileName.c_str())) {
-      if (isMultiFile) {
         QFile aInFile(aFileName.c_str());
-        if (!aInFile.open(QIODevice::ReadOnly | QIODevice::Text))
-          return false;
-        QTextStream aText(&aInFile);
-        QString aTrace(aText.readAll());
-        aInFile.close();
+      if (!aInFile.open(QIODevice::ReadOnly | QIODevice::Text))
+        return false;
+      QTextStream aText(&aInFile);
+      QString aTrace(aText.readAll());
+      aInFile.close();
 
+      if (isMultiFile) {
         QStringList aBuffer;
-        aBuffer.push_back(QString("def RebuildData( theStudy ):"));
+        aBuffer.push_back(QString("def RebuildData():"));
         QStringList aList(aTrace.split("\n"));
         foreach(QString aStr, aList) {
           QString s = "  " + aStr;
           aBuffer.push_back(s);
         }
         aTrace = aBuffer.join("\n");
+      }
 
-        QFile aOutFile(aFileName.c_str());
-        if (!aOutFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
-          return false;
+      QFile aOutFile(aFileName.c_str());
+      // binary for SALOME, issue 16931
+      if (!aOutFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+        return false;
+
+      QTextStream aOut(&aOutFile);
+      aOut << aTrace.toStdString().c_str() << "\n";
+      aOut.flush();
+      aOutFile.close();
 
-        QTextStream aOut(&aOutFile);
-        aOut << aTrace.toStdString().c_str() << "\n";
-        aOut.flush();
-        aOutFile.close();
-      }
       theListOfFiles.append(aTmpDir.c_str());
       theListOfFiles.append(DUMP_NAME);
       return true;