Merge branch 'V8_3_BR' into ngr/python3_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..15751cfc2c97f45a25d376d494e5e4dc0827497d 100644 (file)
--- a/src/Tools/Verima/Base/tablePerfs.py
+++ b/src/Tools/Verima/Base/tablePerfs.py
@@ -1,33 +1,33 @@
-from PyQt4 import QtSql, QtCore
-from tableDeBase import TableDeBase
+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)," 
           texteQuery+="foreign key (Machine) references Machines(nomMachine)," 
           texteQuery+="primary key (idMaillage, idVersion, Machine));"
 
-          print "Creation de TablePerfs : " , query.exec_(texteQuery)
+          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 + "';" 
           query.exec_(texteQuery)
           cpu=None
-          while (query.next()) :
+          while (next(query)) :
               cpu=query.value(0).toInt()[0]
-          while (query.next()) :
-              print "plusieurs enregistrements dans perf pour ",str(idMaillage)," ",str(idVersion)," ",Machine
+          while (next(query)) :
+              print("plusieurs enregistrements dans perf pour ",str(idMaillage)," ",str(idVersion)," ",Machine)
           if cpu==None :
-              print "pas d enregistrement dans perf pour ",str(idMaillage)," ",str(idVersion)," ",Machine
+              print("pas d enregistrement dans perf pour ",str(idMaillage)," ",str(idVersion)," ",Machine)
           return cpu