update of plugin Verima

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

diff --git a/src/Tools/Verima/Base/tableRatios.py b/src/Tools/Verima/Base/tableRatios.py
index 2a54286ff36d9a11f956fd2506f2c7e7220013cf..843975a7e13fe48c8df3750c656bd1b09ab627da 100644 (file)
--- a/src/Tools/Verima/Base/tableRatios.py
+++ b/src/Tools/Verima/Base/tableRatios.py
@@ -4,13 +4,13 @@ from tableDeBase import TableDeBase
 class TableRatios (TableDeBase):
       def __init__(self):
           TableDeBase.__init__(self,"Ratios")
-          self.setField(('Maillage','Version','Machine','RatioMax','RatioMin','Quartile1','Mediane','Quartile3','Moyenne'))
-          self.setTypeField(('int','int','str','float','float','float','float','float','float'),('idMaillage','idVersion','Machine'))
+          self.setField(('Maillage','Version','RatioMax','RatioMin','Quartile1','Mediane','Quartile3','Moyenne'))
+          self.setTypeField(('int','int','float','float','float','float','float','float'),('idMaillage','idVersion','Machine'))
 
       def createSqlTable(self):
           query=QtSql.QSqlQuery()
 
-          texteQuery ="create table Ratios(idMaillage int, idVersion int, Machine varchar(10),"
+          texteQuery ="create table Ratios(idMaillage int, idVersion int, "
           texteQuery+="RatioMax float, RatioMin float, "
           texteQuery+="Q1 float,"
           texteQuery+="Mediane float,"
@@ -18,21 +18,19 @@ class TableRatios (TableDeBase):
           texteQuery+="Moyenne float,"
           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));"
+          texteQuery+="primary key (idMaillage,idVersion));"
 
           print "Creation de TableRatios : " , query.exec_(texteQuery)
 
-      def getVal(self,idMaillage, idVersion, Machine, Entite):
+      def getVal(self,idMaillage, idVersion,  Entite):
           query=QtSql.QSqlQuery()
           texteQuery ='select '+ str(Entite) + ' from Ratios where idMaillage='+str(idMaillage)
           texteQuery+=' and  idVersion='+str(idVersion)
-          texteQuery+=" and Machine='" + str(Machine) +"';"
           query.exec_(texteQuery)
           nb=0
           val=0                          # Valeur si l enregistrement n existe pas
           while (query.next()) :
-              val=query.value(0).toInt()[0]
+              val=query.value(0).toFloat()[0]
               nb=nb+1
           if nb > 1 : print "Double valeur de Reference dans la table des mailles"
           return val