X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FVerima%2FBase%2FtableMaillages.py;h=8dd5d8705073280e9bff2d541f6a89e0fd0e79d6;hb=004925bca40d46c25cf9cc837193335163c2d44f;hp=28e9bbba32b89a3c413ee17486ca6db602c0975b;hpb=2d16118826a6b7874b3093ed11284cfbb30a5efa;p=modules%2Fsmesh.git

diff --git a/src/Tools/Verima/Base/tableMaillages.py b/src/Tools/Verima/Base/tableMaillages.py
index 28e9bbba3..8dd5d8705 100644
--- a/src/Tools/Verima/Base/tableMaillages.py
+++ b/src/Tools/Verima/Base/tableMaillages.py
@@ -1,4 +1,4 @@
-from PyQt4 import QtSql, QtCore
+from qtsalome import QSqlQuery
 from tableDeBase import TableDeBase
 
 class TableMaillages (TableDeBase):
@@ -9,7 +9,7 @@ class TableMaillages (TableDeBase):
             self.setTypeField(('int','str','str','str','int','int','int','int','int','int','str'),('id'))
 
         def createSqlTable(self):
-            query=QtSql.QSqlQuery()
+            query=QSqlQuery()
             texteQuery ="create table Maillages(id integer primary key autoincrement, nomMaillage varchar(10), "
             texteQuery+="nomScript varchar(40), medResultat varchar(15), idMailleur int, dimension int,"
             texteQuery+="seuilCPU int, seuilRatio int, seuilTaille int, seuilNbMaille int, commentaire varchar(60), "
@@ -17,7 +17,7 @@ class TableMaillages (TableDeBase):
             print "creation de TableMaillages : " , query.exec_(texteQuery)
 
         def getVal(self,idMaillage, nomChamp):
-            query=QtSql.QSqlQuery()
+            query=QSqlQuery()
             valeur=None
             texteQuery ='select '+ nomChamp + ' from Maillages  where id=' + str(idMaillage) + ";"
             query.exec_(texteQuery)
@@ -30,7 +30,7 @@ class TableMaillages (TableDeBase):
 
         def dejaRemplie(self):
             texteQuery="select * from  Maillages where medResultat='/tmp/tetra.med';"
-            maQuery=QtSql.QSqlQuery()
+            maQuery=QSqlQuery()
             maQuery.exec_(texteQuery)
             nb=0
             while(maQuery.next()): nb=nb+1
@@ -40,11 +40,11 @@ class TableMaillages (TableDeBase):
             if self.dejaRemplie():
                print "table Maillage deja initialisee"
                return
-            self.insereLigneAutoId(('tetra', 'Scripts/script1.py', '/tmp/tetra.med', 2,3,5,5,5,5, 'essaiPN'))
-            self.insereLigneAutoId(('MASSIF_M', 'Scripts/excavation.py', '/tmp/MASSIF.new.med', 1,3,5,5,5,5, 'essaiGN'))
-
+#            self.insereLigneAutoId(('Fiche_7566_TUNNEL', '/home/H77945/CAS_TEST/MAILLEUR/FICHE_7566_TUNNEL/Fiche_7566_TUNNEL.py', '/tmp/Fiche_7566_TUNNEL.med', 3,3,10,10,10,10, 'Maillage d un tunnel'))
+#            self.insereLigneAutoId(('Fiche_7957_AILETTE', '/home/H77945/CAS_TEST/MAILLEUR/FICHE_7957_AILETTE/Fiche_7957_AILETTE.py', '/tmp/Fiche_7957_AILETTE.med', 1,2,10,10,10,10, 'Maillage d une attache d aillette'))
+        
         def construitListeMaillages(self):
-            maQuery=QtSql.QSqlQuery()
+            maQuery=QSqlQuery()
             texteQuery="select id, nomScript,medResultat from Maillages;"
             maQuery.exec_(texteQuery)
             listeMaillages=[]
@@ -54,7 +54,7 @@ class TableMaillages (TableDeBase):
            
         def verifieListeMaillages(self,listeMaillage):
             newListeMaillages=[]
-            maQuery=QtSql.QSqlQuery()
+            maQuery=QSqlQuery()
             for idM in listeMaillage:
                 texteQuery="select id, nomScript,medResultat from Maillages where id = " + str(idM) +';'
                 maQuery.exec_(texteQuery)
@@ -66,19 +66,35 @@ class TableMaillages (TableDeBase):
                    print "impossible de traiter le maillage : ", idM
             return  newListeMaillages
 
-        def getTousPourMaillage(self,idMailleur):
-            l1=[]; l2=[]; l3=[]
-            l4=[]; l5=[]; l6=[]
-            texteQuery="select id,nomMaillage,seuilCPU,seuilRatio,seuilTaille,seuilNbMaille from  Maillages where idMailleur= "+ str(idMailleur) +"  ;"
-            maQuery=QtSql.QSqlQuery()
-            #print texteQuery
+        def getSeuilsPourMaillage(self,idMaillage):
+            texteQuery="select id,nomMaillage,seuilCPU,seuilRatio,seuilTaille,seuilNbMaille from  Maillages where id = "+ str(idMaillage) +"  ;"
+            maQuery=QSqlQuery()
             maQuery.exec_(texteQuery)
             while(maQuery.next()): 
-                 l1.append( maQuery.value(0).toInt()[0])
-                 l2.append( maQuery.value(1).toString())
-                 l3.append( maQuery.value(2).toInt()[0])
-                 l4.append( maQuery.value(3).toInt()[0])
-                 l5.append( maQuery.value(4).toInt()[0])
-                 l6.append( maQuery.value(5).toInt()[0])
+                 l1 = maQuery.value(0).toInt()[0]
+                 l2 = maQuery.value(1).toString()
+                 l3 = maQuery.value(2).toInt()[0]
+                 l4 = maQuery.value(3).toInt()[0]
+                 l5 = maQuery.value(4).toInt()[0]
+                 l6 = maQuery.value(5).toInt()[0]
             return l1,l2,l3,l4,l5,l6
 
+        def getTous(self):
+            maillagesIdListe=[]; maillagesNomListe=[]
+            texteQuery="select id,nomMaillage from  Maillages order by id;"
+            maQuery=QSqlQuery()
+            maQuery.exec_(texteQuery)
+            while(maQuery.next()):
+                 maillagesIdListe.append( maQuery.value(0).toInt()[0])
+                 maillagesNomListe.append( maQuery.value(1).toString())
+            return maillagesIdListe, maillagesNomListe
+
+        def getMailleurId(self,idMaillage):
+            texteQuery="select idMailleur from  Maillages where id = "+ str(idMaillage) +"  ;"
+            maQuery=QSqlQuery()
+            print texteQuery
+            print maQuery.exec_(texteQuery)
+            maQuery.exec_(texteQuery)
+            while(maQuery.next()): 
+                 idMailleur = maQuery.value(0).toInt()[0]
+            return idMailleur