Merge remote branch 'origin/V7_dev'

[modules/smesh.git] / src / Tools / Verima / Base / tablePerfs.py

diff --git a/src/Tools/Verima/Base/tablePerfs.py b/src/Tools/Verima/Base/tablePerfs.py
index e92fb50ba887406df208ddc657ad36639b649b33..4955817eb888b29ba23949016cc648b210794931 100644 (file)
--- a/src/Tools/Verima/Base/tablePerfs.py
+++ b/src/Tools/Verima/Base/tablePerfs.py
@@ -1,14 +1,14 @@
-from PyQt4 import QtSql, QtCore
+from qtsalome import QSqlQuery
 from tableDeBase import TableDeBase
 
 class TablePerfs (TableDeBase):
       def __init__(self):
           TableDeBase.__init__(self,"Perfs")
-          self.setField(('Maillage','Version','NbSecCpu','Memoire'))
-          self.setTypeField(('int','int','int','int'),('idMaillage','idVersion','Machine'))
+          self.setField(('Maillage','Version','Machine','NbSecCpu','Memoire'))
+          self.setTypeField(('int','int','str','int','int'),('idMaillage','idVersion','Machine'))
 
       def createSqlTable(self):
-          query=QtSql.QSqlQuery()
+          query=QSqlQuery()
           texteQuery ="create table Perfs(idMaillage int, idVersion int, Machine varchar(10),  NbCpu int, Mem int, "
           texteQuery+="foreign key (idMaillage) references Maillages(id)," 
           texteQuery+="foreign key (idVersion) references Versions(id)," 
@@ -18,7 +18,7 @@ class TablePerfs (TableDeBase):
           print "Creation de TablePerfs : " , query.exec_(texteQuery)
 
       def getVal(self,idMaillage,idVersion,Machine):
-          query=QtSql.QSqlQuery()
+          query=QSqlQuery()
           texteQuery ='select NbCpu from Perfs  where idMaillage=' + str(idMaillage)
           texteQuery +=' and idVersion = ' + str(idVersion)
           texteQuery +=" and Machine ='"  + Machine + "';"