# HG changeset patch # User Michiel Broek # Date 1675502606 -3600 # Node ID 04c67c9f903c845d9a4f5a9671f0335083621d76 # Parent f1cc6a30623d4051e98865baab2e17286429ee84 Clean debug log settings after last changes. diff -r f1cc6a30623d -r 04c67c9f903c src/EditProductTab6.cpp --- a/src/EditProductTab6.cpp Fri Feb 03 11:59:17 2023 +0100 +++ b/src/EditProductTab6.cpp Sat Feb 04 10:23:26 2023 +0100 @@ -598,21 +598,14 @@ for (int i = 0; i < product->yeasts.size(); i++) { if (product->yeasts.at(i).use == YEAST_USE_PRIMARY) { - qDebug() << "calcViability()" << i << product->yeasts.at(i).yp_uuid << product->yeasts.at(i).yp_package; if (! product->yeasts.at(i).yp_uuid.isNull() && (product->yeasts.at(i).yp_uuid.length() == 36)) { - qDebug() << " valid package vpm:" << product->yeasts.at(i).yp_viability << product->yeasts.at(i).yp_max; vpm = product->yeasts.at(i).yp_viability; max = product->yeasts.at(i).yp_max; } else if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID) { // Fallback to hardcoded values. vpm = 0.80; max = 97; if (product->yeasts.at(i).laboratory == "White Labs") { // PurePitch - /* - * Purepitch 6th month viability point 80,8%. - * Purepitch Next Generation 6th month viability point 94,9%. - */ vpm = 0.9648; // Purepitch - //vpm = 0.9914; // Purepitch Next Generation max = 100; } } else if (product->yeasts.at(i).form == YEAST_FORMS_DRY) { @@ -650,7 +643,7 @@ product->starter_viability = round(base * 10) / 10; ui->conditionShow->setValue(product->starter_viability); #ifdef DEBUG_YEAST - qDebug() << "age" << timeDiff << "degrade" << degrade << "viability" << product->starter_viability; + qDebug() << " Age" << timeDiff << "degrade" << degrade << "viability" << product->starter_viability; #endif } @@ -980,11 +973,11 @@ query.prepare("SELECT * FROM inventory_yeastpack WHERE laboratory=:laboratory AND form=:form AND valid='1' ORDER BY laboratory,package"); query.bindValue(":laboratory", laboratory); query.bindValue(":form", form); - qDebug() << " search" << laboratory << form; +// qDebug() << " search" << laboratory << form; query.exec(); while (query.next()) { this->ypackageEdit->addItem(query.value("laboratory").toString()+" - "+query.value("package").toString()); - qDebug() << " add package" << query.value("laboratory").toString() << query.value("package").toString(); +// qDebug() << " add package" << query.value("laboratory").toString() << query.value("package").toString(); } } @@ -1004,12 +997,12 @@ query.prepare("SELECT * FROM inventory_yeastpack WHERE laboratory=:laboratory AND form=:form AND valid='1' ORDER BY laboratory,package"); query.bindValue(":laboratory", product->yeasts.at(product->yeasts_row).laboratory); query.bindValue(":form", product->yeasts.at(product->yeasts_row).form); - qDebug() << " search" << product->yeasts.at(product->yeasts_row).laboratory << product->yeasts.at(product->yeasts_row).form; +// qDebug() << " search" << product->yeasts.at(product->yeasts_row).laboratory << product->yeasts.at(product->yeasts_row).form; query.exec(); while (query.next()) { index++; if (index == val) { - qDebug() << " result" << index << query.value("package").toString(); +// qDebug() << " result" << index << query.value("package").toString(); product->yeasts[product->yeasts_row].yp_uuid = query.value("uuid").toString(); product->yeasts[product->yeasts_row].yp_package = query.value("package").toString(); product->yeasts[product->yeasts_row].yp_cells = query.value("cells").toDouble(); @@ -1031,9 +1024,9 @@ product->yeasts[product->yeasts_row].yp_max = 100; product->yeasts[product->yeasts_row].yp_size = 0.01; is_changed(); - qDebug() << " cleared old yp_xxx data"; +// qDebug() << " cleared old yp_xxx data"; } - qDebug() << " result not found"; +// qDebug() << " result not found"; } diff -r f1cc6a30623d -r 04c67c9f903c src/database/db_product.cpp --- a/src/database/db_product.cpp Fri Feb 03 11:59:17 2023 +0100 +++ b/src/database/db_product.cpp Sat Feb 04 10:23:26 2023 +0100 @@ -514,7 +514,7 @@ if (obj.contains("y_package") && obj["y_package"].isObject()) { // qDebug() << "y_package object present"; QJsonObject package = obj.value("y_package").toObject(); - qDebug() << "yeasts_Json package" << i << package; +// qDebug() << "yeasts_Json package" << i << package; y.yp_uuid = package["uuid"].toString(); y.yp_package = package["package"].toString(); y.yp_cells = package["cells"].toDouble(); @@ -1003,7 +1003,7 @@ package.insert("size", round(prod->yeasts.at(i).yp_size * 100000) / 100000); obj.insert("y_package", package); } - qDebug() << "yeasts_Json" << i << obj; +// qDebug() << "yeasts_Json" << i << obj; array.append(obj); /* Append this object */ } QJsonDocument doc; diff -r f1cc6a30623d -r 04c67c9f903c src/global.h --- a/src/global.h Fri Feb 03 11:59:17 2023 +0100 +++ b/src/global.h Sat Feb 04 10:23:26 2023 +0100 @@ -12,9 +12,9 @@ * Debug log switches for building */ // #define DEBUG_IBU 1 -// #define DEBUG_FERMENTABLES 1 -#define DEBUG_YEAST 1 -// #define DEBUG_WATER 1 +// #define DEBUG_FERMENTABLES 1 +#define DEBUG_YEAST 1 +// #define DEBUG_WATER 1 #define Ka1 0.0000004445 #define Ka2 0.0000000000468 diff -r f1cc6a30623d -r 04c67c9f903c translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Fri Feb 03 11:59:17 2023 +0100 +++ b/translations/bmsapp_en.ts Sat Feb 04 10:23:26 2023 +0100 @@ -3424,7 +3424,7 @@ - + Volume @@ -4330,7 +4330,7 @@ - + @@ -4366,7 +4366,7 @@ - + Use at: @@ -4380,7 +4380,7 @@ - + In stock: @@ -4522,8 +4522,8 @@ - - + + Amount in gr: @@ -4562,8 +4562,8 @@ - - + + Amount in ml: @@ -4574,13 +4574,13 @@ - + Primary - + Secondary @@ -4641,139 +4641,139 @@ - + Method - + Inj. factor - + New cells - + Total cells - + Grow factor - + BMSapp - Pitchrate - + Beer pitch type: - - 0.075 Real Kveik - - - - 0.75 Ale, upto 1.060 + 0.075 Real Kveik - 1.0 Ale, above 1.060 + 0.75 Ale, upto 1.060 - 1.5 Lager, upto 1.060 + 1.0 Ale, above 1.060 + 1.5 Lager, upto 1.060 + + + + 2.0 Lager, above 1.060 - + Retry starter - + Retry to automatic create starter steps - + Start step type: - + Starter step volume: - - Stirred - - - - Shaken + Stirred + Shaken + + + + Simple - + Delete yeast - - + + Total packs: - + Yeast name: - - + + Laboratory: - + Select yeast: - + Select package: - - Tertiary - - - + Tertiary + + + + Bottle diff -r f1cc6a30623d -r 04c67c9f903c translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Fri Feb 03 11:59:17 2023 +0100 +++ b/translations/bmsapp_nl.ts Sat Feb 04 10:23:26 2023 +0100 @@ -3314,7 +3314,7 @@ - + Volume Volume @@ -4846,7 +4846,7 @@ - + @@ -4882,7 +4882,7 @@ - + Use at: Toevoegen bij: @@ -4896,7 +4896,7 @@ - + In stock: In voorraad: @@ -5038,8 +5038,8 @@ - - + + Amount in gr: Gewicht in gr: @@ -5097,8 +5097,8 @@ - - + + Amount in ml: Hoeveelheid in ml: @@ -5109,13 +5109,13 @@ - + Primary Hoofdgisting - + Secondary Nagisting/lagering @@ -5176,139 +5176,139 @@ Gist is al verwerkt - + Method Methode - + Inj. factor Injectie - + New cells Celgroei - + Total cells Totaal - + Grow factor Groeifactor - + BMSapp - Pitchrate BMSapp - Gist enten - + Beer pitch type: Biergist nodig: - - 0.075 Real Kveik - 0,075 Echte Kveik - - - 0.75 Ale, upto 1.060 - 0,75 Bovengist tot 1.060 + 0.075 Real Kveik + 0,075 Echte Kveik - 1.0 Ale, above 1.060 - 1,0 Bovengist hoger 1.060 + 0.75 Ale, upto 1.060 + 0,75 Bovengist tot 1.060 - 1.5 Lager, upto 1.060 - 1,5 Ondergist tot 1.060 + 1.0 Ale, above 1.060 + 1,0 Bovengist hoger 1.060 + 1.5 Lager, upto 1.060 + 1,5 Ondergist tot 1.060 + + + 2.0 Lager, above 1.060 2,0 Ondergist hoger 1.060 - + Retry starter Ververs starter - + Retry to automatic create starter steps Ververs de starter stappen automatisch - + Start step type: Starter stap type: - + Starter step volume: Starter stap volume: - - Stirred - Geroerd - - - Shaken - Geschud + Stirred + Geroerd + Shaken + Geschud + + + Simple Simpel - + Delete yeast Verwijder gist - - + + Total packs: Aantal pakken: - + Yeast name: Gist naam: - - + + Laboratory: Laboratorium: - + Select yeast: Kies gist: - + Select package: Kies verpakking: - - Tertiary - Lageren - - + Tertiary + Lageren + + + Bottle Bottelen