Wed, 20 Apr 2022 14:30:06 +0200
Implemented choose main and dillution waters. Implement change dillution water volume.
128 | 1 | /** |
2 | * EditRecipe.cpp is part of bmsapp. | |
3 | * | |
4 | * tab 6, mash. | |
5 | * | |
6 | * bmsapp is free software: you can redistribute it and/or modify | |
7 | * it under the terms of the GNU General Public License as published by | |
8 | * the Free Software Foundation, either version 3 of the License, or | |
9 | * (at your option) any later version. | |
10 | * | |
11 | * bmsapp is distributed in the hope that it will be useful, | |
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
14 | * GNU General Public License for more details. | |
15 | * | |
16 | * You should have received a copy of the GNU General Public License | |
17 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
18 | */ | |
19 | ||
20 | ||
21 | void EditRecipe::refreshMashs() | |
22 | { | |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
23 | QString w; |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
24 | QWidget* pWidget; |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
25 | QHBoxLayout* pLayout; |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
26 | QTableWidgetItem *item; |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
27 | QIcon down_icon, up_icon; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
28 | |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
29 | qDebug() << "refreshMashs" << recipe->mashs.size(); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
30 | |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
31 | down_icon.addFile(QString::fromUtf8(":/icons/silk/bullet_arrow_down.png"), QSize(), QIcon::Normal, QIcon::Off); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
32 | up_icon.addFile(QString::fromUtf8(":/icons/silk/bullet_arrow_up.png"), QSize(), QIcon::Normal, QIcon::Off); |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
33 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
34 | /* |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
35 | * During filling the table turn off the cellChanged signal because every cell that is filled |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
36 | * triggers the cellChanged signal. The QTableWidget has no better signal to use. |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
37 | */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
38 | this->ignoreChanges = true; |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
39 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
40 | const QStringList labels({tr("Step name"), tr("Type"), tr("Start"), tr("End"), tr("Rest"), tr("Ramp"), |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
41 | tr("Inf/dec"), tr("Inf/dec"), tr("Volume"), tr("W/G ratio"), "", "", tr("Delete"), tr("Edit") }); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
42 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
43 | ui->mashsTable->setColumnCount(14); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
44 | ui->mashsTable->setColumnWidth(0, 189); /* Step name */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
45 | ui->mashsTable->setColumnWidth(1, 100); /* Type */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
46 | ui->mashsTable->setColumnWidth(2, 70); /* Start temp */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
47 | ui->mashsTable->setColumnWidth(3, 70); /* End temp */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
48 | ui->mashsTable->setColumnWidth(4, 70); /* Rest time */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
49 | ui->mashsTable->setColumnWidth(5, 70); /* Ramp time */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
50 | ui->mashsTable->setColumnWidth(6, 70); /* Infusion vol */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
51 | ui->mashsTable->setColumnWidth(7, 70); /* Infusion tmp */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
52 | ui->mashsTable->setColumnWidth(8, 70); /* Volume */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
53 | ui->mashsTable->setColumnWidth(9, 80); /* W/G ratio */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
54 | ui->mashsTable->setColumnWidth(10, 30); /* Up button */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
55 | ui->mashsTable->setColumnWidth(11, 30); /* Down button */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
56 | ui->mashsTable->setColumnWidth(12, 80); /* Delete */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
57 | ui->mashsTable->setColumnWidth(13, 80); /* Edit */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
58 | ui->mashsTable->setHorizontalHeaderLabels(labels); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
59 | ui->mashsTable->verticalHeader()->hide(); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
60 | ui->mashsTable->setRowCount(recipe->mashs.size()); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
61 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
62 | for (int i = 0; i < recipe->mashs.size(); i++) { |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
63 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
64 | ui->mashsTable->setItem(i, 0, new QTableWidgetItem(recipe->mashs.at(i).step_name)); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
65 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
66 | item = new QTableWidgetItem(step_types[recipe->mashs.at(i).step_type]); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
67 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
68 | ui->mashsTable->setItem(i, 1, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
69 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
70 | item = new QTableWidgetItem(QString("%1 °C").arg(recipe->mashs.at(i).step_temp, 2, 'f', 1, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
71 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
72 | ui->mashsTable->setItem(i, 2, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
73 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
74 | item = new QTableWidgetItem(QString("%1 °C").arg(recipe->mashs.at(i).end_temp, 2, 'f', 1, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
75 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
76 | ui->mashsTable->setItem(i, 3, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
77 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
78 | item = new QTableWidgetItem(QString("%1 min").arg(recipe->mashs.at(i).step_time, 1, 'f', 0, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
79 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
80 | ui->mashsTable->setItem(i, 4, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
81 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
82 | item = new QTableWidgetItem(QString("%1 min").arg(recipe->mashs.at(i).ramp_time, 1, 'f', 0, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
83 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
84 | ui->mashsTable->setItem(i, 5, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
85 | |
147 | 86 | if (recipe->mashs.at(i).step_infuse_amount > 0) { |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
87 | item = new QTableWidgetItem(QString("%1 L").arg(recipe->mashs.at(i).step_infuse_amount, 2, 'f', 1, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
88 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
89 | ui->mashsTable->setItem(i, 6, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
90 | item = new QTableWidgetItem(QString("%1 °C").arg(recipe->mashs.at(i).step_infuse_temp, 3, 'f', 2, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
91 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
92 | ui->mashsTable->setItem(i, 7, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
93 | } else { |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
94 | ui->mashsTable->removeCellWidget(i, 6); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
95 | ui->mashsTable->removeCellWidget(i, 7); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
96 | } |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
97 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
98 | item = new QTableWidgetItem(QString("%1 L").arg(recipe->mashs.at(i).step_volume, 2, 'f', 1, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
99 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
100 | ui->mashsTable->setItem(i, 8, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
101 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
102 | item = new QTableWidgetItem(QString("%1 L/kg").arg(recipe->mashs.at(i).step_wg_ratio, 3, 'f', 2, '0')); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
103 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
104 | ui->mashsTable->setItem(i, 9, item); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
105 | |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
106 | if (i > 0) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
107 | pWidget = new QWidget(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
108 | QPushButton* btn_up = new QPushButton(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
109 | btn_up->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
110 | btn_up->setIcon(up_icon); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
111 | connect(btn_up, SIGNAL(clicked()), this, SLOT(upMashRow_clicked())); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
112 | pLayout = new QHBoxLayout(pWidget); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
113 | pLayout->addWidget(btn_up); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
114 | pLayout->setContentsMargins(5, 0, 5, 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
115 | pWidget->setLayout(pLayout); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
116 | ui->mashsTable->setCellWidget(i, 10, pWidget); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
117 | } else { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
118 | ui->mashsTable->removeCellWidget(i, 10); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
119 | } |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
120 | |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
121 | if (i < (recipe->mashs.size() - 1)) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
122 | pWidget = new QWidget(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
123 | QPushButton* btn_down = new QPushButton(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
124 | btn_down->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
125 | btn_down->setIcon(down_icon); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
126 | connect(btn_down, SIGNAL(clicked()), this, SLOT(downMashRow_clicked())); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
127 | pLayout = new QHBoxLayout(pWidget); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
128 | pLayout->addWidget(btn_down); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
129 | pLayout->setContentsMargins(5, 0, 5, 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
130 | pWidget->setLayout(pLayout); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
131 | ui->mashsTable->setCellWidget(i, 11, pWidget); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
132 | } else { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
133 | ui->mashsTable->removeCellWidget(i, 11); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
134 | } |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
135 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
136 | pWidget = new QWidget(); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
137 | QPushButton* btn_dele = new QPushButton(); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
138 | btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
139 | btn_dele->setText(tr("Delete")); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
140 | connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteMashRow_clicked())); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
141 | pLayout = new QHBoxLayout(pWidget); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
142 | pLayout->addWidget(btn_dele); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
143 | pLayout->setContentsMargins(5, 0, 5, 0); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
144 | pWidget->setLayout(pLayout); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
145 | ui->mashsTable->setCellWidget(i, 12, pWidget); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
146 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
147 | pWidget = new QWidget(); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
148 | QPushButton* btn_edit = new QPushButton(); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
149 | btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
150 | btn_edit->setText(tr("Edit")); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
151 | connect(btn_edit, SIGNAL(clicked()), this, SLOT(editMashRow_clicked())); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
152 | pLayout = new QHBoxLayout(pWidget); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
153 | pLayout->addWidget(btn_edit); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
154 | pLayout->setContentsMargins(5, 0, 5, 0); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
155 | pWidget->setLayout(pLayout); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
156 | ui->mashsTable->setCellWidget(i, 13, pWidget); |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
157 | } |
128 | 158 | } |
159 | ||
160 | ||
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
161 | double EditRecipe::infusionVol(double step_infused, double step_mashkg, double infuse_temp, double step_temp, double last_temp) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
162 | { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
163 | double a = last_temp * (eq_tun_weight * eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
164 | double b = step_temp * (eq_tun_weight * eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
165 | double vol = round(((b - a) / ((infuse_temp - step_temp) * SpecificHeatWater)) * 100.0) / 100.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
166 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
167 | if (vol < 0) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
168 | vol = 0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
169 | qDebug() << " infusionVol(" << step_infused << "," << step_mashkg << "," << infuse_temp <<"," << step_temp << "," << last_temp << "):" << vol; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
170 | return vol; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
171 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
172 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
173 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
174 | double EditRecipe::decoctionVol(double step_volume, double step_temp, double prev_temp) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
175 | { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
176 | double a = (eq_tun_weight * eq_tun_specific_heat + step_volume * SpecificHeatWater) * (step_temp - prev_temp); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
177 | double b = SpecificHeatWater * (99 - step_temp); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
178 | double vol = 0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
179 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
180 | if (b > 0) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
181 | vol = round((a / b) * 1000000.0) / 1000000.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
182 | qDebug() << " decoctionVol(" << step_volume << "," << step_temp << "," << prev_temp << "):" << vol; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
183 | return vol; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
184 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
185 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
186 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
187 | void EditRecipe::calcMash() |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
188 | { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
189 | double infused = 0, vol, a, b, temp; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
190 | int i, j, n; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
191 | double lasttemp = 18.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
192 | double graintemp = 18.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
193 | double tuntemp = 18.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
194 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
195 | recipe->mashs_time = 0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
196 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
197 | if (recipe->mashs.size() && recipe->mashs_kg > 0) { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
198 | qDebug() << "calcMash()"; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
199 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
200 | for (i = 0; i < recipe->mashs.size(); i++) { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
201 | if (recipe->mashs.at(i).step_type == 0) { // Infusion |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
202 | if (i == 0) { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
203 | // First mash step, temperature from the mashtun and malt. |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
204 | n = 20; // tun is preheated. |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
205 | tuntemp = recipe->mashs.at(i).step_temp; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
206 | for (j = 0; j < n; j++) { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
207 | a = recipe->mashs_kg * graintemp * SpecificHeatMalt + eq_tun_weight * tuntemp * eq_tun_specific_heat; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
208 | b = recipe->mashs[i].step_temp * |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
209 | (eq_tun_weight * eq_tun_specific_heat + |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
210 | recipe->mashs.at(i).step_infuse_amount * SpecificHeatWater + |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
211 | recipe->mashs_kg * SpecificHeatMalt) - |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
212 | SlakingHeat * recipe->mashs_kg; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
213 | if (recipe->mashs.at(i).step_infuse_amount > 0) { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
214 | temp = (b - a) / (recipe->mashs.at(i).step_infuse_amount * SpecificHeatWater); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
215 | } else { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
216 | temp = 99; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
217 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
218 | tuntemp += (temp - tuntemp) / 2; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
219 | recipe->mashs[i].step_infuse_temp = round(temp * 1000000.0) / 1000000.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
220 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
221 | qDebug() << " init infuse temp:" << recipe->mashs.at(i).step_infuse_temp; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
222 | } else { |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
223 | // Calculate amount of infusion water. |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
224 | recipe->mashs[i].step_infuse_amount = |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
225 | infusionVol(infused, recipe->mashs_kg, recipe->mashs.at(i).step_infuse_temp, recipe->mashs.at(i).step_temp, lasttemp); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
226 | qDebug() << i << " vol:" << recipe->mashs.at(i).step_infuse_amount << "temp:" << recipe->mashs.at(i).step_infuse_temp; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
227 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
228 | infused += recipe->mashs.at(i).step_infuse_amount; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
229 | } else if (recipe->mashs.at(i).step_type == 1) { // Temperature |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
230 | if (i > 0) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
231 | recipe->mashs[i].step_infuse_amount = 0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
232 | recipe->mashs[i].step_infuse_temp = 0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
233 | } else if (recipe->mashs.at(i).step_type == 2) { // Decoction |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
234 | recipe->mashs[i].step_infuse_amount = decoctionVol(infused, recipe->mashs.at(i).step_temp, lasttemp); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
235 | recipe->mashs[i].step_infuse_temp = 99; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
236 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
237 | recipe->mashs[i].step_volume = infused; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
238 | qDebug() << i << " type:" << recipe->mashs.at(i).step_type << "volume:" << recipe->mashs.at(i).step_infuse_amount << "temp:" << recipe->mashs.at(i).step_infuse_temp; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
239 | lasttemp = recipe->mashs.at(i).step_temp; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
240 | recipe->mashs_time += recipe->mashs.at(i).step_time; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
241 | if (i > 0) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
242 | recipe->mashs_time += recipe->mashs.at(i).ramp_time; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
243 | recipe->mashs[i].step_wg_ratio = round((infused / recipe->mashs_kg) * 1000000.0) / 1000000.0; |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
244 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
245 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
246 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
247 | /* Show the calculated total mash time. */ |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
248 | ui->mash_timeEdit->setText(QString("%1:%2").arg(recipe->mashs_time / 60).arg(recipe->mashs_time % 60, 2, 'f', 0, '0')); |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
249 | } |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
250 | |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
251 | |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
252 | void EditRecipe::addMashRow_clicked() |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
253 | { |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
254 | Mashs newm; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
255 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
256 | for (int i = 0; i < recipe->mashs.size(); i++) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
257 | if (recipe->mashs.at(i).step_time == 0) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
258 | return; // Add only one at a time. |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
259 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
260 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
261 | newm.step_name = "Name me"; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
262 | newm.step_temp = newm.end_temp = 67.0; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
263 | newm.step_time = 20; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
264 | newm.ramp_time = 10; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
265 | if (recipe->mashs.size()) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
266 | newm.step_volume = recipe->mashs.at(recipe->mashs.size() - 1).step_volume; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
267 | newm.step_wg_ratio = recipe->mashs.at(recipe->mashs.size() - 1).step_wg_ratio; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
268 | newm.step_type = recipe->mashs.at(recipe->mashs.size() - 1).step_type; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
269 | } else { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
270 | newm.step_volume = 0; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
271 | newm.step_wg_ratio = 0; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
272 | newm.step_type = 1; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
273 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
274 | newm.step_infuse_amount = newm.step_infuse_temp = 0; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
275 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
276 | recipe->mashs.append(newm); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
277 | is_changed(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
278 | emit refreshAll(); |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
279 | } |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
280 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
281 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
282 | void EditRecipe::deleteMashRow_clicked() |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
283 | { |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
284 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
285 | int row = pb->objectName().toInt(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
286 | qDebug() << "Delete mash row" << row << recipe->mashs.size(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
287 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
288 | if (recipe->mashs.size() < 1) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
289 | return; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
290 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
291 | int rc = QMessageBox::warning(this, tr("Delete mash step"), tr("Delete %1").arg(recipe->mashs.at(row).step_name), |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
292 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
293 | if (rc == QMessageBox::No) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
294 | return; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
295 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
296 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
297 | recipe->mashs.removeAt(row); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
298 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
299 | is_changed(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
300 | emit refreshAll(); |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
301 | } |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
302 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
303 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
304 | void EditRecipe::upMashRow_clicked() |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
305 | { |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
306 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
307 | int row = pb->objectName().toInt(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
308 | qDebug() << "Move up mash row" << row << recipe->mashs.size(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
309 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
310 | if (recipe->mashs.size() < 1) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
311 | return; |
146 | 312 | |
313 | this->ignoreChanges = true; | |
314 | Mashs temp; | |
315 | temp = recipe->mashs[row - 1]; | |
316 | recipe->mashs[row - 1] = recipe->mashs[row]; | |
317 | recipe->mashs[row] = temp; | |
318 | this->ignoreChanges = false; | |
319 | is_changed(); | |
320 | emit refreshAll(); | |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
321 | } |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
322 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
323 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
324 | void EditRecipe::downMashRow_clicked() |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
325 | { |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
326 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
327 | int row = pb->objectName().toInt(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
328 | qDebug() << "Move down mash row" << row << recipe->mashs.size(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
329 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
330 | if (recipe->mashs.size() < 1) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
331 | return; |
146 | 332 | |
333 | this->ignoreChanges = true; | |
334 | Mashs temp; | |
335 | temp = recipe->mashs[row + 1]; | |
336 | recipe->mashs[row + 1] = recipe->mashs[row]; | |
337 | recipe->mashs[row] = temp; | |
338 | this->ignoreChanges = false; | |
339 | is_changed(); | |
340 | emit refreshAll(); | |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
341 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
342 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
343 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
344 | void EditRecipe::step_name_changed(QString val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
345 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
346 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
347 | recipe->mashs[recipe->mashs_row].step_name = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
348 | ui->mashsTable->setItem(recipe->mashs_row, 0, new QTableWidgetItem(val)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
349 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
350 | is_changed(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
351 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
352 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
353 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
354 | void EditRecipe::step_type_changed(int val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
355 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
356 | qDebug() << "step_type_changed" << recipe->mashs_row << val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
357 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
358 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
359 | recipe->mashs[recipe->mashs_row].step_type = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
360 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
361 | ivolLabel->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
362 | stepivolEdit->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
363 | itmpLabel->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
364 | stepitmpEdit->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
365 | is_changed(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
366 | emit refreshAll(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
367 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
368 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
369 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
370 | void EditRecipe::step_temp_changed(double val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
371 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
372 | qDebug() << "step_temp_changed" << recipe->mashs_row << val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
373 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
374 | recipe->mashs[recipe->mashs_row].step_temp = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
375 | QTableWidgetItem *item = new QTableWidgetItem(QString("%1 °C").arg(val, 2, 'f', 1, '0')); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
376 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
377 | ui->mashsTable->setItem(recipe->mashs_row, 2, item); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
378 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
379 | is_changed(); |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
380 | emit refreshAll(); |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
381 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
382 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
383 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
384 | void EditRecipe::end_temp_changed(double val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
385 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
386 | qDebug() << "end_temp_changed" << recipe->mashs_row << val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
387 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
388 | recipe->mashs[recipe->mashs_row].end_temp = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
389 | QTableWidgetItem *item = new QTableWidgetItem(QString("%1 °C").arg(val, 2, 'f', 1, '0')); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
390 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
391 | ui->mashsTable->setItem(recipe->mashs_row, 3, item); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
392 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
393 | is_changed(); |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
394 | emit refreshAll(); |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
395 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
396 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
397 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
398 | void EditRecipe::step_time_changed(double val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
399 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
400 | qDebug() << "step_time_changed" << recipe->mashs_row << val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
401 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
402 | recipe->mashs[recipe->mashs_row].step_time = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
403 | QTableWidgetItem *item = new QTableWidgetItem(QString("%1 min").arg(val, 1, 'f', 0, '0')); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
404 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
405 | ui->mashsTable->setItem(recipe->mashs_row, 4, item); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
406 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
407 | is_changed(); |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
408 | emit refreshAll(); |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
409 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
410 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
411 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
412 | void EditRecipe::ramp_time_changed(double val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
413 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
414 | qDebug() << "ramp_time_changed" << recipe->mashs_row << val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
415 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
416 | recipe->mashs[recipe->mashs_row].ramp_time = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
417 | QTableWidgetItem *item = new QTableWidgetItem(QString("%1 min").arg(val, 1, 'f', 0, '0')); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
418 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
419 | ui->mashsTable->setItem(recipe->mashs_row, 5, item); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
420 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
421 | is_changed(); |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
422 | emit refreshAll(); |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
423 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
424 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
425 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
426 | void EditRecipe::infuse_changed(double val) |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
427 | { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
428 | qDebug() << "infuse_changed" << recipe->mashs_row << val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
429 | this->ignoreChanges = true; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
430 | recipe->mashs[recipe->mashs_row].step_infuse_amount = val; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
431 | QTableWidgetItem *item = new QTableWidgetItem(QString("%1 L").arg(val, 1, 'f', 0, '0')); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
432 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
433 | ui->mashsTable->setItem(recipe->mashs_row, 6, item); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
434 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
435 | /* |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
436 | * Recalculate water volumes |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
437 | */ |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
438 | double volume = 0; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
439 | for (int i = 0; i < recipe->mashs.size(); i++) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
440 | if (recipe->mashs.at(i).step_type == 0) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
441 | volume += recipe->mashs.at(i).step_infuse_amount; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
442 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
443 | recipe->mashs[i].step_volume = volume; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
444 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
445 | recipe->w1_amount = volume - recipe->w2_amount; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
446 | recipe->wg_amount = volume; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
447 | ui->w1_volEdit->setValue(recipe->w1_amount); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
448 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
449 | this->ignoreChanges = false; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
450 | is_changed(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
451 | emit refreshAll(); |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
452 | } |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
453 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
454 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
455 | void EditRecipe::editMashRow_clicked() |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
456 | { |
145
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
457 | QSqlQuery query; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
458 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
459 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
460 | recipe->mashs_row = pb->objectName().toInt(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
461 | qDebug() << "Edit mash row" << recipe->mashs_row; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
462 | Mashs backup = recipe->mashs.at(recipe->mashs_row); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
463 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
464 | QDialog* dialog = new QDialog(this); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
465 | dialog->resize(738, 230); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
466 | QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
467 | buttonBox->setObjectName(QString::fromUtf8("buttonBox")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
468 | buttonBox->setGeometry(QRect(30, 180, 671, 32)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
469 | buttonBox->setLayoutDirection(Qt::LeftToRight); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
470 | buttonBox->setOrientation(Qt::Horizontal); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
471 | buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
472 | buttonBox->setCenterButtons(true); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
473 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
474 | QLabel *nameLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
475 | nameLabel->setObjectName(QString::fromUtf8("nameLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
476 | nameLabel->setText(tr("Step name:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
477 | nameLabel->setGeometry(QRect(10, 10, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
478 | nameLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
479 | stepnameEdit = new QLineEdit(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
480 | stepnameEdit->setObjectName(QString::fromUtf8("stepnameEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
481 | stepnameEdit->setText(recipe->mashs.at(recipe->mashs_row).step_name); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
482 | stepnameEdit->setGeometry(QRect(160, 10, 511, 23)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
483 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
484 | QLabel *typeLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
485 | typeLabel->setObjectName(QString::fromUtf8("typeLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
486 | typeLabel->setText(tr("Step type:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
487 | typeLabel->setGeometry(QRect(10, 40, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
488 | typeLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
489 | QComboBox *typeEdit = new QComboBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
490 | typeEdit->setObjectName(QString::fromUtf8("typeEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
491 | typeEdit->setGeometry(QRect(160, 40, 161, 23)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
492 | typeEdit->addItem(tr("Infusion")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
493 | typeEdit->addItem(tr("Temperature")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
494 | typeEdit->addItem(tr("Decoction")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
495 | typeEdit->setCurrentIndex(recipe->mashs.at(recipe->mashs_row).step_type); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
496 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
497 | QLabel *tempLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
498 | tempLabel->setObjectName(QString::fromUtf8("tempLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
499 | tempLabel->setText(tr("Step start temp:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
500 | tempLabel->setGeometry(QRect(10, 70, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
501 | tempLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
502 | steptempEdit = new QDoubleSpinBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
503 | steptempEdit->setObjectName(QString::fromUtf8("steptempEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
504 | steptempEdit->setGeometry(QRect(160, 70, 121, 24)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
505 | steptempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
506 | steptempEdit->setDecimals(1); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
507 | steptempEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_temp); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
508 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
509 | QLabel *endLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
510 | endLabel->setObjectName(QString::fromUtf8("endLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
511 | endLabel->setText(tr("Step end temp:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
512 | endLabel->setGeometry(QRect(360, 70, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
513 | endLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
514 | endtempEdit = new QDoubleSpinBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
515 | endtempEdit->setObjectName(QString::fromUtf8("endtempEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
516 | endtempEdit->setGeometry(QRect(510, 70, 121, 24)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
517 | endtempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
518 | endtempEdit->setDecimals(1); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
519 | endtempEdit->setValue(recipe->mashs.at(recipe->mashs_row).end_temp); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
520 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
521 | QLabel *timeLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
522 | timeLabel->setObjectName(QString::fromUtf8("timeLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
523 | timeLabel->setText(tr("Step rest time:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
524 | timeLabel->setGeometry(QRect(10, 100, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
525 | timeLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
526 | steptimeEdit = new QDoubleSpinBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
527 | steptimeEdit->setObjectName(QString::fromUtf8("steptimeEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
528 | steptimeEdit->setGeometry(QRect(160, 100, 121, 24)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
529 | steptimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
530 | steptimeEdit->setDecimals(0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
531 | steptimeEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_time); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
532 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
533 | QLabel *rampLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
534 | rampLabel->setObjectName(QString::fromUtf8("rampLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
535 | rampLabel->setText(tr("Step ramp time:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
536 | rampLabel->setGeometry(QRect(360, 100, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
537 | rampLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
538 | ramptimeEdit = new QDoubleSpinBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
539 | ramptimeEdit->setObjectName(QString::fromUtf8("ramptimeEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
540 | ramptimeEdit->setGeometry(QRect(510, 100, 121, 24)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
541 | ramptimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
542 | ramptimeEdit->setDecimals(0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
543 | ramptimeEdit->setValue(recipe->mashs.at(recipe->mashs_row).ramp_time); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
544 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
545 | /* |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
546 | * Only used for Infusion steps. |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
547 | */ |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
548 | ivolLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
549 | ivolLabel->setObjectName(QString::fromUtf8("ivolLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
550 | ivolLabel->setText(tr("Infusion volume:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
551 | ivolLabel->setGeometry(QRect(10, 130, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
552 | ivolLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
553 | ivolLabel->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
554 | stepivolEdit = new QDoubleSpinBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
555 | stepivolEdit->setObjectName(QString::fromUtf8("stepivolEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
556 | stepivolEdit->setGeometry(QRect(160, 130, 121, 24)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
557 | stepivolEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
558 | stepivolEdit->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
559 | stepivolEdit->setDecimals(1); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
560 | stepivolEdit->setSingleStep(0.5); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
561 | stepivolEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_infuse_amount); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
562 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
563 | itmpLabel = new QLabel(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
564 | itmpLabel->setObjectName(QString::fromUtf8("itmpLabel")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
565 | itmpLabel->setText(tr("Infusion Temperature:")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
566 | itmpLabel->setGeometry(QRect(360, 130, 141, 20)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
567 | itmpLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
568 | itmpLabel->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
569 | stepitmpEdit = new QDoubleSpinBox(dialog); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
570 | stepitmpEdit->setObjectName(QString::fromUtf8("stepitmpEdit")); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
571 | stepitmpEdit->setGeometry(QRect(510, 130, 121, 24)); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
572 | stepitmpEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
573 | stepitmpEdit->setVisible(recipe->mashs.at(recipe->mashs_row).step_type == 0); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
574 | stepitmpEdit->setDecimals(1); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
575 | stepitmpEdit->setReadOnly(true); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
576 | stepitmpEdit->setButtonSymbols(QAbstractSpinBox::NoButtons); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
577 | stepitmpEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_infuse_temp); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
578 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
579 | connect(stepnameEdit, &QLineEdit::textEdited, this, &EditRecipe::step_name_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
580 | connect(typeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditRecipe::step_type_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
581 | connect(steptempEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::step_temp_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
582 | connect(endtempEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::end_temp_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
583 | connect(steptimeEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::step_time_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
584 | connect(ramptimeEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::ramp_time_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
585 | connect(stepivolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::infuse_changed); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
586 | connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject())); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
587 | connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept())); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
588 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
589 | dialog->setModal(true); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
590 | dialog->exec(); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
591 | if (dialog->result() == QDialog::Rejected) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
592 | qDebug() << "reject and rollback"; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
593 | recipe->mashs[recipe->mashs_row] = backup; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
594 | /* Rollback water volumes too */ |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
595 | double volume = 0; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
596 | for (int i = 0; i < recipe->mashs.size(); i++) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
597 | if (recipe->mashs.at(i).step_type == 0) { |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
598 | volume += recipe->mashs.at(i).step_infuse_amount; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
599 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
600 | recipe->mashs[i].step_volume = volume; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
601 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
602 | recipe->w1_amount = volume - recipe->w2_amount; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
603 | recipe->wg_amount = volume; |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
604 | ui->w1_volEdit->setValue(recipe->w1_amount); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
605 | } |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
606 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
607 | disconnect(stepnameEdit, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
608 | disconnect(steptempEdit, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
609 | disconnect(endtempEdit, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
610 | disconnect(steptimeEdit, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
611 | disconnect(ramptimeEdit, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
612 | disconnect(stepivolEdit, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
613 | disconnect(buttonBox, nullptr, nullptr, nullptr); |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
614 | |
fd4f0de86fd9
Implemented most parts of the mash editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
615 | emit refreshAll(); |
144
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
616 | } |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
617 | |
c4b107bf153a
First setup of the mash tab with the table.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
618 | |
147 | 619 | void EditRecipe::mash_select_changed(int val) |
620 | { | |
621 | QSqlQuery query; | |
622 | int i; | |
623 | ||
624 | qDebug() << "mash_select_changed" << val; | |
625 | ||
626 | query.prepare("SELECT name,steps FROM profile_mash ORDER BY name"); | |
627 | query.exec(); | |
628 | query.first(); | |
629 | for (i = 0; i < (val -1); i++) { | |
630 | query.next(); | |
631 | } | |
632 | ||
633 | QJsonParseError parseError; | |
634 | const auto& json = query.value(1).toString(); | |
635 | if (!json.trimmed().isEmpty()) { | |
636 | const auto& formattedJson = QString("%1").arg(json); | |
637 | QJsonDocument newsteps = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); | |
638 | ||
639 | if (parseError.error != QJsonParseError::NoError) { | |
640 | qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset; | |
641 | } else { | |
642 | /* | |
643 | * Got the json data in the steps array, replace the recipe steps. | |
644 | */ | |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
645 | double infuse = recipe->mashs.at(0).step_infuse_amount; |
147 | 646 | recipe->mashs.clear(); |
647 | ui->mashsTable->clear(); | |
648 | if (newsteps.isArray()) { | |
649 | for (i = 0; i < newsteps.array().size(); i++) { | |
650 | QJsonObject obj = newsteps.array().at(i).toObject(); | |
651 | Mashs m; | |
652 | m.step_name = obj["step_name"].toString(); | |
653 | if (obj["step_type"].isString()) | |
654 | m.step_type = QString(obj["step_type"].toString()).toInt(); | |
655 | else | |
656 | m.step_type = obj["step_type"].toInt(); | |
657 | m.step_volume = 0; | |
658 | m.step_infuse_amount = 0; | |
659 | m.step_infuse_temp = 0; | |
660 | if (obj["step_temp"].isString()) | |
661 | m.step_temp = QString(obj["step_temp"].toString()).toDouble(); | |
662 | else | |
663 | m.step_temp = obj["step_temp"].toDouble(); | |
664 | if (obj["step_time"].isString()) | |
665 | m.step_time = QString(obj["step_time"].toString()).toDouble(); | |
666 | else | |
667 | m.step_time = obj["step_time"].toDouble(); | |
668 | if (obj["ramp_time"].isString()) | |
669 | m.ramp_time = QString(obj["ramp_time"].toString()).toDouble(); | |
670 | else | |
671 | m.ramp_time = obj["ramp_time"].toDouble(); | |
672 | if (obj["end_temp"].isString()) | |
673 | m.end_temp = QString(obj["end_temp"].toString()).toDouble(); | |
674 | else | |
675 | m.end_temp = obj["end_temp"].toDouble(); | |
676 | m.step_wg_ratio = 0; | |
677 | recipe->mashs.append(m); | |
678 | } | |
679 | } | |
148
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
680 | if (recipe->mashs.at(0).step_type == 0) |
ba25a566b100
Added calcMash(). Display total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
681 | recipe->mashs[0].step_infuse_amount = infuse; // Restore save initial infusion |
147 | 682 | } |
683 | } | |
684 | is_changed(); | |
685 | emit refreshAll(); | |
686 | } | |
687 | ||
688 |