bmsapp: comparison src/EditProductTab3.cpp

-:fc0c10d79539
+:2dfead81c72f
 QString w;
 QWidget* pWidget;
 QHBoxLayout* pLayout;
 QTableWidgetItem *item;
-qDebug() << "refreshFermentables" << product->fermentables.size();
 std::sort(product->fermentables.begin(), product->fermentables.end(), ferment_sort_test);
 const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"),
 		    	      tr("Amount"), tr("Stock"), tr("Procent"), tr("100%"), tr("Delete"), tr("Edit") });
 ui->fermentablesTable->setColumnCount(13);
 	     ((product->inventory_reduced <= PROD_STAGE_PACKAGE)  && (product->fermentables.at(i).added == FERMENTABLE_ADDED_KEGS))) &&
 	       product->fermentables.at(i).inventory < product->fermentables.at(i).amount) {
 	    product->fermentables_ok = false;
 	}
 }
-//    qDebug() << "  adjust to 100" << product->fermentables_use100;
+#ifdef DEBUG_FERMENTABLES
-//    qDebug() << "  supplies" << product->fermentables_ok;
+qDebug() << "  adjust to 100" << product->fermentables_use100;
-//    qDebug() << "  colort" << colort << "colorh" << colorh << "colorn" << colorn;
+qDebug() << "  supplies" << product->fermentables_ok;
-//    qDebug() << "  psugar" << psugar << "pcara" << pcara << "mvol" << mvol;
+qDebug() << "  colort" << colort << "colorh" << colorh << "colorn" << colorn;
-//    qDebug() << "  sugarsf" << sugarsf << "sugarsm" << sugarsm;
+qDebug() << "  psugar" << psugar << "pcara" << pcara << "mvol" << mvol;
+qDebug() << "  sugarsf" << sugarsf << "sugarsm" << sugarsm;
+#endif
 double v = s / sugardensity + mvol;
 s = 1000 * s / (v * 10); //deg. Plato
 product->est_mash_sg = Utils::plato_to_sg(s);
 ui->brew_mashsgShow->setValue(product->est_mash_sg);
 /* Estimate total recipe OG */
 product->est_og = Utils::estimate_sg(sugarsf + addedS, product->batch_size);
-//    qDebug() << "  OG" << ui->est_ogEdit->value() << product->est_og;
+#ifdef DEBUG_FERMENTABLES
+qDebug() << "  OG" << ui->est_ogEdit->value() << product->est_og;
+#endif
 if (product->stage > PROD_STAGE_BREW) {
 	ui->est_ogLabel->setText(tr("Final OG:"));
 	ui->est_ogEdit->setValue(product->og);
 	ui->est_ogShow->setValue(product->og);
 } else {
 ui->brew_aboilsgShow->setValue(product->est_og3);
 /* Estimate SG in kettle before boil */
 product->preboil_sg = Utils::estimate_sg(sugarsm, product->boil_size);
 ui->brew_preboilsgShow->setValue(product->preboil_sg);
-//    qDebug() << "  preboil SG" << product->preboil_sg;
+#ifdef DEBUG_FERMENTABLES
+qDebug() << "  preboil SG" << product->preboil_sg;
+#endif
 /*
 * Recalculate volumes
 */
 double aboil_volume = product->batch_size;
 } else if (product->color_method == 3) {			// Hans Halberstadt
 	color = round((4.46 * bv * sr) / product->batch_size * colorh);
 } else {
 	cw = colort / product->batch_size * 8.34436;
 	color = Utils::kw_to_ebc(product->color_method, cw);
-	//qDebug() << "  oud EBC" << color << "new EBC" << Utils::kw_to_newebc(product->color_method, cw) << "SRM" << Utils::kw_to_srm(product->color_method, cw);
+#ifdef DEBUG_FERMENTABLES
-}
+	qDebug() << "  oud EBC" << color << "new EBC" << Utils::kw_to_newebc(product->color_method, cw) << "SRM" << Utils::kw_to_srm(product->color_method, cw);
-//qDebug() << "  color" << ui->est_colorEdit->value() << color << product->est_color;
+#endif
+}
+#ifdef DEBUG_FERMENTABLES
+qDebug() << "  color" << ui->est_colorEdit->value() << color << product->est_color;
+#endif
 product->est_color = color;
 ui->est_color2Edit->setValue(color);
 ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color));
 if (product->stage > PROD_STAGE_BREW) {
 ui->est_colorLabel->setText(tr("Final EBC:"));
 	ui->perc_mashShow->setValue(round(product->mashs_kg / product->eq_mash_max * 100));
 ui->mash_kgEdit->setValue(product->mashs_kg);
 ui->perc_sugarsShow->setValue(round(psugar));
 ui->perc_caraShow->setValue(round(pcara));
 if (product->mashs_kg > 0) {
-//	qDebug() << "  lintner" << lintner << "  mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg);
+#ifdef DEBUG_FERMENTABLES
+	qDebug() << "  lintner" << lintner << "  mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg);
+#endif
 	ui->lintnerShow->setValue(round(lintner / product->mashs_kg));
 } else {
-//	qDebug() << "  lintner N/A";
+#ifdef DEBUG_FERMENTABLES
+	qDebug() << "  lintner N/A";
+#endif
 	ui->lintnerShow->setValue(0);
 }
 /*
 * Calculate the apparant attenuation.
 	 ((product->inventory_reduced <= PROD_STAGE_PACKAGE)   && (product->yeasts.at(i).use == 3))) && // Bottle
 	  (product->yeasts.at(i).inventory < product->yeasts.at(i).amount)) {
 		product->yeasts_ok = false;
 	    }
 	}
-//	qDebug() << "  est SVG" << svg;
+#ifdef DEBUG_FERMENTABLES
+	qDebug() << "  est SVG" << svg;
+#endif
 }
 if (svg == 0)
 	svg = 77.0;
 ui->est_svgEdit->setValue(svg);
 	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, 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;
+#ifdef DEBUG_FERMENTABLES
+qDebug() << "  est ABV" << ui->est_abvEdit->value() << product->est_abv;
+#endif
 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);
 	    row100 = i;
 }
 double oldperc = product->fermentables.at(product->fermentables_row).percentage;
 double diffp = val - oldperc;
 double diffw = (diffp / 100) * total;
+#ifdef DEBUG_FERMENTABLES
 qDebug() << "row100" << row100 << "total" << total << "diff kg" << diffw << "diff %" << diffp;
+#endif
 product->fermentables[product->fermentables_row].percentage += diffp;
 product->fermentables[product->fermentables_row].amount += diffw;
 product->fermentables[row100].percentage -= diffp;
 product->fermentables[row100].amount -= diffw;

Mercurial > bmsapp / file comparison

comparison: src/EditProductTab3.cpp

src/EditProductTab3.cpp