--- a/src/EditProductTab5.cpp Sun Jun 12 20:06:39 2022 +0200
+++ b/src/EditProductTab5.cpp Mon Jun 13 10:54:23 2022 +0200
@@ -20,15 +20,15 @@
bool EditProduct::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);
}
@@ -69,39 +69,39 @@
for (int i = 0; i < product->miscs.size(); i++) {
- ui->miscsTable->setItem(i, 0, new QTableWidgetItem(product->miscs.at(i).m_name));
+ ui->miscsTable->setItem(i, 0, new QTableWidgetItem(product->miscs.at(i).name));
- item = new QTableWidgetItem(misc_types[product->miscs.at(i).m_type]);
+ item = new QTableWidgetItem(misc_types[product->miscs.at(i).type]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->miscsTable->setItem(i, 1, item);
- item = new QTableWidgetItem(misc_uses[product->miscs.at(i).m_use_use]);
+ item = new QTableWidgetItem(misc_uses[product->miscs.at(i).use_use]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->miscsTable->setItem(i, 2, item);
- if (product->miscs.at(i).m_use_use == MISC_USES_BOIL) {
- item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(i).m_time, 1, 'f', 0, '0'));
- } else if (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY || product->miscs.at(i).m_use_use == MISC_USES_SECONDARY) {
- item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(i).m_time / 1440, 1, 'f', 0, '0'));
+ if (product->miscs.at(i).use_use == MISC_USES_BOIL) {
+ item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(i).time, 1, 'f', 0, '0'));
+ } else if (product->miscs.at(i).use_use == MISC_USES_PRIMARY || product->miscs.at(i).use_use == MISC_USES_SECONDARY) {
+ item = new QTableWidgetItem(QString("%1 days.").arg(product->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 (product->miscs.at(i).m_amount_is_weight)
- item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0'));
+ if (product->miscs.at(i).amount_is_weight)
+ item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0'));
else
- item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).m_amount * 1000.0, 3, 'f', 2, '0'));
+ item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).amount * 1000.0, 3, 'f', 2, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->miscsTable->setItem(i, 4, item);
- if (product->miscs.at(i).m_amount_is_weight)
- item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).m_inventory * 1000.0, 3, 'f', 2, '0'));
+ if (product->miscs.at(i).amount_is_weight)
+ item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
else
- item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).m_inventory * 1000.0, 3, 'f', 2, '0'));
+ item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- if (product->miscs.at(i).m_inventory < product->miscs.at(i).m_amount)
+ if (product->miscs.at(i).inventory < product->miscs.at(i).amount)
item->setForeground(QBrush(QColor(Qt::red)));
ui->miscsTable->setItem(i, 5, item);
@@ -109,7 +109,7 @@
* Add the Delete and Edit row buttons.
* Not for water agents, these are set on the water tab.
*/
- if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
+ if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
ui->miscsTable->removeCellWidget(i, 6); /* to remove the unneeded button */
item = new QTableWidgetItem("");
item->setToolTip(tr("Edit this from the water tab"));
@@ -151,45 +151,45 @@
/*
* Update the water agents.
*/
- if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
- if (product->miscs.at(i).m_name == "CaCl2") {
- ui->bs_cacl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "CaSO4") {
- ui->bs_caso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "MgSO4") {
- ui->bs_mgso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "NaCl") {
- ui->bs_naclEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "MgCl2") {
- ui->bs_mgcl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "NaHCO3") {
- ui->bs_nahco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "CaCO3") {
- ui->bs_caco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Melkzuur" || product->miscs.at(i).m_name == "Lactic") {
+ if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+ if (product->miscs.at(i).name == "CaCl2") {
+ ui->bs_cacl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "CaSO4") {
+ ui->bs_caso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "MgSO4") {
+ ui->bs_mgso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "NaCl") {
+ ui->bs_naclEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "MgCl2") {
+ ui->bs_mgcl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "NaHCO3") {
+ ui->bs_nahco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "CaCO3") {
+ ui->bs_caco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Melkzuur" || product->miscs.at(i).name == "Lactic") {
product->wa_acid_name = 0;
product->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(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Zoutzuur" || product->miscs.at(i).m_name == "Hydrochloric") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Zoutzuur" || product->miscs.at(i).name == "Hydrochloric") {
product->wa_acid_name = 1;
product->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(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Fosforzuur" || product->miscs.at(i).m_name == "Phosphoric") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Fosforzuur" || product->miscs.at(i).name == "Phosphoric") {
product->wa_acid_name = 2;
product->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(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Zwavelzuur" || product->miscs.at(i).m_name == "Sulfuric") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Zwavelzuur" || product->miscs.at(i).name == "Sulfuric") {
product->wa_acid_name = 3;
product->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(product->miscs.at(i).m_amount * 1000.0);
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
}
}
}
@@ -200,11 +200,11 @@
{
product->miscs_ok = true;
for (int i = 0; i < product->miscs.size(); i++) {
- if ((((product->inventory_reduced <= PROD_STAGE_BREW) && (product->miscs.at(i).m_use_use <= MISC_USES_BOIL)) || // Starter, Mash, Boil
- ((product->inventory_reduced <= PROD_STAGE_PRIMARY) && (product->miscs.at(i).m_use_use == MISC_USES_PRIMARY)) ||
- ((product->inventory_reduced <= PROD_STAGE_TERTIARY) && (product->miscs.at(i).m_use_use == MISC_USES_SECONDARY)) ||
- ((product->inventory_reduced <= PROD_STAGE_PACKAGE) && (product->miscs.at(i).m_use_use == MISC_USES_BOTTLING))) &&
- (product->miscs.at(i).m_inventory < product->miscs.at(i).m_amount)) {
+ if ((((product->inventory_reduced <= PROD_STAGE_BREW) && (product->miscs.at(i).use_use <= MISC_USES_BOIL)) || // Starter, Mash, Boil
+ ((product->inventory_reduced <= PROD_STAGE_PRIMARY) && (product->miscs.at(i).use_use == MISC_USES_PRIMARY)) ||
+ ((product->inventory_reduced <= PROD_STAGE_TERTIARY) && (product->miscs.at(i).use_use == MISC_USES_SECONDARY)) ||
+ ((product->inventory_reduced <= PROD_STAGE_PACKAGE) && (product->miscs.at(i).use_use == MISC_USES_BOTTLING))) &&
+ (product->miscs.at(i).inventory < product->miscs.at(i).amount)) {
product->miscs_ok = false;
}
}
@@ -224,7 +224,7 @@
* Remove this salt if it is in the table.
*/
for (int i = 0; i < product->miscs.size(); i++) {
- if (salt.contains(product->miscs.at(i).m_name)) {
+ if (salt.contains(product->miscs.at(i).name)) {
qDebug() << " brewing_salt_sub delete" << salt;
product->miscs.removeAt(i);
refreshMiscs();
@@ -240,9 +240,9 @@
* If it is, update the amount.
*/
for (int i = 0; i < product->miscs.size(); i++) {
- if (salt.contains(product->miscs.at(i).m_name)) {
- product->miscs[i].m_amount = val / 1000.0;
- if (product->miscs.at(i).m_amount_is_weight)
+ if (salt.contains(product->miscs.at(i).name)) {
+ product->miscs[i].amount = val / 1000.0;
+ if (product->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'));
@@ -263,14 +263,14 @@
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.m_inventory = query.value(9).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();
+ m.inventory = query.value(9).toDouble();
product->miscs.append(m);
refreshMiscs();
return;
@@ -299,17 +299,17 @@
Miscs newm;
for (int i = 0; i < product->miscs.size(); i++) {
- if (product->miscs.at(i).m_amount == 0)
+ if (product->miscs.at(i).amount == 0)
return; // Add only one at a time.
}
- newm.m_name = "Select one";
- newm.m_amount = 0;
- newm.m_type = MISC_TYPES_SPICE;
- newm.m_use_use = MISC_USES_STARTER;
- newm.m_time = 0;
- newm.m_amount_is_weight = true;
- newm.m_cost = 0;
+ newm.name = "Select one";
+ newm.amount = 0;
+ newm.type = MISC_TYPES_SPICE;
+ newm.use_use = MISC_USES_STARTER;
+ newm.time = 0;
+ newm.amount_is_weight = true;
+ newm.cost = 0;
product->miscs.append(newm);
is_changed();
refreshMiscs();
@@ -325,7 +325,7 @@
int row = pb->objectName().toInt();
qDebug() << "Delete misc row" << row << product->miscs.size();
- int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(product->miscs.at(row).m_name),
+ int rc = QMessageBox::warning(this, tr("Delete misc"), tr("Delete %1").arg(product->miscs.at(row).name),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (rc == QMessageBox::No)
return;
@@ -342,11 +342,11 @@
qDebug() << "misc_amount_changed()" << product->miscs_row << val;
- product->miscs[product->miscs_row].m_amount = val / 1000.0;
- if (product->miscs.at(product->miscs_row).m_amount_is_weight) {
- item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+ product->miscs[product->miscs_row].amount = val / 1000.0;
+ if (product->miscs.at(product->miscs_row).amount_is_weight) {
+ item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
} else {
- item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+ item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
}
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->miscsTable->setItem(product->miscs_row, 4, item);
@@ -361,12 +361,12 @@
qDebug() << "misc_time_changed()" << product->miscs_row << val;
- if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL) {
- product->miscs[product->miscs_row].m_time = val;
+ if (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL) {
+ product->miscs[product->miscs_row].time = val;
item = new QTableWidgetItem(QString("%1 min.").arg(val, 1, 'f', 0, '0'));
- } else if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY ||
- product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY) {
- product->miscs[product->miscs_row].m_time = val * 1440;
+ } else if (product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY ||
+ product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY) {
+ product->miscs[product->miscs_row].time = val * 1440;
item = new QTableWidgetItem(QString("%1 days.").arg(val, 1, 'f', 0, '0'));
} else {
item = new QTableWidgetItem(QString(""));
@@ -409,39 +409,39 @@
/*
* Replace the misc record contents
*/
- product->miscs[product->miscs_row].m_name = query.value(0).toString();
- product->miscs[product->miscs_row].m_type = query.value(1).toInt();
- product->miscs[product->miscs_row].m_use_use = query.value(2).toInt();
- product->miscs[product->miscs_row].m_time = query.value(3).toDouble();
- product->miscs[product->miscs_row].m_amount_is_weight = query.value(4).toInt() ? true:false;
- product->miscs[product->miscs_row].m_cost = query.value(5).toDouble();
- product->miscs[product->miscs_row].m_inventory = query.value(6).toDouble();
+ product->miscs[product->miscs_row].name = query.value(0).toString();
+ product->miscs[product->miscs_row].type = query.value(1).toInt();
+ product->miscs[product->miscs_row].use_use = query.value(2).toInt();
+ product->miscs[product->miscs_row].time = query.value(3).toDouble();
+ product->miscs[product->miscs_row].amount_is_weight = query.value(4).toInt() ? true:false;
+ product->miscs[product->miscs_row].cost = query.value(5).toDouble();
+ product->miscs[product->miscs_row].inventory = query.value(6).toDouble();
/*
* Update the visible fields
*/
- mnameEdit->setText(product->miscs.at(product->miscs_row).m_name);
- ui->miscsTable->setItem(product->miscs_row, 0, new QTableWidgetItem(product->miscs.at(product->miscs_row).m_name));
+ mnameEdit->setText(product->miscs.at(product->miscs_row).name);
+ ui->miscsTable->setItem(product->miscs_row, 0, new QTableWidgetItem(product->miscs.at(product->miscs_row).name));
- item = new QTableWidgetItem(misc_types[product->miscs.at(product->miscs_row).m_type]);
+ item = new QTableWidgetItem(misc_types[product->miscs.at(product->miscs_row).type]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->miscsTable->setItem(product->miscs_row, 1, item);
- item = new QTableWidgetItem(misc_uses[product->miscs.at(product->miscs_row).m_use_use]);
+ item = new QTableWidgetItem(misc_uses[product->miscs.at(product->miscs_row).use_use]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->miscsTable->setItem(product->miscs_row, 2, item);
- useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).m_use_use);
+ useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).use_use);
- if (product->miscs.at(product->miscs_row).m_use_use == 3 || product->miscs.at(product->miscs_row).m_use_use == 4) { // Fermentation stages
- mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time / 1440);
+ if (product->miscs.at(product->miscs_row).use_use == 3 || product->miscs.at(product->miscs_row).use_use == 4) { // Fermentation stages
+ mtimeEdit->setValue(product->miscs.at(product->miscs_row).time / 1440);
mtimeEdit->setReadOnly(false);
mtimeLabel->setText(tr("Time in days:"));
- item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).m_time / 1440, 1, 'f', 0, '0'));
- } else if (product->miscs.at(product->miscs_row).m_use_use == 2) { // Boil
- mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time);
+ item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).time / 1440, 1, 'f', 0, '0'));
+ } else if (product->miscs.at(product->miscs_row).use_use == 2) { // Boil
+ mtimeEdit->setValue(product->miscs.at(product->miscs_row).time);
mtimeEdit->setReadOnly(false);
mtimeLabel->setText(tr("Time in minutes:"));
- item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).m_time, 1, 'f', 0, '0'));
+ item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).time, 1, 'f', 0, '0'));
} else {
mtimeEdit->setReadOnly(true);
mtimeLabel->setText("");
@@ -450,22 +450,22 @@
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->miscsTable->setItem(product->miscs_row, 3, item);
- if (product->miscs.at(product->miscs_row).m_amount_is_weight) {
+ if (product->miscs.at(product->miscs_row).amount_is_weight) {
mamountLabel->setText(tr("Amount in gr:"));
- item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+ item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
} else {
mamountLabel->setText(tr("Amount in ml:"));
- item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).m_amount * 1000.0, 3, 'f', 2, '0'));
+ item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).amount * 1000.0, 3, 'f', 2, '0'));
}
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->miscsTable->setItem(product->miscs_row, 4, item);
- if (product->miscs.at(product->miscs_row).m_amount_is_weight)
- item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).m_inventory * 1000.0, 3, 'f', 2, '0'));
+ if (product->miscs.at(product->miscs_row).amount_is_weight)
+ item = new QTableWidgetItem(QString("%1 gr").arg(product->miscs.at(product->miscs_row).inventory * 1000.0, 3, 'f', 2, '0'));
else
- item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).m_inventory * 1000.0, 3, 'f', 2, '0'));
+ item = new QTableWidgetItem(QString("%1 ml").arg(product->miscs.at(product->miscs_row).inventory * 1000.0, 3, 'f', 2, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
- if (product->miscs.at(product->miscs_row).m_inventory < product->miscs.at(product->miscs_row).m_amount)
+ if (product->miscs.at(product->miscs_row).inventory < product->miscs.at(product->miscs_row).amount)
item->setForeground(QBrush(QColor(Qt::red)));
ui->miscsTable->setItem(product->miscs_row, 5, item);
@@ -476,9 +476,9 @@
* The order of the list is changed, lookup the item we just added.
*/
for (int i = 0; i < product->miscs.size(); i++) {
- if ((product->miscs.at(i).m_name == query.value(0).toString()) &&
- (product->miscs.at(i).m_type == query.value(1).toInt()) &&
- (product->miscs.at(i).m_use_use == query.value(2).toInt())) {
+ if ((product->miscs.at(i).name == query.value(0).toString()) &&
+ (product->miscs.at(i).type == query.value(1).toInt()) &&
+ (product->miscs.at(i).use_use == query.value(2).toInt())) {
product->miscs_row = i;
break;
}
@@ -516,23 +516,23 @@
QTableWidgetItem *item;
qDebug() << "misc_useat_changed" << val;
- product->miscs[product->miscs_row].m_use_use = val;
+ product->miscs[product->miscs_row].use_use = val;
item = new QTableWidgetItem(misc_uses[val]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->miscsTable->setItem(product->miscs_row, 2, item);
if (val == MISC_USES_PRIMARY || val == MISC_USES_SECONDARY) {
- product->miscs[product->miscs_row].m_time = mtimeEdit->value() * 1440;
+ product->miscs[product->miscs_row].time = mtimeEdit->value() * 1440;
mtimeEdit->setReadOnly(false);
mtimeLabel->setText(tr("Time in days:"));
- item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).m_time / 1440, 1, 'f', 0, '0'));
+ item = new QTableWidgetItem(QString("%1 days.").arg(product->miscs.at(product->miscs_row).time / 1440, 1, 'f', 0, '0'));
} else if (val == MISC_USES_BOIL) {
- product->miscs[product->miscs_row].m_time = mtimeEdit->value();
+ product->miscs[product->miscs_row].time = mtimeEdit->value();
mtimeEdit->setReadOnly(false);
mtimeLabel->setText(tr("Time in minutes:"));
- item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).m_time, 1, 'f', 0, '0'));
+ item = new QTableWidgetItem(QString("%1 min.").arg(product->miscs.at(product->miscs_row).time, 1, 'f', 0, '0'));
} else {
- product->miscs[product->miscs_row].m_time = 0;
+ product->miscs[product->miscs_row].time = 0;
mtimeEdit->setValue(0);
mtimeEdit->setReadOnly(true);
mtimeLabel->setText("");
@@ -575,7 +575,7 @@
mamountLabel = new QLabel(dialog);
mamountLabel->setObjectName(QString::fromUtf8("mamountLabel"));
- if (product->miscs.at(product->miscs_row).m_amount_is_weight)
+ if (product->miscs.at(product->miscs_row).amount_is_weight)
mamountLabel->setText(tr("Amount in gr:"));
else
mamountLabel->setText(tr("Amount in ml:"));
@@ -584,9 +584,9 @@
mtimeLabel = new QLabel(dialog);
mtimeLabel->setObjectName(QString::fromUtf8("mtimeLabel"));
- if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY)
+ if (product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY)
mtimeLabel->setText(tr("Time in days:"));
- else if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL)
+ else if (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL)
mtimeLabel->setText(tr("Time in minutes:"));
else
mtimeLabel->setText("");
@@ -610,7 +610,7 @@
mnameEdit = new QLineEdit(dialog);
mnameEdit->setObjectName(QString::fromUtf8("mnameEdit"));
- mnameEdit->setText(product->miscs.at(product->miscs_row).m_name);
+ mnameEdit->setText(product->miscs.at(product->miscs_row).name);
mnameEdit->setGeometry(QRect(160, 10, 511, 23));
mnameEdit->setReadOnly(true);
@@ -622,7 +622,7 @@
mamountEdit->setDecimals(2);
mamountEdit->setMaximum(1000000.0);
mamountEdit->setSingleStep(0.1);
- mamountEdit->setValue(product->miscs.at(product->miscs_row).m_amount * 1000.0);
+ mamountEdit->setValue(product->miscs.at(product->miscs_row).amount * 1000.0);
mtimeEdit = new QSpinBox(dialog);
mtimeEdit->setObjectName(QString::fromUtf8("mtimeEdit"));
@@ -630,11 +630,11 @@
mtimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
mtimeEdit->setAccelerated(true);
mtimeEdit->setMaximum(10000.0);
- if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY) {
- mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time / 1440);
+ if (product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY || product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY) {
+ mtimeEdit->setValue(product->miscs.at(product->miscs_row).time / 1440);
mtimeEdit->setReadOnly(false);
- } else if (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL) {
- mtimeEdit->setValue(product->miscs.at(product->miscs_row).m_time);
+ } else if (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL) {
+ mtimeEdit->setValue(product->miscs.at(product->miscs_row).time);
mtimeEdit->setReadOnly(false);
} else {
mtimeEdit->setReadOnly(true);
@@ -649,7 +649,7 @@
useatEdit->addItem(tr("Primary"));
useatEdit->addItem(tr("Secondary"));
useatEdit->addItem(tr("Bottling"));
- useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).m_use_use);
+ useatEdit->setCurrentIndex(product->miscs.at(product->miscs_row).use_use);
minstockEdit = new QCheckBox(dialog);
minstockEdit->setObjectName(QString::fromUtf8("minstockEdit"));
@@ -673,11 +673,11 @@
product->miscs[product->miscs_row] = backup;
} else {
/* Clear time if misc is not used for boil or fermentation. */
- if (! (product->miscs.at(product->miscs_row).m_use_use == MISC_USES_BOIL ||
- product->miscs.at(product->miscs_row).m_use_use == MISC_USES_PRIMARY ||
- product->miscs.at(product->miscs_row).m_use_use == MISC_USES_SECONDARY)) {
- if (product->miscs.at(product->miscs_row).m_time) {
- product->miscs[product->miscs_row].m_time = 0;
+ if (! (product->miscs.at(product->miscs_row).use_use == MISC_USES_BOIL ||
+ product->miscs.at(product->miscs_row).use_use == MISC_USES_PRIMARY ||
+ product->miscs.at(product->miscs_row).use_use == MISC_USES_SECONDARY)) {
+ if (product->miscs.at(product->miscs_row).time) {
+ product->miscs[product->miscs_row].time = 0;
is_changed();
}
}
@@ -711,35 +711,35 @@
const QSignalBlocker blocker9(ui->mw_acidvolEdit);
for (int i = 0; i < product->miscs.size(); i++) {
- amount = product->miscs.at(i).m_amount * factor;
- product->miscs[i].m_amount = amount;
+ amount = product->miscs.at(i).amount * factor;
+ product->miscs[i].amount = amount;
/*
* Update the water agents.
*/
- if (product->miscs.at(i).m_type == MISC_TYPES_WATER_AGENT) {
- if (product->miscs.at(i).m_name == "CaCl2") {
- ui->bs_cacl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "CaSO4") {
- ui->bs_caso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "MgSO4") {
- ui->bs_mgso4Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "NaCl") {
- ui->bs_naclEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "MgCl2") {
- ui->bs_mgcl2Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "NaHCO3") {
- ui->bs_nahco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "CaCO3") {
- ui->bs_caco3Edit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Melkzuur" || product->miscs.at(i).m_name == "Lactic") {
- ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Zoutzuur" || product->miscs.at(i).m_name == "Hydrochloric") {
- ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Fosforzuur" || product->miscs.at(i).m_name == "Phosphoric") {
- ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
- } else if (product->miscs.at(i).m_name == "Zwavelzuur" || product->miscs.at(i).m_name == "Sulfuric") {
- ui->mw_acidvolEdit->setValue(product->miscs.at(i).m_amount * 1000.0);
+ if (product->miscs.at(i).type == MISC_TYPES_WATER_AGENT) {
+ if (product->miscs.at(i).name == "CaCl2") {
+ ui->bs_cacl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "CaSO4") {
+ ui->bs_caso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "MgSO4") {
+ ui->bs_mgso4Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "NaCl") {
+ ui->bs_naclEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "MgCl2") {
+ ui->bs_mgcl2Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "NaHCO3") {
+ ui->bs_nahco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "CaCO3") {
+ ui->bs_caco3Edit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Melkzuur" || product->miscs.at(i).name == "Lactic") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Zoutzuur" || product->miscs.at(i).name == "Hydrochloric") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Fosforzuur" || product->miscs.at(i).name == "Phosphoric") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
+ } else if (product->miscs.at(i).name == "Zwavelzuur" || product->miscs.at(i).name == "Sulfuric") {
+ ui->mw_acidvolEdit->setValue(product->miscs.at(i).amount * 1000.0);
}
}
}