X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FYamsPlug%2FmonViewText.py;h=426467ef4351d3380656ef528ee70de52fc34016;hp=7b518b574eb005380da43b7721f1d18fd62cf804;hb=0f0bf7c72871fc015ec1637067cd1d58e61395b9;hpb=7a65c9fad427b1ccba6b9ccae612296e5092a324

diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py
index 7b518b574..426467ef4 100644
--- a/src/Tools/YamsPlug/monViewText.py
+++ b/src/Tools/YamsPlug/monViewText.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2015  EDF R&D
+# Copyright (C) 2007-2016  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
@@ -18,18 +18,26 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-# Modules Python
-import string,types,os
+import os
+import sys
+import string
+import types
+import tempfile
 import traceback
+import pprint as PP #pretty print
 
-from PyQt4 import *
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+from qtsalome import *
 
 # Import des panels
-
 from ViewText_ui import Ui_ViewExe
 
+verbose = True
+
+force = os.getenv("FORCE_DISTENE_LICENSE_FILE")
+if force != None:
+  os.environ["DISTENE_LICENSE_FILE"] = force
+  os.environ["DLIM8VAR"] = "NOTHING"
+
 class MonViewText(Ui_ViewExe, QDialog):
     """
     Classe permettant la visualisation de texte
@@ -38,36 +46,52 @@ class MonViewText(Ui_ViewExe, QDialog):
         QDialog.__init__(self,parent)
         self.setupUi(self)
         self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) )
-        #self.connect( self.PB_Ok,SIGNAL("clicked()"), self, SLOT("close()") )
-        self.connect( self.PB_Ok,SIGNAL("clicked()"), self.theClose )
-        self.connect( self.PB_Save,SIGNAL("clicked()"), self.saveFile )
+        # self.PB_Ok.clicked.connect(self.close)
+        self.PB_Ok.clicked.connect( self.theClose )
+        self.PB_Save.clicked.connect( self.saveFile )
         self.monExe=QProcess(self)
 
-        self.connect(self.monExe, SIGNAL("readyReadStandardOutput()"), self.readFromStdOut )
-        self.connect(self.monExe, SIGNAL("readyReadStandardError()"), self.readFromStdErr )
+        self.monExe.readyReadStandardOutput.connect( self.readFromStdOut )
+        self.monExe.readyReadStandardError.connect( self.readFromStdErr )
       
-        # Je n arrive pas a utiliser le setEnvironment du QProcess
-        # fonctionne hors Salome mais pas dans Salome ???
-        cmds=''
-        cmds+='rm -f '+self.parent().fichierOut+'\n'
-        cmds+=txt+'\n'
-        cmds+='echo END_OF_Yams\n'
-        pid=self.monExe.pid()
-        nomFichier='/tmp/Yams_'+str(pid)+'.sh'
-        f=open(nomFichier,'w')
-        f.write(cmds)
-        f.close()
+        cmds = ''
+        ext = ''
+        if sys.platform == "win32":
+            cmds += 'delete %s\n' % self.parent().fichierOut
+        else:
+            cmds += '#!/bin/bash\n'
+            cmds += 'pwd\n'
+            #cmds += 'which mg-surfopt.exe\n'
+            cmds += 'echo "DISTENE_LICENSE_FILE="$DISTENE_LICENSE_FILE\n'
+            cmds += 'echo "DLIM8VAR="$DLIM8VAR\n'
+            cmds += 'rm -f %s\n' % self.parent().fichierOut
+            ext = '.bash'
 
-        maBidouille='sh  ' + nomFichier
-        self.monExe.start(maBidouille)
+        cmds += 'echo %s\n' % txt #to see what is compute command
+        cmds += txt+'\n'
+        cmds += 'echo "END_OF_MGSurfOpt"\n'
+        
+        nomFichier = os.path.splitext(self.parent().fichierOut)[0] + ext
+        with open(nomFichier, 'w') as f:
+          f.write(cmds)
+        self.make_executable(nomFichier)
+        
+        if verbose: print("INFO: MGSurfOpt launch script file: %s" % nomFichier)
+        
+        self.monExe.start(nomFichier)
         self.monExe.closeWriteChannel()
         self.enregistreResultatsDone=False
         self.show()
 
+    def make_executable(self, path):
+        mode = os.stat(path).st_mode
+        mode |= (mode & 0o444) >> 2    # copy R bits to X
+        os.chmod(path, mode)
+
     def saveFile(self):
         #recuperation du nom du fichier
         savedir=os.environ['HOME']
-        fn = QFileDialog.getSaveFileName(None, self.trUtf8("Save File"),savedir)
+        fn = QFileDialog.getSaveFileName(None,"Save File",savedir)
         if fn.isNull() : return
         ulfile = os.path.abspath(unicode(fn))
         try:
@@ -75,19 +99,18 @@ class MonViewText(Ui_ViewExe, QDialog):
            f.write(str(self.TB_Exe.toPlainText()))
            f.close()
         except IOError, why:
-           QMessageBox.critical(self, self.trUtf8('Save File'),
-                self.trUtf8('The file <b>%1</b> could not be saved.<br>Reason: %2')
-                    .arg(unicode(fn)).arg(str(why)))
+           QMessageBox.critical(self, 'Save File',
+        	'The file <b>%1</b> could not be saved.<br>Reason: %2'%(unicode(fn), str(why)))
 
     def readFromStdErr(self):
         a=self.monExe.readAllStandardError()
-        self.TB_Exe.append(QString.fromUtf8(a.data(),len(a)))
+        self.TB_Exe.append(unicode(a.data().encode()))
 
     def readFromStdOut(self) :
         a=self.monExe.readAllStandardOutput()
-        aa=QString.fromUtf8(a.data(),len(a))
+        aa=unicode(a.data(),len(a))
         self.TB_Exe.append(aa)
-        if "END_OF_Yams" in aa:
+        if "END_OF_MGSurfOpt" in aa:
           self.parent().enregistreResultat()
           self.enregistreResultatsDone=True
           #self.theClose()