diff -r b8232133a12d -r 49ec4fdee5a6 src/EditProduct.cpp --- a/src/EditProduct.cpp Wed May 11 22:26:15 2022 +0200 +++ b/src/EditProduct.cpp Thu May 12 14:34:53 2022 +0200 @@ -610,6 +610,8 @@ m.ramp_time = obj["ramp_time"].toDouble(); m.end_temp = obj["end_temp"].toDouble(); m.step_wg_ratio = obj["step_wg_ratio"].toDouble(); + m.step_ph = obj["step_ph"].toDouble(); + m.step_sg = obj["step_sg"].toDouble(); product->mashs.append(m); } } @@ -1105,8 +1107,8 @@ return; } - qDebug() << "calcSupplies() f:" << product->fermentables_ok << "h:" << product->hops_ok << "m:" << product->miscs_ok /*<< "y:" << product->yeasts_ok << "w:" << product->waters_ok*/; - if (product->fermentables_ok && product->hops_ok && product->miscs_ok /*&& product->yeasts_ok && product->waters_ok */) { + qDebug() << "calcSupplies() f:" << product->fermentables_ok << "h:" << product->hops_ok << "m:" << product->miscs_ok << "y:" << product->yeasts_ok /*<< "w:" << product->waters_ok*/; + if (product->fermentables_ok && product->hops_ok && product->miscs_ok && product->yeasts_ok /*&& product->waters_ok */) { ui->ok_pmptIcon->setPixmap(QPixmap(QString::fromUtf8(":/icons/silk/tick.png"))); } else { ui->ok_pmptIcon->setPixmap(QPixmap(QString::fromUtf8(":/icons/silk/cancel.png"))); @@ -1670,6 +1672,8 @@ obj.insert("ramp_time", round(product->mashs.at(i).ramp_time * 100) / 100); obj.insert("end_temp", round(product->mashs.at(i).end_temp * 100) / 100); obj.insert("step_wg_ratio", round(product->mashs.at(i).step_wg_ratio * 100) / 100); + obj.insert("step_ph", round(product->mashs.at(i).step_ph * 100) / 100); + obj.insert("step_sg", round(product->mashs.at(i).step_sg * 10000) / 10000); qDebug() << "mashs_Json" << i << obj; array.append(obj); /* Append this object */ }