Mercurial > bmsapp / file diff

--- a/src/EditProductTab3.cpp	Fri Oct 28 16:37:49 2022 +0200
+++ b/src/EditProductTab3.cpp	Sat Oct 29 15:43:28 2022 +0200
@@ -260,6 +260,7 @@
     const QSignalBlocker blocker1(ui->est_ogEdit);
     const QSignalBlocker blocker2(ui->est_og2Edit);
 
+    product->fermentables_use100 = false;
     if (product->fermentables.size() < 1) {
 	qDebug() << "  no fermentables, return.";
 	product->est_og = 0.980;
@@ -290,11 +291,12 @@
 	ui->mash_kgEdit->setValue(0);
 	return;
     }
-    qDebug() << "  adjust to 100" << product->fermentables_use100;
 
     product->fermentables_ok = true;
     product->mashs_kg = 0;
     for (i = 0; i < product->fermentables.size(); i++) {
+	if (product->fermentables.at(i).adjust_to_total_100 && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE)
+	    product->fermentables_use100 = true;
 	if (product->fermentables.at(i).type == FERMENTABLE_TYPE_SUGAR && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE)
 	    psugar += product->fermentables.at(i).percentage;
 	if (product->fermentables.at(i).graintype == FERMENTABLE_GRAINTYPE_CRYSTAL && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE)
@@ -336,6 +338,7 @@
 	    product->fermentables_ok = false;
 	}
     }
+    qDebug() << "  adjust to 100" << product->fermentables_use100;
     qDebug() << "  supplies" << product->fermentables_ok;
     qDebug() << "  colort" << colort << "colorh" << colorh << "colorn" << colorn;
     qDebug() << "  psugar" << psugar << "pcara" << pcara << "mvol" << mvol;