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"; }