Mercurial > bmsapp / file diff

--- a/src/DetailCO2meter.cpp	Fri Nov 18 16:57:02 2022 +0100
+++ b/src/DetailCO2meter.cpp	Sat Nov 19 13:55:12 2022 +0100
@@ -83,7 +83,8 @@
 	_beername = query.value("beername").toString();
 
 	sql = "SELECT "
-		"st_carb_min,st_carb_max,secondary_temp,primary_end_temp,bottle_carbonation_temp"
+		"st_carb_min,st_carb_max,secondary_temp,primary_end_temp,bottle_carbonation_temp,"
+		"bottle_carbonation"
 		" FROM products WHERE code=:code AND name=:name";
 	query2.prepare(sql);
         query2.bindValue(":code", _beercode);
@@ -98,13 +99,16 @@
 		TSec = 18;
 
 	    double carbtemp = query2.value("bottle_carbonation_temp").toDouble();
-	    double barmin = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_min").toDouble(), TSec, 1), carbtemp);
-	    double barmax = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_max").toDouble(), TSec, 1), carbtemp);
+	    double barmin  = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_min").toDouble(), TSec, 1), carbtemp);
+	    double barmax  = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("st_carb_max").toDouble(), TSec, 1), carbtemp);
+	    double barthis = Utils::GetPressureBar(Utils::CarbCO2toS(query2.value("bottle_carbonation").toDouble(), TSec, 1), carbtemp);
 	    ui->minVol->setValue(query2.value("st_carb_min").toDouble());
 	    ui->maxVol->setValue(query2.value("st_carb_max").toDouble());
+	    ui->thisVol->setValue(query2.value("bottle_carbonation").toDouble());
 	    ui->minBar->setValue(barmin);
 	    ui->maxBar->setValue(barmax);
-	    qDebug() << " beerdata" << TSec << carbtemp << barmin << barmax;
+	    ui->thisBar->setValue(barthis);
+	    qDebug() << " beerdata" << TSec << carbtemp << barmin << barmax << barthis;
 
 	    ui->barMeter->setNominal(barmin);
     	    ui->barMeter->setCritical(barmax);