--- a/src/EditRecipeTab3.cpp Mon Jun 13 12:26:27 2022 +0200
+++ b/src/EditRecipeTab3.cpp Mon Jun 13 15:47:16 2022 +0200
@@ -21,17 +21,17 @@
bool EditRecipe::hop_sort_test(const Hops &D1, const Hops &D2)
{
- if (D1.h_useat > D2.h_useat)
+ if (D1.useat > D2.useat)
return false;
- if (D1.h_useat < D2.h_useat)
+ if (D1.useat < D2.useat)
return true;
/* Same useat moments, test time. */
- if (D1.h_time < D2.h_time)
+ if (D1.time < D2.time)
return false;
- if (D1.h_time > D2.h_time)
+ if (D1.time > D2.time)
return true;
/* Finally consider the amounts */
- return (D1.h_amount > D2.h_amount);
+ return (D1.amount > D2.amount);
}
@@ -66,46 +66,46 @@
for (int i = 0; i < recipe->hops.size(); i++) {
- ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).h_origin));
- ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).h_name));
+ ui->hopsTable->setItem(i, 0, new QTableWidgetItem(recipe->hops.at(i).origin));
+ ui->hopsTable->setItem(i, 1, new QTableWidgetItem(recipe->hops.at(i).name));
- item = new QTableWidgetItem(hop_types[recipe->hops.at(i).h_type]);
+ item = new QTableWidgetItem(hop_types[recipe->hops.at(i).type]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 2, item);
- item = new QTableWidgetItem(hop_forms[recipe->hops.at(i).h_form]);
+ item = new QTableWidgetItem(hop_forms[recipe->hops.at(i).form]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 3, item);
- item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(i).h_alpha, 2, 'f', 1, '0'));
+ item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(i).alpha, 2, 'f', 1, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 4, item);
- item = new QTableWidgetItem(hop_useat[recipe->hops.at(i).h_useat]);
+ item = new QTableWidgetItem(hop_useat[recipe->hops.at(i).useat]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 5, item);
- if (recipe->hops.at(i).h_useat == 2 || recipe->hops.at(i).h_useat == 4) { // Boil or whirlpool
- item = new QTableWidgetItem(QString("%1 min.").arg(recipe->hops.at(i).h_time, 1, 'f', 0, '0'));
- } else if (recipe->hops.at(i).h_useat == 5) { // Dry-hop
- item = new QTableWidgetItem(QString("%1 days.").arg(recipe->hops.at(i).h_time / 1440, 1, 'f', 0, '0'));
+ if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) { // Boil or whirlpool
+ item = new QTableWidgetItem(QString("%1 min.").arg(recipe->hops.at(i).time, 1, 'f', 0, '0'));
+ } else if (recipe->hops.at(i).useat == 5) { // Dry-hop
+ item = new QTableWidgetItem(QString("%1 days.").arg(recipe->hops.at(i).time / 1440, 1, 'f', 0, '0'));
} else {
item = new QTableWidgetItem(QString(""));
}
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 6, item);
- double ibu = Utils::toIBU(recipe->hops.at(i).h_useat, recipe->hops.at(i).h_form, recipe->preboil_sg, recipe->batch_size, recipe->hops.at(i).h_amount,
- recipe->hops.at(i).h_time, recipe->hops.at(i).h_alpha, recipe->ibu_method, 0, recipe->hops.at(i).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->batch_size, recipe->hops.at(i).amount,
+ recipe->hops.at(i).time, recipe->hops.at(i).alpha, recipe->ibu_method, 0, recipe->hops.at(i).time,
0, recipe->boil_time);
item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 7, item);
- if (recipe->hops.at(i).h_amount < 1.0) {
- item = new QTableWidgetItem(QString("%1 gr").arg(recipe->hops.at(i).h_amount * 1000.0, 2, 'f', 1, '0'));
+ if (recipe->hops.at(i).amount < 1.0) {
+ item = new QTableWidgetItem(QString("%1 gr").arg(recipe->hops.at(i).amount * 1000.0, 2, 'f', 1, '0'));
} else {
- item = new QTableWidgetItem(QString("%1 kg").arg(recipe->hops.at(i).h_amount, 4, 'f', 3, '0'));
+ item = new QTableWidgetItem(QString("%1 kg").arg(recipe->hops.at(i).amount, 4, 'f', 3, '0'));
}
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(i, 8, item);
@@ -222,11 +222,11 @@
for (int i = 0; i < recipe->hops.size(); i++) {
- ibus += Utils::toIBU(recipe->hops.at(i).h_useat, recipe->hops.at(i).h_form, recipe->preboil_sg, recipe->batch_size, recipe->hops.at(i).h_amount,
- recipe->hops.at(i).h_time, recipe->hops.at(i).h_alpha, recipe->ibu_method, 0, recipe->hops.at(i).h_time,
+ ibus += Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->batch_size, recipe->hops.at(i).amount,
+ recipe->hops.at(i).time, recipe->hops.at(i).alpha, recipe->ibu_method, 0, recipe->hops.at(i).time,
0, recipe->boil_time);
- hop_flavour += Utils::hopFlavourContribution(recipe->hops.at(i).h_time, recipe->batch_size, recipe->hops.at(i).h_useat, recipe->hops.at(i).h_amount);
- hop_aroma += Utils::hopAromaContribution(recipe->hops.at(i).h_time, recipe->batch_size, recipe->hops.at(i).h_useat, recipe->hops.at(i).h_amount);
+ hop_flavour += Utils::hopFlavourContribution(recipe->hops.at(i).time, recipe->batch_size, recipe->hops.at(i).useat, recipe->hops.at(i).amount);
+ hop_aroma += Utils::hopAromaContribution(recipe->hops.at(i).time, recipe->batch_size, recipe->hops.at(i).useat, recipe->hops.at(i).amount);
}
hop_flavour = round(hop_flavour * 1000.0 / 5.0) / 10;
@@ -253,26 +253,26 @@
qDebug() << "Add hop row";
for (int i = 0; i < recipe->hops.size(); i++) {
- if (recipe->hops.at(i).h_amount == 0 && recipe->hops.at(i).h_alpha == 0)
+ if (recipe->hops.at(i).amount == 0 && recipe->hops.at(i).alpha == 0)
return; // Add only one at a time.
}
- newh.h_name = "Select one";
- newh.h_origin = "";
- newh.h_amount = 0;
- newh.h_cost = 0;
- newh.h_type = 0;
- newh.h_form = 0;
- newh.h_useat = 2;
- newh.h_time = 0;
- newh.h_alpha = 0;
- newh.h_beta = 0;
- newh.h_hsi = 0;
- newh.h_humulene = 0;
- newh.h_caryophyllene = 0;
- newh.h_cohumulone = 0;
- newh.h_myrcene = 0;
- newh.h_total_oil = 0;
+ newh.name = "Select one";
+ newh.origin = "";
+ newh.amount = 0;
+ newh.cost = 0;
+ newh.type = 0;
+ newh.form = 0;
+ newh.useat = 2;
+ newh.time = 0;
+ newh.alpha = 0;
+ newh.beta = 0;
+ newh.hsi = 0;
+ newh.humulene = 0;
+ newh.caryophyllene = 0;
+ newh.cohumulone = 0;
+ newh.myrcene = 0;
+ newh.total_oil = 0;
recipe->hops.append(newh);
emit refreshAll();
@@ -288,7 +288,7 @@
int row = pb->objectName().toInt();
qDebug() << "Delete hop row" << row << recipe->hops.size();
- int rc = QMessageBox::warning(this, tr("Delete hop"), tr("Delete %1").arg(recipe->hops.at(row).h_name),
+ int rc = QMessageBox::warning(this, tr("Delete hop"), tr("Delete %1").arg(recipe->hops.at(row).name),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (rc == QMessageBox::No)
return;
@@ -303,14 +303,14 @@
{
QTableWidgetItem *item;
- recipe->hops[recipe->hops_row].h_amount = val / 1000.0;
+ recipe->hops[recipe->hops_row].amount = val / 1000.0;
item = new QTableWidgetItem(QString("%1 gr").arg(val, 2, 'f', 1, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 8, item);
- double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).h_useat, recipe->hops.at(recipe->hops_row).h_form, recipe->preboil_sg,
- recipe->batch_size, recipe->hops.at(recipe->hops_row).h_amount, recipe->hops.at(recipe->hops_row).h_time,
- recipe->hops.at(recipe->hops_row).h_alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg,
+ recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time,
+ recipe->hops.at(recipe->hops_row).alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).time,
0, recipe->boil_time);
ibuEdit->setValue(ibu);
@@ -327,14 +327,14 @@
{
QTableWidgetItem *item;
- recipe->hops[recipe->hops_row].h_alpha = val;
+ recipe->hops[recipe->hops_row].alpha = val;
item = new QTableWidgetItem(QString("%1%").arg(val, 2, 'f', 1, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 4, item);
- double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).h_useat, recipe->hops.at(recipe->hops_row).h_form, recipe->preboil_sg,
- recipe->batch_size, recipe->hops.at(recipe->hops_row).h_amount, recipe->hops.at(recipe->hops_row).h_time,
- recipe->hops.at(recipe->hops_row).h_alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg,
+ recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time,
+ recipe->hops.at(recipe->hops_row).alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).time,
0, recipe->boil_time);
ibuEdit->setValue(ibu);
@@ -351,22 +351,22 @@
{
QTableWidgetItem *item;
- if (recipe->hops.at(recipe->hops_row).h_useat == 2 || recipe->hops.at(recipe->hops_row).h_useat == 4) { // Boil or whirlpool
+ if (recipe->hops.at(recipe->hops_row).useat == 2 || recipe->hops.at(recipe->hops_row).useat == 4) { // Boil or whirlpool
item = new QTableWidgetItem(QString("%1 min.").arg(val, 1, 'f', 0, '0'));
- recipe->hops[recipe->hops_row].h_time = val;
- } else if (recipe->hops.at(recipe->hops_row).h_useat == 5) { // Dry-hop
+ recipe->hops[recipe->hops_row].time = val;
+ } else if (recipe->hops.at(recipe->hops_row).useat == 5) { // Dry-hop
item = new QTableWidgetItem(QString("%1 days.").arg(val, 1, 'f', 0, '0'));
- recipe->hops[recipe->hops_row].h_time = val * 1440;
+ recipe->hops[recipe->hops_row].time = val * 1440;
} else {
item = new QTableWidgetItem(QString(""));
- recipe->hops[recipe->hops_row].h_time = val;
+ recipe->hops[recipe->hops_row].time = val;
}
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 6, item);
- double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).h_useat, recipe->hops.at(recipe->hops_row).h_form, recipe->preboil_sg,
- recipe->batch_size, recipe->hops.at(recipe->hops_row).h_amount, recipe->hops.at(recipe->hops_row).h_time,
- recipe->hops.at(recipe->hops_row).h_alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg,
+ recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time,
+ recipe->hops.at(recipe->hops_row).alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).time,
0, recipe->boil_time);
ibuEdit->setValue(ibu);
@@ -406,44 +406,44 @@
/*
* Replace the hop record contents
*/
- recipe->hops[recipe->hops_row].h_name = query.value(0).toString();
- recipe->hops[recipe->hops_row].h_origin = query.value(1).toString();
- recipe->hops[recipe->hops_row].h_alpha = query.value(2).toDouble();
- recipe->hops[recipe->hops_row].h_beta = query.value(3).toDouble();
- recipe->hops[recipe->hops_row].h_humulene = query.value(4).toDouble();
- recipe->hops[recipe->hops_row].h_caryophyllene = query.value(5).toDouble();
- recipe->hops[recipe->hops_row].h_cohumulone = query.value(6).toDouble();
- recipe->hops[recipe->hops_row].h_myrcene = query.value(7).toDouble();
- recipe->hops[recipe->hops_row].h_hsi = query.value(8).toDouble();
- recipe->hops[recipe->hops_row].h_total_oil = query.value(9).toDouble();
- recipe->hops[recipe->hops_row].h_type = query.value(10).toInt();
- recipe->hops[recipe->hops_row].h_form = query.value(11).toInt();
- recipe->hops[recipe->hops_row].h_cost = query.value(12).toDouble();
+ recipe->hops[recipe->hops_row].name = query.value(0).toString();
+ recipe->hops[recipe->hops_row].origin = query.value(1).toString();
+ recipe->hops[recipe->hops_row].alpha = query.value(2).toDouble();
+ recipe->hops[recipe->hops_row].beta = query.value(3).toDouble();
+ recipe->hops[recipe->hops_row].humulene = query.value(4).toDouble();
+ recipe->hops[recipe->hops_row].caryophyllene = query.value(5).toDouble();
+ recipe->hops[recipe->hops_row].cohumulone = query.value(6).toDouble();
+ recipe->hops[recipe->hops_row].myrcene = query.value(7).toDouble();
+ recipe->hops[recipe->hops_row].hsi = query.value(8).toDouble();
+ recipe->hops[recipe->hops_row].total_oil = query.value(9).toDouble();
+ recipe->hops[recipe->hops_row].type = query.value(10).toInt();
+ recipe->hops[recipe->hops_row].form = query.value(11).toInt();
+ recipe->hops[recipe->hops_row].cost = query.value(12).toDouble();
/*
* Update the visible fields
*/
- hnameEdit->setText(recipe->hops.at(recipe->hops_row).h_name);
- horiginEdit->setText(recipe->hops.at(recipe->hops_row).h_origin);
+ hnameEdit->setText(recipe->hops.at(recipe->hops_row).name);
+ horiginEdit->setText(recipe->hops.at(recipe->hops_row).origin);
- double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).h_useat, recipe->hops.at(recipe->hops_row).h_form, recipe->preboil_sg,
- recipe->batch_size, recipe->hops.at(recipe->hops_row).h_amount, recipe->hops.at(recipe->hops_row).h_time,
- recipe->hops.at(recipe->hops_row).h_alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg,
+ recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time,
+ recipe->hops.at(recipe->hops_row).alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).time,
0, recipe->boil_time);
ibuEdit->setValue(ibu);
- ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).h_origin));
- ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).h_name));
+ ui->hopsTable->setItem(recipe->hops_row, 0, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).origin));
+ ui->hopsTable->setItem(recipe->hops_row, 1, new QTableWidgetItem(recipe->hops.at(recipe->hops_row).name));
- item = new QTableWidgetItem(hop_types[recipe->hops.at(recipe->hops_row).h_type]);
+ item = new QTableWidgetItem(hop_types[recipe->hops.at(recipe->hops_row).type]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 2, item);
- item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).h_form]);
+ item = new QTableWidgetItem(hop_forms[recipe->hops.at(recipe->hops_row).form]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 3, item);
- item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(recipe->hops_row).h_alpha, 2, 'f', 1, '0'));
+ item = new QTableWidgetItem(QString("%1%").arg(recipe->hops.at(recipe->hops_row).alpha, 2, 'f', 1, '0'));
item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 4, item);
@@ -480,18 +480,18 @@
void EditRecipe::hop_useat_changed(int val)
{
- recipe->hops[recipe->hops_row].h_useat = val;
+ recipe->hops[recipe->hops_row].useat = val;
QTableWidgetItem *item = new QTableWidgetItem(hop_useat[val]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 5, item);
if (val == 2 || val == 4) { // Boil or whirlpool
htimeLabel->setText(tr("Time in minutes:"));
- htimeEdit->setValue(recipe->hops.at(recipe->hops_row).h_time);
+ htimeEdit->setValue(recipe->hops.at(recipe->hops_row).time);
htimeEdit->setReadOnly(false);
} else if (val == 5) { // Dry-hop
htimeLabel->setText(tr("Time in days:"));
- htimeEdit->setValue(recipe->hops.at(recipe->hops_row).h_time / 1440);
+ htimeEdit->setValue(recipe->hops.at(recipe->hops_row).time / 1440);
htimeEdit->setReadOnly(false);
} else {
htimeLabel->setText("");
@@ -506,14 +506,14 @@
void EditRecipe::hop_form_changed(int val)
{
- recipe->hops[recipe->hops_row].h_form = val;
+ recipe->hops[recipe->hops_row].form = val;
QTableWidgetItem *item = new QTableWidgetItem(hop_forms[val]);
item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter);
ui->hopsTable->setItem(recipe->hops_row, 3, item);
- double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).h_useat, recipe->hops.at(recipe->hops_row).h_form, recipe->preboil_sg,
- recipe->batch_size, recipe->hops.at(recipe->hops_row).h_amount, recipe->hops.at(recipe->hops_row).h_time,
- recipe->hops.at(recipe->hops_row).h_alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg,
+ recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time,
+ recipe->hops.at(recipe->hops_row).alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).time,
0, recipe->boil_time);
ibuEdit->setValue(ibu);
@@ -569,9 +569,9 @@
alphaLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
htimeLabel = new QLabel(dialog);
htimeLabel->setObjectName(QString::fromUtf8("htimeLabel"));
- if (recipe->hops.at(recipe->hops_row).h_useat == 5) // Dry-hop
+ if (recipe->hops.at(recipe->hops_row).useat == 5) // Dry-hop
htimeLabel->setText(tr("Time in days:"));
- else if (recipe->hops.at(recipe->hops_row).h_useat == 2 || recipe->hops.at(recipe->hops_row).h_useat == 4) // Boil or whirlpool
+ else if (recipe->hops.at(recipe->hops_row).useat == 2 || recipe->hops.at(recipe->hops_row).useat == 4) // Boil or whirlpool
htimeLabel->setText(tr("Time in minutes:"));
else
htimeLabel->setText("");
@@ -610,12 +610,12 @@
hnameEdit = new QLineEdit(dialog);
hnameEdit->setObjectName(QString::fromUtf8("hnameEdit"));
- hnameEdit->setText(recipe->hops.at(recipe->hops_row).h_name);
+ hnameEdit->setText(recipe->hops.at(recipe->hops_row).name);
hnameEdit->setGeometry(QRect(160, 10, 511, 23));
hnameEdit->setReadOnly(true);
horiginEdit = new QLineEdit(dialog);
horiginEdit->setObjectName(QString::fromUtf8("horiginEdit"));
- horiginEdit->setText(recipe->hops.at(recipe->hops_row).h_origin);
+ horiginEdit->setText(recipe->hops.at(recipe->hops_row).origin);
horiginEdit->setGeometry(QRect(160, 40, 511, 23));
horiginEdit->setReadOnly(true);
hamountEdit = new QDoubleSpinBox(dialog);
@@ -626,7 +626,7 @@
hamountEdit->setDecimals(1);
hamountEdit->setMaximum(1000000.0);
hamountEdit->setSingleStep(0.5);
- hamountEdit->setValue(recipe->hops.at(recipe->hops_row).h_amount * 1000.0);
+ hamountEdit->setValue(recipe->hops.at(recipe->hops_row).amount * 1000.0);
halphaEdit = new QDoubleSpinBox(dialog);
halphaEdit->setObjectName(QString::fromUtf8("halphaEdit"));
halphaEdit->setGeometry(QRect(550, 100, 121, 24));
@@ -635,18 +635,18 @@
halphaEdit->setDecimals(1);
halphaEdit->setMaximum(100.0);
halphaEdit->setSingleStep(0.1);
- halphaEdit->setValue(recipe->hops.at(recipe->hops_row).h_alpha);
+ halphaEdit->setValue(recipe->hops.at(recipe->hops_row).alpha);
htimeEdit = new QSpinBox(dialog);
htimeEdit->setObjectName(QString::fromUtf8("htimeEdit"));
htimeEdit->setGeometry(QRect(160, 130, 121, 24));
htimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
htimeEdit->setAccelerated(true);
htimeEdit->setMaximum(10000.0);
- if (recipe->hops.at(recipe->hops_row).h_useat == 2 || recipe->hops.at(recipe->hops_row).h_useat == 4) { // Boil or whirlpool
- htimeEdit->setValue(recipe->hops.at(recipe->hops_row).h_time);
+ if (recipe->hops.at(recipe->hops_row).useat == 2 || recipe->hops.at(recipe->hops_row).useat == 4) { // Boil or whirlpool
+ htimeEdit->setValue(recipe->hops.at(recipe->hops_row).time);
htimeEdit->setReadOnly(false);
- } else if (recipe->hops.at(recipe->hops_row).h_useat == 5){ // Dry-hop
- htimeEdit->setValue(recipe->hops.at(recipe->hops_row).h_time / 1440);
+ } else if (recipe->hops.at(recipe->hops_row).useat == 5){ // Dry-hop
+ htimeEdit->setValue(recipe->hops.at(recipe->hops_row).time / 1440);
htimeEdit->setReadOnly(false);
} else {
htimeEdit->setReadOnly(true);
@@ -660,7 +660,7 @@
useatEdit->addItem(tr("Aroma"));
useatEdit->addItem(tr("Whirlpool"));
useatEdit->addItem(tr("Dry hop"));
- useatEdit->setCurrentIndex(recipe->hops.at(recipe->hops_row).h_useat);
+ useatEdit->setCurrentIndex(recipe->hops.at(recipe->hops_row).useat);
hformEdit = new QComboBox(dialog);
hformEdit->setObjectName(QString::fromUtf8("formEdit"));
@@ -670,7 +670,7 @@
hformEdit->addItem(tr("Leaf"));
hformEdit->addItem(tr("Wet leaf"));
hformEdit->addItem(tr("Cryo"));
- hformEdit->setCurrentIndex(recipe->hops.at(recipe->hops_row).h_form);
+ hformEdit->setCurrentIndex(recipe->hops.at(recipe->hops_row).form);
hinstockEdit = new QCheckBox(dialog);
hinstockEdit->setObjectName(QString::fromUtf8("hinstockEdit"));
@@ -684,9 +684,9 @@
ibuEdit->setReadOnly(true);
ibuEdit->setButtonSymbols(QAbstractSpinBox::NoButtons);
ibuEdit->setDecimals(1);
- double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).h_useat, recipe->hops.at(recipe->hops_row).h_form, recipe->preboil_sg,
- recipe->batch_size, recipe->hops.at(recipe->hops_row).h_amount, recipe->hops.at(recipe->hops_row).h_time,
- recipe->hops.at(recipe->hops_row).h_alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).h_time,
+ double ibu = Utils::toIBU(recipe->hops.at(recipe->hops_row).useat, recipe->hops.at(recipe->hops_row).form, recipe->preboil_sg,
+ recipe->batch_size, recipe->hops.at(recipe->hops_row).amount, recipe->hops.at(recipe->hops_row).time,
+ recipe->hops.at(recipe->hops_row).alpha, recipe->ibu_method, 0, recipe->hops.at(recipe->hops_row).time,
0, recipe->boil_time);
ibuEdit->setValue(ibu);
@@ -709,11 +709,11 @@
recipe->hops[recipe->hops_row] = backup;
} else {
/* Clear time if hop is not used for boil, whirlpool or dry-hop. */
- if (! (recipe->hops.at(recipe->hops_row).h_useat == 2 ||
- recipe->hops.at(recipe->hops_row).h_useat == 4 ||
- recipe->hops.at(recipe->hops_row).h_useat == 5)) {
- if (recipe->hops.at(recipe->hops_row).h_time) {
- recipe->hops[recipe->hops_row].h_time = 0;
+ if (! (recipe->hops.at(recipe->hops_row).useat == 2 ||
+ recipe->hops.at(recipe->hops_row).useat == 4 ||
+ recipe->hops.at(recipe->hops_row).useat == 5)) {
+ if (recipe->hops.at(recipe->hops_row).time) {
+ recipe->hops[recipe->hops_row].time = 0;
is_changed();
}
}
@@ -740,8 +740,8 @@
return;
for (int i = 0; i < recipe->hops.size(); i++) {
- amount = recipe->hops.at(i).h_amount * factor;
- recipe->hops[i].h_amount = amount;
+ amount = recipe->hops.at(i).amount * factor;
+ recipe->hops[i].amount = amount;
}
}
