--- a/src/EditRecipeTab4.cpp Sun Jun 12 20:06:39 2022 +0200 +++ b/src/EditRecipeTab4.cpp Mon Jun 13 10:54:23 2022 +0200 @@ -20,15 +20,15 @@ bool EditRecipe::misc_sort_test(const Miscs &D1, const Miscs &D2) { - if (D1.m_use_use > D2.m_use_use) + if (D1.use_use > D2.use_use) return false; - if (D1.m_use_use < D2.m_use_use) + if (D1.use_use < D2.use_use) return true; - if (D1.m_type > D2.m_type) + if (D1.type > D2.type) return false; - if (D1.m_type < D2.m_type) + if (D1.type < D2.type) return true; - return (D1.m_amount > D2.m_amount); + return (D1.amount > D2.amount); } @@ -68,30 +68,30 @@ for (int i = 0; i < recipe->miscs.size(); i++) { - ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).m_name)); + ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).name)); - item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).m_type]); + item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).type]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 1, item); - item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).m_use_use]); + item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).use_use]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(i, 2, item); - if (recipe->miscs.at(i).m_use_use == MISC_USES_BOIL) { - item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(i).m_time, 1, 'f', 0, '0')); - } else if (recipe->miscs.at(i).m_use_use == MISC_USES_PRIMARY || recipe->miscs.at(i).m_use_use == MISC_USES_SECONDARY) { - item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(i).m_time / 1440, 1, 'f', 0, '0')); + if (recipe->miscs.at(i).use_use == MISC_USES_BOIL) { + item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(i).time, 1, 'f', 0, '0')); + } else if (recipe->miscs.at(i).use_use == MISC_USES_PRIMARY || recipe->miscs.at(i).use_use == MISC_USES_SECONDARY) { + item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(i).time / 1440, 1, 'f', 0, '0')); } else { item = new QTableWidgetItem(QString("")); } item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->miscsTable->setItem(i, 3, item); - if (recipe->miscs.at(i).m_amount_is_weight) - item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0')); + if (recipe->miscs.at(i).amount_is_weight) + item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0')); else - item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0')); + item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0')); item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->miscsTable->setItem(i, 4, item); @@ -99,7 +99,7 @@ * Add the Delete and Edit row buttons. * Not for water agents, these are set on the water tab. */ - if (recipe->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) { + if (recipe->miscs.at(i).type == MISC_TYPES_WATER_AGENT) { ui->miscsTable->removeCellWidget(i, 5); ui->miscsTable->removeCellWidget(i, 6); item = new QTableWidgetItem(""); @@ -141,45 +141,45 @@ /* * Update the water agents. */ - if (recipe->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) { - if (recipe->miscs.at(i).m_name == "CaCl2") { - ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "CaSO4") { - ui->bs_caso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "MgSO4") { - ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "NaCl") { - ui->bs_naclEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "MgCl2") { - ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "NaHCO3") { - ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "CaCO3") { - ui->bs_caco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Melkzuur" || recipe->miscs.at(i).m_name == "Lactic") { + if (recipe->miscs.at(i).type == MISC_TYPES_WATER_AGENT) { + if (recipe->miscs.at(i).name == "CaCl2") { + ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "CaSO4") { + ui->bs_caso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "MgSO4") { + ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "NaCl") { + ui->bs_naclEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "MgCl2") { + ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "NaHCO3") { + ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "CaCO3") { + ui->bs_caco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Melkzuur" || recipe->miscs.at(i).name == "Lactic") { recipe->wa_acid_name = 0; recipe->wa_acid_perc = my_acids.at(0).AcidPrc; ui->mw_acidPick->setCurrentIndex(0); ui->mw_acidpercEdit->setValue(my_acids.at(0).AcidPrc); - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Zoutzuur" || recipe->miscs.at(i).m_name == "Hydrochloric") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Zoutzuur" || recipe->miscs.at(i).name == "Hydrochloric") { recipe->wa_acid_name = 1; recipe->wa_acid_perc = my_acids.at(1).AcidPrc; ui->mw_acidPick->setCurrentIndex(1); ui->mw_acidpercEdit->setValue(my_acids.at(1).AcidPrc); - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Fosforzuur" || recipe->miscs.at(i).m_name == "Phosphoric") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Fosforzuur" || recipe->miscs.at(i).name == "Phosphoric") { recipe->wa_acid_name = 2; recipe->wa_acid_perc = my_acids.at(2).AcidPrc; ui->mw_acidPick->setCurrentIndex(2); ui->mw_acidpercEdit->setValue(my_acids.at(2).AcidPrc); - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Zwavelzuur" || recipe->miscs.at(i).m_name == "Sulfuric") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Zwavelzuur" || recipe->miscs.at(i).name == "Sulfuric") { recipe->wa_acid_name = 3; recipe->wa_acid_perc = my_acids.at(3).AcidPrc; ui->mw_acidPick->setCurrentIndex(3); ui->mw_acidpercEdit->setValue(my_acids.at(3).AcidPrc); - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); } } } @@ -199,7 +199,7 @@ * Remove this salt if it is in the table. */ for (int i = 0; i < recipe->miscs.size(); i++) { - if (salt.contains(recipe->miscs.at(i).m_name)) { + if (salt.contains(recipe->miscs.at(i).name)) { qDebug() << " brewing_salt_sub delete" << salt; recipe->miscs.removeAt(i); refreshMiscs(); @@ -214,9 +214,9 @@ * If it is, update the amount. */ for (int i = 0; i < recipe->miscs.size(); i++) { - if (salt.contains(recipe->miscs.at(i).m_name)) { - recipe->miscs[i].m_amount = val / 1000.0; - if (recipe->miscs.at(i).m_amount_is_weight) + if (salt.contains(recipe->miscs.at(i).name)) { + recipe->miscs[i].amount = val / 1000.0; + if (recipe->miscs.at(i).amount_is_weight) item = new QTableWidgetItem(QString("%1 gr").arg(val, 3, 'f', 2, '0')); else item = new QTableWidgetItem(QString("%1 ml").arg(val, 3, 'f', 2, '0')); @@ -237,13 +237,13 @@ if (salt.contains(query.value(1).toString())) { qDebug() << " found it, append"; Miscs m; - m.m_name = query.value(1).toString(); - m.m_amount = val / 1000.0; - m.m_type = query.value(2).toInt(); - m.m_use_use = query.value(3).toInt(); - m.m_time = query.value(4).toDouble(); - m.m_amount_is_weight = query.value(5).toInt() ? true:false; - m.m_cost = query.value(10).toDouble(); + m.name = query.value(1).toString(); + m.amount = val / 1000.0; + m.type = query.value(2).toInt(); + m.use_use = query.value(3).toInt(); + m.time = query.value(4).toDouble(); + m.amount_is_weight = query.value(5).toInt() ? true:false; + m.cost = query.value(10).toDouble(); recipe->miscs.append(m); refreshMiscs(); return; @@ -272,17 +272,17 @@ Miscs newm; for (int i = 0; i < recipe->miscs.size(); i++) { - if (recipe->miscs.at(i).m_amount == 0) + if (recipe->miscs.at(i).amount == 0) return; // Add only one at a time. } - newm.m_name = "Select one"; - newm.m_amount = 0; - newm.m_type = 0; - newm.m_use_use = 0; - newm.m_time = 0; - newm.m_amount_is_weight = true; - newm.m_cost = 0; + newm.name = "Select one"; + newm.amount = 0; + newm.type = 0; + newm.use_use = 0; + newm.time = 0; + newm.amount_is_weight = true; + newm.cost = 0; recipe->miscs.append(newm); is_changed(); refreshMiscs(); @@ -298,7 +298,7 @@ int row = pb->objectName().toInt(); qDebug() << "Delete misc row" << row << recipe->miscs.size(); - int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(recipe->miscs.at(row).m_name), + int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(recipe->miscs.at(row).name), QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (rc == QMessageBox::No) return; @@ -315,11 +315,11 @@ qDebug() << "misc_amount_changed()" << recipe->miscs_row << val; - recipe->miscs[recipe->miscs_row].m_amount = val / 1000.0; - if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight) { - item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0')); + recipe->miscs[recipe->miscs_row].amount = val / 1000.0; + if (recipe->miscs.at(recipe->miscs_row).amount_is_weight) { + item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0')); } else { - item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0')); + item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0')); } item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 4, item); @@ -334,12 +334,12 @@ qDebug() << "misc_time_changed()" << recipe->miscs_row << val; - if (recipe->miscs.at(recipe->miscs_row).m_use_use == MISC_USES_BOIL) { - recipe->miscs[recipe->miscs_row].m_time = val; + if (recipe->miscs.at(recipe->miscs_row).use_use == MISC_USES_BOIL) { + recipe->miscs[recipe->miscs_row].time = val; item = new QTableWidgetItem(QString("%1 min.").arg(val, 1, 'f', 0, '0')); - } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == MISC_USES_PRIMARY || - recipe->miscs.at(recipe->miscs_row).m_use_use == MISC_USES_SECONDARY) { - recipe->miscs[recipe->miscs_row].m_time = val * 1440; + } else if (recipe->miscs.at(recipe->miscs_row).use_use == MISC_USES_PRIMARY || + recipe->miscs.at(recipe->miscs_row).use_use == MISC_USES_SECONDARY) { + recipe->miscs[recipe->miscs_row].time = val * 1440; item = new QTableWidgetItem(QString("%1 days.").arg(val, 1, 'f', 0, '0')); } else { item = new QTableWidgetItem(QString("")); @@ -382,38 +382,38 @@ /* * Replace the misc record contents */ - recipe->miscs[recipe->miscs_row].m_name = query.value(0).toString(); - recipe->miscs[recipe->miscs_row].m_type = query.value(1).toInt(); - recipe->miscs[recipe->miscs_row].m_use_use = query.value(2).toInt(); - recipe->miscs[recipe->miscs_row].m_time = query.value(3).toDouble(); - recipe->miscs[recipe->miscs_row].m_amount_is_weight = query.value(4).toInt() ? true:false; - recipe->miscs[recipe->miscs_row].m_cost = query.value(5).toDouble(); + recipe->miscs[recipe->miscs_row].name = query.value(0).toString(); + recipe->miscs[recipe->miscs_row].type = query.value(1).toInt(); + recipe->miscs[recipe->miscs_row].use_use = query.value(2).toInt(); + recipe->miscs[recipe->miscs_row].time = query.value(3).toDouble(); + recipe->miscs[recipe->miscs_row].amount_is_weight = query.value(4).toInt() ? true:false; + recipe->miscs[recipe->miscs_row].cost = query.value(5).toDouble(); /* * Update the visible fields */ - mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name); - ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).m_name)); + mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).name); + ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).name)); - item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).m_type]); + item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).type]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 1, item); - item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]); + item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).use_use]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 2, item); - useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use); + useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).use_use); - if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) { // Fermentation stages - mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time / 1440); + if (recipe->miscs.at(recipe->miscs_row).use_use == 3 || recipe->miscs.at(recipe->miscs_row).use_use == 4) { // Fermentation stages + mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time / 1440); mtimeEdit->setReadOnly(false); mtimeLabel->setText(tr("Time in days:")); - item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).m_time / 1440, 1, 'f', 0, '0')); - } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2) { // Boil - mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time); + item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).time / 1440, 1, 'f', 0, '0')); + } else if (recipe->miscs.at(recipe->miscs_row).use_use == 2) { // Boil + mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time); mtimeEdit->setReadOnly(false); mtimeLabel->setText(tr("Time in minutes:")); - item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).m_time, 1, 'f', 0, '0')); + item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).time, 1, 'f', 0, '0')); } else { mtimeEdit->setReadOnly(true); mtimeLabel->setText(""); @@ -422,12 +422,12 @@ item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 3, item); - if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight) { + if (recipe->miscs.at(recipe->miscs_row).amount_is_weight) { mamountLabel->setText(tr("Amount in gr:")); - item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0')); + item = new QTableWidgetItem(QString("%1 gr").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0')); } else { mamountLabel->setText(tr("Amount in ml:")); - item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0')); + item = new QTableWidgetItem(QString("%1 ml").arg(recipe->miscs.at(recipe->miscs_row).amount * 1000.0, 3, 'f', 2, '0')); } item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 4, item); @@ -439,9 +439,9 @@ * The order of the list is changed, lookup the item we just added. */ for (int i = 0; i < recipe->miscs.size(); i++) { - if ((recipe->miscs.at(i).m_name == query.value(0).toString()) && - (recipe->miscs.at(i).m_type == query.value(1).toInt()) && - (recipe->miscs.at(i).m_use_use == query.value(2).toInt())) { + if ((recipe->miscs.at(i).name == query.value(0).toString()) && + (recipe->miscs.at(i).type == query.value(1).toInt()) && + (recipe->miscs.at(i).use_use == query.value(2).toInt())) { recipe->miscs_row = i; break; } @@ -479,23 +479,23 @@ QTableWidgetItem *item; qDebug() << "misc_useat_changed" << val; - recipe->miscs[recipe->miscs_row].m_use_use = val; + recipe->miscs[recipe->miscs_row].use_use = val; item = new QTableWidgetItem(misc_uses[val]); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); ui->miscsTable->setItem(recipe->miscs_row, 2, item); if (val == MISC_USES_PRIMARY || val == MISC_USES_SECONDARY) { - recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value() * 1440; + recipe->miscs[recipe->miscs_row].time = mtimeEdit->value() * 1440; mtimeEdit->setReadOnly(false); mtimeLabel->setText(tr("Time in days:")); - item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).m_time / 1440, 1, 'f', 0, '0')); + item = new QTableWidgetItem(QString("%1 days.").arg(recipe->miscs.at(recipe->miscs_row).time / 1440, 1, 'f', 0, '0')); } else if (val == MISC_USES_BOIL) { - recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value(); + recipe->miscs[recipe->miscs_row].time = mtimeEdit->value(); mtimeEdit->setReadOnly(false); mtimeLabel->setText(tr("Time in minutes:")); - item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).m_time, 1, 'f', 0, '0')); + item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(recipe->miscs_row).time, 1, 'f', 0, '0')); } else { - recipe->miscs[recipe->miscs_row].m_time = 0; + recipe->miscs[recipe->miscs_row].time = 0; mtimeEdit->setValue(0); mtimeEdit->setReadOnly(true); mtimeLabel->setText(""); @@ -538,7 +538,7 @@ mamountLabel = new QLabel(dialog); mamountLabel->setObjectName(QString::fromUtf8("mamountLabel")); - if (recipe->miscs.at(recipe->miscs_row).m_amount_is_weight) + if (recipe->miscs.at(recipe->miscs_row).amount_is_weight) mamountLabel->setText(tr("Amount in gr:")); else mamountLabel->setText(tr("Amount in ml:")); @@ -547,9 +547,9 @@ mtimeLabel = new QLabel(dialog); mtimeLabel->setObjectName(QString::fromUtf8("mtimeLabel")); - if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) // Fermentation stages + if (recipe->miscs.at(recipe->miscs_row).use_use == 3 || recipe->miscs.at(recipe->miscs_row).use_use == 4) // Fermentation stages mtimeLabel->setText(tr("Time in days:")); - else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2) // Boil + else if (recipe->miscs.at(recipe->miscs_row).use_use == 2) // Boil mtimeLabel->setText(tr("Time in minutes:")); else mtimeLabel->setText(""); @@ -573,7 +573,7 @@ mnameEdit = new QLineEdit(dialog); mnameEdit->setObjectName(QString::fromUtf8("mnameEdit")); - mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name); + mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).name); mnameEdit->setGeometry(QRect(160, 10, 511, 23)); mnameEdit->setReadOnly(true); @@ -585,7 +585,7 @@ mamountEdit->setDecimals(2); mamountEdit->setMaximum(1000000.0); mamountEdit->setSingleStep(0.1); - mamountEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_amount * 1000.0); + mamountEdit->setValue(recipe->miscs.at(recipe->miscs_row).amount * 1000.0); mtimeEdit = new QSpinBox(dialog); mtimeEdit->setObjectName(QString::fromUtf8("mtimeEdit")); @@ -593,11 +593,11 @@ mtimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); mtimeEdit->setAccelerated(true); mtimeEdit->setMaximum(10000.0); - if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) { // Fermentation stages - mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time / 1440); + if (recipe->miscs.at(recipe->miscs_row).use_use == 3 || recipe->miscs.at(recipe->miscs_row).use_use == 4) { // Fermentation stages + mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time / 1440); mtimeEdit->setReadOnly(false); - } else if (recipe->miscs.at(recipe->miscs_row).m_use_use == 2) { // Boil - mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).m_time); + } else if (recipe->miscs.at(recipe->miscs_row).use_use == 2) { // Boil + mtimeEdit->setValue(recipe->miscs.at(recipe->miscs_row).time); mtimeEdit->setReadOnly(false); } else { mtimeEdit->setReadOnly(true); @@ -612,7 +612,7 @@ useatEdit->addItem(tr("Primary")); useatEdit->addItem(tr("Secondary")); useatEdit->addItem(tr("Bottling")); - useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use); + useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).use_use); minstockEdit = new QCheckBox(dialog); minstockEdit->setObjectName(QString::fromUtf8("minstockEdit")); @@ -636,11 +636,11 @@ recipe->miscs[recipe->miscs_row] = backup; } else { /* Clear time if misc is not used for boil or fermentation. */ - if (! (recipe->miscs.at(recipe->miscs_row).m_use_use == 2 || - recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || - recipe->miscs.at(recipe->miscs_row).m_use_use == 4)) { - if (recipe->miscs.at(recipe->miscs_row).m_time) { - recipe->miscs[recipe->miscs_row].m_time = 0; + if (! (recipe->miscs.at(recipe->miscs_row).use_use == 2 || + recipe->miscs.at(recipe->miscs_row).use_use == 3 || + recipe->miscs.at(recipe->miscs_row).use_use == 4)) { + if (recipe->miscs.at(recipe->miscs_row).time) { + recipe->miscs[recipe->miscs_row].time = 0; is_changed(); } } @@ -674,35 +674,35 @@ const QSignalBlocker blocker9(ui->mw_acidvolEdit); for (int i = 0; i < recipe->miscs.size(); i++) { - amount = recipe->miscs.at(i).m_amount * factor; - recipe->miscs[i].m_amount = amount; + amount = recipe->miscs.at(i).amount * factor; + recipe->miscs[i].amount = amount; /* * Update the water agents. */ - if (recipe->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) { - if (recipe->miscs.at(i).m_name == "CaCl2") { - ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "CaSO4") { - ui->bs_caso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "MgSO4") { - ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "NaCl") { - ui->bs_naclEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "MgCl2") { - ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "NaHCO3") { - ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "CaCO3") { - ui->bs_caco3Edit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Melkzuur" || recipe->miscs.at(i).m_name == "Lactic") { - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Zoutzuur" || recipe->miscs.at(i).m_name == "Hydrochloric") { - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Fosforzuur" || recipe->miscs.at(i).m_name == "Phosphoric") { - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); - } else if (recipe->miscs.at(i).m_name == "Zwavelzuur" || recipe->miscs.at(i).m_name == "Sulfuric") { - ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).m_amount * 1000.0); + if (recipe->miscs.at(i).type == MISC_TYPES_WATER_AGENT) { + if (recipe->miscs.at(i).name == "CaCl2") { + ui->bs_cacl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "CaSO4") { + ui->bs_caso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "MgSO4") { + ui->bs_mgso4Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "NaCl") { + ui->bs_naclEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "MgCl2") { + ui->bs_mgcl2Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "NaHCO3") { + ui->bs_nahco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "CaCO3") { + ui->bs_caco3Edit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Melkzuur" || recipe->miscs.at(i).name == "Lactic") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Zoutzuur" || recipe->miscs.at(i).name == "Hydrochloric") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Fosforzuur" || recipe->miscs.at(i).name == "Phosphoric") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); + } else if (recipe->miscs.at(i).name == "Zwavelzuur" || recipe->miscs.at(i).name == "Sulfuric") { + ui->mw_acidvolEdit->setValue(recipe->miscs.at(i).amount * 1000.0); } } }