From: pascale.noyret <pascale.noyret@edf.fr>
Date: Fri, 7 Aug 2015 08:31:19 +0000 (+0200)
Subject: fix conflict
X-Git-Tag: PSEN_V1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=29f39e499ea2b072f0cf4c2039fa9ff3a5c16a30;p=tools%2Feficas.git

fix conflict
---

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 8f2b1f8a..42d0f49d 100755
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -36,8 +36,9 @@ from Editeur        import session
 from Editeur        import comploader
 from Editeur        import Objecttreeitem
 from desBaseWidget  import Ui_baseWidget
-from monViewTexte   import ViewText
-from monWidgetCreeParam import MonWidgetCreeParam
+from monViewTexte   import ViewText 
+from monViewTexte   import ViewText2
+from monWidgetCreeParam import MonWidgetCreeParam 
 import browser
 import readercata
 
@@ -194,9 +195,6 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
                 if (not self.jdc.isvalid()) and (not self.nouveau) and (self.appliEficas.ssIhm == False):
                     self.viewJdcRapport()
 
-       # if self.code=="TELEMAC" : print "kkkkkkkk"
-
-
         if jdc_item:
             self.tree = browser.JDCTree( jdc_item,  self )
         self.appliEficas.construitMenu()
@@ -208,19 +206,13 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
          QMessageBox.critical( self, tr( "Execution impossible "),tr("Sauvegarder SVP avant l'execution "))
          return
         
-      #lancement avec le .bat
-      textePython="PSEN_Path='EficasV2\PSEN_Eficas\PSEN\PSSEWrapper.py'\
-      \nimport subprocess\
-      \np=subprocess.Popen(['python',PSEN_Path])\
-      \n(out,err)=p.communicate()"
-      
- #lancement avec qteficas_psen.py      
-
-      #textePython='C:\Users\plscist\Desktop\Vico\sauveEficasPSEN~\EficasV1\PSEN_Eficas\PSEN\PSSEWrapper.py'
-      try :
-          self._viewTextExecute( textePython,"psen_run",".py")
-      except Exception, e:
-          print traceback.print_exc()
+      monPython="/home/A96028/salome75/prerequisites/install/Python-273-tcl8513-tk8513/bin/python"
+      monWrapper="/local00/home/A96028/GitEficasTravail/eficas/PSEN_Eficas/PSSEWrapper.py"
+      cmd=[monPython,monWrapper]
+
+      w = ViewText2( self.QWParent, cmd )
+      w.setWindowTitle( "execution" )
+      w.exec_()
 
 
     #--------------------------------#
@@ -440,6 +432,8 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
     def viewJdcRapport(self):
     #-----------------------#
         strRapport = unicode( self.jdc.report() )
+        # on ajoute les regles
+        
         self._viewText(strRapport, "JDC_RAPPORT")
 
     #----------------#
@@ -832,11 +826,11 @@ class JDCEditor(Ui_baseWidget,QtGui.QWidget):
 
           #textePython="ls -l"
           self._viewTextExecute( textePython,"map_run",".sh")
-          try:
-             commande="rm  "+self.fichierMapInput
-             os.system(commande)
-          except :
-             pass
+          #try:
+          #  commande="rm  "+self.fichierMapInput
+          #   os.system(commande)
+          #except :
+          #   pass
       except Exception, e:
           print traceback.print_exc()