Mercurial > bmsapp / file diff

--- a/src/EditProductTab3.cpp	Wed Aug 17 15:23:17 2022 +0200
+++ b/src/EditProductTab3.cpp	Thu Aug 18 16:11:20 2022 +0200
@@ -401,11 +401,18 @@
     }
     qDebug() << "  color" << ui->est_colorEdit->value() << color << product->est_color;
     product->est_color = color;
-    ui->est_colorEdit->setValue(color);
-    ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color));
     ui->est_color2Edit->setValue(color);
     ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color));
-    ui->est_colorShow->setValue(color);
+    if (product->stage > PROD_STAGE_BREW) {
+        ui->est_colorLabel->setText(tr("Final EBC"));
+	ui->est_colorEdit->setValue(product->brew_fermenter_color);
+	ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(product->brew_fermenter_color));
+	ui->est_colorShow->setValue(product->brew_fermenter_color);
+    } else {
+	ui->est_colorEdit->setValue(color);
+	ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color));
+	ui->est_colorShow->setValue(color);
+    }
 
     if (round(product->mashs_kg / product->eq_mash_max * 100) > 120)
 	ui->perc_mashShow->setValue(120);
@@ -447,7 +454,7 @@
 		product->yeasts_ok = false;
 	    }
 	}
-	qDebug() << "  SVG" << svg;
+	qDebug() << "  est SVG" << svg;
     }
     if (svg == 0)
 	svg = 77.0;
@@ -457,49 +464,40 @@
 	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og);
     else
 	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og);
-    qDebug() << "  FG" << ui->est_fgEdit->value() << product->est_fg;
+    qDebug() << "  est FG" << ui->est_fgEdit->value() << product->est_fg;
+    product->est_abv = Utils::abvol(product->est_og, product->est_fg);
+    qDebug() << "  est ABV" << ui->est_abvEdit->value() << product->est_abv;
+
     if (product->stage > PROD_STAGE_TERTIARY) {
 	ui->est_fgLabel->setText(tr("Final FG"));
 	ui->est_fgEdit->setValue(product->fg);
 	ui->est_fgShow->setValue(product->fg);
+	ui->est_abvLabel->setText(tr("Final ABV"));
+	double abv = Utils::abvol(product->og, product->fg);
+	ui->est_abvEdit->setValue(abv);
+	ui->est_abvShow->setValue(abv);
     } else {
 	ui->est_fgEdit->setValue(product->est_fg);
 	ui->est_fgShow->setValue(product->est_fg);
+	ui->est_abvEdit->setValue(product->est_abv);
+	ui->est_abvShow->setValue(product->est_abv);
     }
     ui->est_fg3Edit->setValue(product->est_fg);
-
-    product->est_abv = Utils::abvol(product->est_og, product->est_fg);
-    qDebug() << "  ABV" << ui->est_abvEdit->value() << product->est_abv;
-    ui->est_abvEdit->setValue(product->est_abv);
     ui->est_abv2Edit->setValue(product->est_abv);
-    ui->est_abvShow->setValue(product->est_abv);
 
     /*
      * Calculate kilocalories/liter. Formula from brouwhulp.
      * Take the alcohol and sugar parts and then combine.
      */
-    double alc = 1881.22 * product->est_fg * (product->est_og - product->est_fg) / (1.775 - product->est_og);
-    double sug = 3550 * product->est_fg * (0.1808 * product->est_og + 0.8192 * product->est_fg - 1.0004);
+    double alc, sug;
+    if (product->stage > PROD_STAGE_TERTIARY) {
+	alc = 1881.22 * product->fg * (product->og - product->fg) / (1.775 - product->og);
+	sug = 3550 * product->fg * (0.1808 * product->og + 0.8192 * product->fg - 1.0004);
+    } else {
+	alc = 1881.22 * product->est_fg * (product->est_og - product->est_fg) / (1.775 - product->est_og);
+	sug = 3550 * product->est_fg * (0.1808 * product->est_og + 0.8192 * product->est_fg - 1.0004);
+    }
     ui->calEdit->setValue(round((alc + sug) / (12 * 0.0295735296)));
-
-    // Bottle priming
-    double priming_total = 0;
-    for (i = 0; i < product->fermentables.size(); i++) {
-	if (product->fermentables.at(i).added == FERMENTABLE_ADDED_BOTTLE) {
-	    priming_total += ((product->fermentables.at(i).yield / 100) * (1 - product->fermentables.at(i).moisture / 100)) *
-		    		product->fermentables.at(i).amount;
-	    qDebug() << "  priming" << product->fermentables.at(i).amount << "total" << priming_total;
-	}
-    }
-    double grl = priming_total * 1000.0 * (1 / product->batch_size);
-    double volco2 = grl * 0.510;
-    qDebug() << "  priming gr/l" << grl << "volco2" << volco2;
-
-    if (volco2 > 0) {
-	product->est_carb = volco2;
-	ui->est_carbEdit->setValue(product->est_carb);
-	ui->est_carbShow->setValue(product->est_carb);
-    }
 }