Mercurial > bmsapp / file diff

--- a/src/EditProductTab3.cpp	Sat Dec 03 16:32:24 2022 +0100
+++ b/src/EditProductTab3.cpp	Sun Jan 08 15:53:16 2023 +0100
@@ -491,12 +491,15 @@
      */
     double svg = 0;
     double initcells = 0;
+    bool sta1 = false;
     product->yeasts_ok = true;
     if (product->yeasts.size() > 0) {
         for (i = 0; i < product->yeasts.size(); i++) {
 	    if (product->yeasts.at(i).use == 0) {		// Used in primary
 		if (product->yeasts.at(i).attenuation > svg)
 		    svg = product->yeasts.at(i).attenuation;	// Take the highest if multiple yeasts.
+		if (product->yeasts.at(i).sta1)
+		    sta1 = true;
 	    }
 	    if (product->yeasts.at(i).form == 0)
 		initcells += (product->yeasts.at(i).cells / 1000000000) * product->yeasts.at(i).amount * (product->starter_viability / 100);
@@ -518,9 +521,9 @@
     ui->est_svgEdit->setValue(svg);
 
     if (product->mashs_kg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0)
-	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og);
+	product->est_fg = Utils::estimate_fg(psugar, pcara, mashinfuse / product->mashs_kg, mashtime, mashtemp, svg, product->est_og, sta1);
     else
-	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og);
+	product->est_fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, product->est_og, sta1);
     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;