From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Tue, 7 Jul 2009 15:01:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V1_16_for_Salome512
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1ea42aeeac0ec3ecec1f121957d3b5a07644d9ba;p=tools%2Feficas.git

*** empty log message ***
---

diff --git a/InterfaceQT4/compooper.py b/InterfaceQT4/compooper.py
index 909c0208..58230078 100644
--- a/InterfaceQT4/compooper.py
+++ b/InterfaceQT4/compooper.py
@@ -67,8 +67,39 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode):
     def viewPng(self) :
         from monPixmap import MonLabelPixmap
         fichier=self.appliEficas.getName()
-        widgetPng=MonLabelPixmap(self.appliEficas,fichier)
-        ret=widgetPng.exec_()
+        try:
+        #if 1:
+            import generator
+            g = generator.plugins[self.appliEficas.format_fichier]()
+            print dir(self.item)
+            g.gener(self.item.object, format='beautifie')
+            stdGener = g.getGenerateur()
+            print g
+            print g.__class__
+            print dir(stdGener)
+            if len(g.dictMCLois) != 1:
+                QMessageBox.warning(
+                    None,
+                    self.appliEficas.trUtf8("Erreur interne"),
+                    self.appliEficas.trUtf8("La PDF de la loi ne peut pas etre affichee."),
+                    self.appliEficas.trUtf8("&Annuler"))
+                return
+            loi = g.dictMCLois.keys()[0]
+            nomLoi = loi.get_name()
+            script = stdGener.GraphiquePDF(loi, fichier)
+            print script
+            d = {}
+            exec script in d
+        except:
+        #else:
+            QMessageBox.warning(
+                None,
+                self.appliEficas.trUtf8("Erreur interne"),
+                self.appliEficas.trUtf8("La PDF de la loi ne peut pas etre affichee."),
+                self.appliEficas.trUtf8("&Annuler"))
+        widgetPng=MonLabelPixmap(self.appliEficas,fichier,nomLoi)
+        #ret=widgetPng.exec_()
+        widgetPng.show()
 
 class EtapeTreeItem(Objecttreeitem.ObjectTreeItem):
   """ La classe EtapeTreeItem est un adaptateur des objets ETAPE du noyau
diff --git a/InterfaceQT4/monPixmap.py b/InterfaceQT4/monPixmap.py
index b2860e61..61168964 100644
--- a/InterfaceQT4/monPixmap.py
+++ b/InterfaceQT4/monPixmap.py
@@ -36,16 +36,18 @@ class MonLabelPixmap(Ui_LabelPixmap,QtGui.QDialog):
   à l'utilisateur de choisir une seule valeur parmi une liste de valeurs
   discrètes
   """
-  def __init__(self, QWparent , fichier = "/home/noyret/ast-red-ball.png"):
+  def __init__(self, QWparent , fichier, name):
       QtGui.QDialog.__init__(self,QWparent)
-      self.setModal(True)
+      self.fichier = fichier
+      self.setModal(False)
       self.setupUi(self)
+      self.setWindowTitle("PDF de la loi '%s'" % name)
       self.labelPix.setPixmap(QPixmap(fichier));
       
 
   def on_buttonCancel_clicked(self):
       QDialog.reject(self)
 
-  def on_buttonOk_clicked(self):
-      QDialog.accept(self)
-
+  def closeEvent(self,event):
+    import os
+    os.system("rm -f %s" % self.fichier)
diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 76b52344..4cbc0cc6 100644
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -313,7 +313,7 @@ class Appli(Ui_Eficas,QMainWindow):
 
     def getName(self):
         self.indice=self.indice+1
-        texte="/tmp/tempo"+str(self.indice)
+        texte="tempo"+str(self.indice)
         return texte
         
 
diff --git a/UiQT4/desPixmap.ui b/UiQT4/desPixmap.ui
index 0f6cc405..b67a335b 100644
--- a/UiQT4/desPixmap.ui
+++ b/UiQT4/desPixmap.ui
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Dialog</string>
+   <string>PDF de la loi</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
@@ -20,51 +20,8 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>LabelPixmap</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>LabelPixmap</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/generator/OpenturnsSTD.py b/generator/OpenturnsSTD.py
index af27d068..66c06d2f 100644
--- a/generator/OpenturnsSTD.py
+++ b/generator/OpenturnsSTD.py
@@ -32,12 +32,15 @@ import math
 
 # Chargement du module Open TURNS
 from openturns import *
-from openturns.viewer import ViewImage,StopViewer,WaitForViewer
 
 results = {}
 
 """
 
+viewerSTD = """
+from openturns.viewer import ViewImage,StopViewer,WaitForViewer
+"""
+
 footerSTD = """
 
 # Flush des messages en attente
@@ -216,6 +219,7 @@ class STDGenerateur :
     Imprime l entete commun a tous les fichiers
     '''
     txt  = headerSTD % self.OpenTURNS_path
+    txt += viewerSTD
     txt += "# Definit le niveau d'affichage de la log\n"
     txt += "%s = Log.NONE\n" % self.variable["flags"]
     for flag in self.logFlags.keys():
diff --git a/generator/generator_openturns_study.py b/generator/generator_openturns_study.py
index 27124325..dd84bead 100644
--- a/generator/generator_openturns_study.py
+++ b/generator/generator_openturns_study.py
@@ -117,8 +117,7 @@ class OpenturnsGenerator(PythonGenerator):
    def genereSTD(self):
       print "IDM: genereSTD dans generator_openturns_study.py"
       print "IDM: self.listeVariables=", self.listeVariables
-      MonBaseGenerateur=Generateur(self.appli,self.dictMCVal, self.listeVariables, self.dictMCLois)
-      MonGenerateur=MonBaseGenerateur.getSTDGenerateur()
+      MonGenerateur=self.getGenerateur()
       #try :
       if 1== 1 :
          self.texteSTD=MonGenerateur.CreeSTD()
@@ -131,4 +130,11 @@ class OpenturnsGenerator(PythonGenerator):
       f.write( self.texteSTD )
       f.close()
 
-
+   def getGenerateur (self):
+      print "IDM: getGenerateur dans generator_openturns_study.py"
+      print "IDM: self.dictMCVal=", self.dictMCVal
+      print "IDM: self.listeVariables=", self.listeVariables
+      print "IDM: self.dictMCLois=", self.dictMCLois
+      MonBaseGenerateur=Generateur(self.appli,self.dictMCVal, self.listeVariables, self.dictMCLois)
+      MonGenerateur=MonBaseGenerateur.getSTDGenerateur()
+      return MonGenerateur