Thu, 07 Apr 2022 19:07:28 +0200
Completed recipe save record. Recipe name and notes can be edited.
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | /** |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | * EditRecipe.cpp is part of bmsapp. |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * bmsapp is free software: you can redistribute it and/or modify |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * it under the terms of the GNU General Public License as published by |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * the Free Software Foundation, either version 3 of the License, or |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * (at your option) any later version. |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * bmsapp is distributed in the hope that it will be useful, |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * GNU General Public License for more details. |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * You should have received a copy of the GNU General Public License |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | */ |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
17 | #include "MainWindow.h" |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | #include "EditRecipe.h" |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | #include "../ui/ui_EditRecipe.h" |
95
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
20 | #include "Utils.h" |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
23 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
24 | EditRecipe::EditRecipe(int id, QWidget *parent) : QDialog(parent), ui(new Ui::EditRecipe) |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
25 | { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
26 | QSqlQuery query; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
27 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | qDebug() << "EditRecipe record:" << id; |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
29 | recipe = new Recipe; |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
30 | ui->setupUi(this); |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
31 | recipe->fermentables_current = recipe->hops_current = recipe->misc_current = recipe->yeasts_current = recipe->mashs_current = -1; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
32 | recipe->fermentables_use100 = false; |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | this->recno = id; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
34 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
35 | WindowTitle(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
36 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
37 | ui->typeEdit->addItem(tr("Extract")); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
38 | ui->typeEdit->addItem(tr("Partial Mash")); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
39 | ui->typeEdit->addItem(tr("All Grain")); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
40 | |
98
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
41 | ui->color_methodEdit->addItem("Morey"); |
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
42 | ui->color_methodEdit->addItem("Mosher"); |
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
43 | ui->color_methodEdit->addItem("Daniels"); |
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
44 | ui->color_methodEdit->addItem("Halberstadt"); |
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
45 | ui->color_methodEdit->addItem("Naudts"); |
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
46 | |
100
d11a3e713e3b
Added more edit fields to the first recipe editor tab. Cleanup of RangedSlider is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
47 | ui->ibu_methodEdit->addItem("Tinseth"); |
d11a3e713e3b
Added more edit fields to the first recipe editor tab. Cleanup of RangedSlider is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
48 | ui->ibu_methodEdit->addItem("Rager"); |
d11a3e713e3b
Added more edit fields to the first recipe editor tab. Cleanup of RangedSlider is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
49 | ui->ibu_methodEdit->addItem("Daniels"); |
d11a3e713e3b
Added more edit fields to the first recipe editor tab. Cleanup of RangedSlider is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
50 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
51 | ui->beerstyleEdit->addItem(""); // First add a dummy |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
52 | query.prepare("SELECT style_guide,style_letter,name FROM profile_styles ORDER BY style_guide,style_letter,name"); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
53 | query.exec(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
54 | query.first(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
55 | for (int i = 0; i < query.size(); i++) { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
56 | ui->beerstyleEdit->addItem(query.value(0).toString()+" "+query.value(1).toString()+" "+query.value(2).toString()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
57 | query.next(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
58 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
59 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
60 | if (id >= 0) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
61 | query.prepare("SELECT * FROM recipes WHERE record = :recno"); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
62 | query.bindValue(":recno", id); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
63 | query.exec(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
64 | query.next(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
65 | |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
66 | recipe->record = query.value(0).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
67 | recipe->uuid = query.value(1).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
68 | recipe->locked = query.value(2).toInt() ? true:false; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
69 | recipe->st_name = query.value(3).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
70 | recipe->st_letter = query.value(4).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
71 | recipe->st_guide = query.value(5).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
72 | recipe->st_category = query.value(6).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
73 | recipe->st_category_number = query.value(7).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
74 | recipe->st_type = query.value(8).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
75 | recipe->st_og_min = query.value(9).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
76 | recipe->st_og_max = query.value(10).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
77 | recipe->st_fg_min = query.value(11).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
78 | recipe->st_fg_max = query.value(12).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
79 | recipe->st_ibu_min = query.value(13).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
80 | recipe->st_ibu_max = query.value(14).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
81 | recipe->st_color_min = query.value(15).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
82 | recipe->st_color_max = query.value(16).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
83 | recipe->st_carb_min = query.value(17).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
84 | recipe->st_carb_max = query.value(18).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
85 | recipe->st_abv_min = query.value(19).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
86 | recipe->st_abv_max = query.value(20).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
87 | recipe->name = query.value(21).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
88 | recipe->notes = query.value(22).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
89 | recipe->type = query.value(23).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
90 | recipe->batch_size = query.value(24).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
91 | recipe->boil_size = query.value(25).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
92 | recipe->boil_time = query.value(26).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
93 | recipe->efficiency = query.value(27).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
94 | recipe->est_og = query.value(28).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
95 | recipe->est_fg = query.value(29).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
96 | recipe->est_abv = query.value(30).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
97 | recipe->est_color = query.value(31).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
98 | recipe->color_method = query.value(32).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
99 | recipe->est_ibu = query.value(33).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
100 | recipe->ibu_method = query.value(34).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
101 | recipe->est_carb = query.value(35).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
102 | |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
103 | recipe->sparge_temp = query.value(36).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
104 | recipe->sparge_ph = query.value(37).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
105 | recipe->sparge_volume = query.value(38).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
106 | recipe->sparge_source = query.value(39).toInt(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
107 | recipe->sparge_acid_type = query.value(40).toInt(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
108 | recipe->sparge_acid_perc = query.value(41).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
109 | recipe->sparge_acid_amount = query.value(42).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
110 | recipe->mash_ph = query.value(43).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
111 | recipe->mash_name = query.value(44).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
112 | recipe->calc_acid = query.value(45).toInt() ? true:false; |
100
d11a3e713e3b
Added more edit fields to the first recipe editor tab. Cleanup of RangedSlider is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
113 | |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
114 | recipe->w1_name = query.value(46).toString(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
115 | recipe->w1_amount = query.value(47).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
116 | recipe->w1_calcium = query.value(48).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
117 | recipe->w1_sulfate = query.value(49).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
118 | recipe->w1_chloride = query.value(50).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
119 | recipe->w1_sodium = query.value(51).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
120 | recipe->w1_magnesium = query.value(52).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
121 | recipe->w1_total_alkalinity = query.value(53).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
122 | recipe->w1_ph = query.value(54).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
123 | recipe->w1_cost = query.value(55).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
124 | recipe->w2_name = query.value(56).toString(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
125 | recipe->w2_amount = query.value(57).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
126 | recipe->w2_calcium = query.value(58).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
127 | recipe->w2_sulfate = query.value(59).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
128 | recipe->w2_chloride = query.value(60).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
129 | recipe->w2_sodium = query.value(61).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
130 | recipe->w2_magnesium = query.value(62).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
131 | recipe->w2_total_alkalinity = query.value(63).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
132 | recipe->w2_ph = query.value(64).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
133 | recipe->w2_cost = query.value(65).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
134 | recipe->wg_amount = query.value(66).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
135 | recipe->wg_calcium = query.value(67).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
136 | recipe->wg_sulfate = query.value(68).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
137 | recipe->wg_chloride = query.value(69).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
138 | recipe->wg_sodium = query.value(70).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
139 | recipe->wg_magnesium = query.value(71).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
140 | recipe->wg_total_alkalinity = query.value(72).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
141 | recipe->wg_ph = query.value(73).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
142 | recipe->wb_calcium = query.value(74).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
143 | recipe->wb_sulfate = query.value(75).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
144 | recipe->wb_chloride = query.value(76).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
145 | recipe->wb_sodium = query.value(77).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
146 | recipe->wb_magnesium = query.value(78).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
147 | recipe->wb_total_alkalinity = query.value(79).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
148 | recipe->wb_ph = query.value(80).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
149 | recipe->wa_acid_name = query.value(81).toInt(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
150 | recipe->wa_acid_perc = query.value(82).toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
151 | recipe->wa_base_name = query.value(83).toInt(); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
152 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
153 | QJsonParseError parseError; |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
154 | const auto& f_json = query.value(84).toString(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
155 | if (!f_json.trimmed().isEmpty()) { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
156 | const auto& formattedJson = QString("%1").arg(f_json); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
157 | QJsonDocument fermentables = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
158 | if (parseError.error != QJsonParseError::NoError) { |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
159 | qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
160 | } else if (fermentables.isArray()) { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
161 | for (int i = 0; i < fermentables.array().size(); i++) { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
162 | QJsonObject obj = fermentables.array().at(i).toObject(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
163 | Fermentables f; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
164 | f.f_name = obj["f_name"].toString(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
165 | f.f_origin = obj["f_origin"].toString(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
166 | f.f_supplier = obj["f_supplier"].toString(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
167 | f.f_amount = obj["f_amount"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
168 | f.f_cost = obj["f_cost"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
169 | f.f_type = obj["f_type"].toInt(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
170 | f.f_yield = obj["f_yield"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
171 | f.f_color = obj["f_color"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
172 | f.f_coarse_fine_diff = obj["f_coarse_fine_diff"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
173 | f.f_moisture = obj["f_moisture"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
174 | f.f_diastatic_power = obj["f_diastatic_power"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
175 | f.f_protein = obj["f_protein"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
176 | f.f_dissolved_protein = obj["f_dissolved_protein"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
177 | f.f_max_in_batch = obj["f_max_in_batch"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
178 | f.f_graintype = obj["f_graintype"].toInt(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
179 | f.f_added = obj["f_added"].toInt(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
180 | f.f_recommend_mash = obj["f_recommend_mash"].toInt() ? true:false; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
181 | f.f_add_after_boil = obj["f_add_after_boil"].toInt() ? true:false; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
182 | f.f_adjust_to_total_100 = obj["f_adjust_to_total_100"].toInt() ? true:false; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
183 | f.f_percentage = obj["f_percentage"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
184 | f.f_di_ph = obj["f_di_ph"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
185 | f.f_acid_to_ph_57 = obj["f_acid_to_ph_57"].toDouble(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
186 | if (f.f_adjust_to_total_100) |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
187 | recipe->fermentables_use100 = true; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
188 | recipe->fermentables.append(f); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
189 | } |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
190 | qDebug() << "fermentables" << recipe->fermentables.size(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
191 | } |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
192 | } else { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
193 | qDebug() << "empty fermentables"; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
194 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
195 | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
196 | const auto& h_json = query.value(85).toString(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
197 | if (!h_json.trimmed().isEmpty()) { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
198 | const auto& formattedJson = QString("%1").arg(h_json); |
113 | 199 | QJsonDocument hops = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); |
200 | if (parseError.error != QJsonParseError::NoError) { | |
201 | qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset; | |
202 | } else if (hops.isArray()) { | |
203 | for (int i = 0; i < hops.array().size(); i++) { | |
204 | QJsonObject obj = hops.array().at(i).toObject(); | |
205 | qDebug() << i << obj; | |
206 | Hops h; | |
207 | h.h_name = obj["h_name"].toString(); | |
208 | h.h_origin = obj["h_origin"].toString(); | |
209 | h.h_amount = obj["h_amount"].toDouble(); | |
210 | h.h_cost = obj["h_cost"].toDouble(); | |
211 | h.h_type = obj["h_type"].toInt(); | |
212 | h.h_form = obj["h_form"].toInt(); | |
213 | h.h_useat = obj["h_useat"].toInt(); | |
214 | h.h_time = obj["h_time"].toInt(); | |
215 | h.h_alpha = obj["h_alpha"].toDouble(); | |
216 | h.h_beta = obj["h_beta"].toDouble(); | |
217 | h.h_hsi = obj["h_hsi"].toDouble(); | |
218 | h.h_humulene = obj["h_humulene"].toDouble(); | |
219 | h.h_caryophyllene = obj["h_caryophyllene"].toDouble(); | |
220 | h.h_cohumulone = obj["h_cohumulone"].toDouble(); | |
221 | h.h_myrcene = obj["h_myrcene"].toDouble(); | |
222 | h.h_total_oil = obj["h_total_oil"].toDouble(); | |
223 | recipe->hops.append(h); | |
224 | } | |
225 | qDebug() << "hops" << recipe->hops.size(); | |
226 | } | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
227 | } else { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
228 | qDebug() << "empty hops"; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
229 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
230 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
231 | const auto& m_json = query.value(86).toString(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
232 | if (!m_json.trimmed().isEmpty()) { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
233 | const auto& formattedJson = QString("%1").arg(m_json); |
112 | 234 | QJsonDocument miscs = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); |
235 | if (parseError.error != QJsonParseError::NoError) { | |
236 | qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset; | |
237 | } else if (miscs.isArray()) { | |
238 | for (int i = 0; i < miscs.array().size(); i++) { | |
239 | QJsonObject obj = miscs.array().at(i).toObject(); | |
240 | qDebug() << i << obj; | |
241 | Miscs m; | |
242 | m.m_name = obj["m_name"].toString(); | |
243 | m.m_amount = obj["m_amount"].toDouble(); | |
244 | m.m_type = obj["m_type"].toInt(); | |
245 | m.m_use_use = obj["m_type"].toInt(); | |
246 | m.m_time = obj["m_time"].toDouble(); | |
247 | m.m_amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false; | |
248 | m.m_cost = obj["m_cost"].toDouble(); | |
249 | recipe->miscs.append(m); | |
250 | } | |
251 | qDebug() << "miscs" << recipe->miscs.size(); | |
252 | } | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
253 | } else { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
254 | qDebug() << "empty miscs"; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
255 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
256 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
257 | const auto& y_json = query.value(87).toString(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
258 | if (!y_json.trimmed().isEmpty()) { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
259 | const auto& formattedJson = QString("%1").arg(y_json); |
111 | 260 | QJsonDocument yeasts = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); |
261 | if (parseError.error != QJsonParseError::NoError) { | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
262 | qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; |
111 | 263 | } else if (yeasts.isArray()) { |
264 | for (int i = 0; i < yeasts.array().size(); i++) { | |
265 | QJsonObject obj = yeasts.array().at(i).toObject(); | |
266 | qDebug() << i << obj; | |
267 | Yeasts y; | |
268 | y.y_name = obj["y_name"].toString(); | |
269 | y.y_laboratory = obj["y_laboratory"].toString(); | |
270 | y.y_product_id = obj["y_product_id"].toString(); | |
271 | y.y_amount = obj["y_amount"].toDouble(); | |
272 | y.y_type = obj["y_type"].toInt(); | |
273 | y.y_form = obj["y_form"].toInt(); | |
274 | y.y_min_temperature = obj["y_min_temperature"].toDouble(); | |
275 | y.y_max_temperature = obj["y_max_temperature"].toDouble(); | |
276 | y.y_flocculation = obj["y_flocculation"].toInt(); | |
277 | y.y_attenuation = obj["y_attenuation"].toDouble(); | |
278 | y.y_cells = obj["y_cells"].toDouble(); | |
279 | y.y_tolerance = obj["y_tolerance"].toDouble(); | |
280 | y.y_inventory = obj["y_inventory"].toDouble(); | |
281 | y.y_use = obj["y_use"].toInt(); | |
282 | y.y_sta1 = obj["y_sta1"].toInt() ? true:false; | |
283 | y.y_bacteria = obj["y_bacteria"].toInt() ? true:false; | |
284 | y.y_harvest_top = obj["y_harvest_top"].toInt() ? true:false; | |
285 | y.y_harvest_time = obj["y_harvest_time"].toInt(); | |
286 | y.y_pitch_temperature = obj["y_pitch_temperature"].toDouble(); | |
287 | y.y_pofpos = obj["y_pofpos"].toInt() ? true:false; | |
288 | y.y_zymocide = obj["y_zymocide"].toInt(); | |
289 | y.y_gr_hl_lo = obj["y_gr_hl_lo"].toInt(); | |
290 | y.y_sg_lo = obj["y_sg_lo"].toDouble(); | |
291 | y.y_gr_hl_hi = obj["y_gr_hl_hi"].toInt(); | |
292 | y.y_sg_hi = obj["y_sg_hi"].toDouble(); | |
293 | y.y_cost = obj["y_cost"].toDouble(); | |
294 | recipe->yeasts.append(y); | |
295 | } | |
296 | qDebug() << "yeasts" << recipe->yeasts.size(); | |
297 | } | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
298 | } else { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
299 | qDebug() << "empty yeasts"; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
300 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
301 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
302 | const auto& ma_json = query.value(88).toString(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
303 | if (!ma_json.trimmed().isEmpty()) { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
304 | const auto& formattedJson = QString("%1").arg(ma_json); |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
305 | QJsonDocument mashs = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
306 | if (parseError.error != QJsonParseError::NoError) { |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
307 | qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
308 | } else if (mashs.isArray()) { |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
309 | for (int i = 0; i < mashs.array().size(); i++) { |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
310 | QJsonObject obj = mashs.array().at(i).toObject(); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
311 | // qDebug() << i << obj; |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
312 | Mashs m; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
313 | m.step_name = obj["step_name"].toString(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
314 | m.step_type = obj["step_type"].toInt(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
315 | m.step_volume = obj["step_volume"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
316 | m.step_infuse_amount = obj["step_infuse_amount"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
317 | m.step_infuse_temp = obj["step_infuse_temp"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
318 | m.step_temp = obj["step_temp"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
319 | m.step_time = obj["step_time"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
320 | m.ramp_time = obj["ramp_time"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
321 | m.end_temp = obj["end_temp"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
322 | m.step_wg_ratio = obj["step_wg_ratio"].toDouble(); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
323 | recipe->mashs.append(m); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
324 | } |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
325 | } |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
326 | } else { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
327 | qDebug() << "empty mashs"; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
328 | } |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
329 | qDebug() << "mashs" << recipe->mashs.size(); |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
330 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
331 | } else { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
332 | /* Set some defaults */ |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
333 | recipe->locked = false; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
334 | recipe->st_name = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
335 | recipe->st_letter = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
336 | recipe->st_guide = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
337 | recipe->st_category = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
338 | recipe->st_category_number = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
339 | recipe->st_type = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
340 | recipe->st_og_min = 1.025; recipe->st_og_max = 1.100; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
341 | recipe->st_fg_min = 1.000; recipe->st_fg_max = 1.020; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
342 | recipe->st_ibu_min = 5; recipe->st_ibu_max = 200; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
343 | recipe->st_color_min = 3; recipe->st_color_max = 100; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
344 | recipe->st_carb_min = 1.0; recipe->st_carb_max = 4.5; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
345 | recipe->st_abv_min = 1; recipe->st_abv_max = 15; |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
346 | recipe->name = ""; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
347 | recipe->notes = ""; |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
348 | recipe->efficiency = 75; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
349 | recipe->batch_size = 20; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
350 | recipe->boil_size = 24; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
351 | recipe->boil_time = 60; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
352 | recipe->type = 2; |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
353 | recipe->est_og = recipe->est_fg = recipe->est_color = recipe->est_ibu = recipe->est_abv = 0; |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
354 | recipe->sparge_temp = 80; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
355 | recipe->sparge_ph = 5.4; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
356 | recipe->sparge_volume = 8; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
357 | recipe->sparge_source = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
358 | recipe->sparge_acid_type = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
359 | recipe->sparge_acid_perc = 80; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
360 | recipe->sparge_acid_amount = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
361 | recipe->mash_ph = 5.4; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
362 | recipe->mash_name = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
363 | recipe->calc_acid = true; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
364 | recipe->w1_name = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
365 | recipe->w1_amount = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
366 | recipe->w1_calcium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
367 | recipe->w1_sulfate = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
368 | recipe->w1_chloride = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
369 | recipe->w1_sodium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
370 | recipe->w1_magnesium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
371 | recipe->w1_total_alkalinity = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
372 | recipe->w1_ph = 7; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
373 | recipe->w1_cost = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
374 | recipe->w2_name = ""; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
375 | recipe->w2_amount = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
376 | recipe->w2_calcium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
377 | recipe->w2_sulfate = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
378 | recipe->w2_chloride = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
379 | recipe->w2_sodium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
380 | recipe->w2_magnesium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
381 | recipe->w2_total_alkalinity = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
382 | recipe->w2_ph = 7; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
383 | recipe->w2_cost = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
384 | recipe->wg_amount = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
385 | recipe->wg_calcium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
386 | recipe->wg_sulfate = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
387 | recipe->wg_chloride = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
388 | recipe->wg_sodium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
389 | recipe->wg_magnesium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
390 | recipe->wg_total_alkalinity = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
391 | recipe->wg_ph = 7; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
392 | recipe->wb_calcium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
393 | recipe->wb_sulfate = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
394 | recipe->wb_chloride = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
395 | recipe->wb_sodium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
396 | recipe->wb_magnesium = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
397 | recipe->wb_total_alkalinity = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
398 | recipe->wb_ph = 7; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
399 | recipe->wa_acid_name = 0; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
400 | recipe->wa_acid_perc = 80; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
401 | recipe->wa_base_name = 0; |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
402 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
403 | |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
404 | ui->lockedEdit->setChecked(recipe->locked); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
405 | ui->st_nameEdit->setText(recipe->st_name); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
406 | ui->st_groupEdit->setText(recipe->st_letter); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
407 | ui->st_guideEdit->setText(recipe->st_guide); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
408 | ui->st_catEdit->setText(recipe->st_category); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
409 | ui->st_catnrEdit->setText(QString("%1").arg(recipe->st_category_number)); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
410 | ui->st_typeEdit->setText(s_types[recipe->st_type]); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
411 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
412 | ui->nameEdit->setText(recipe->name); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
413 | ui->notesEdit->setPlainText(recipe->notes); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
414 | ui->typeEdit->setCurrentIndex(recipe->type); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
415 | ui->batch_sizeEdit->setValue(recipe->batch_size); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
416 | ui->boil_sizeEdit->setValue(recipe->boil_size); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
417 | ui->boil_timeEdit->setValue(recipe->boil_time); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
418 | ui->efficiencyEdit->setValue(recipe->efficiency); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
419 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
420 | ui->est_ogEdit->setValue(recipe->est_og); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
421 | ui->est_og2Edit->setValue(recipe->est_og); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
422 | ui->est_og3Edit->setValue(recipe->est_og); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
423 | ui->est_ogShow->setRange(recipe->st_og_min, recipe->st_og_max); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
424 | ui->est_ogShow->setPrecision(3); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
425 | ui->est_ogShow->setMarkerTextIsValue(true); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
426 | ui->est_ogShow->setValue(recipe->est_og); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
427 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
428 | ui->est_fgEdit->setValue(recipe->est_fg); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
429 | ui->est_fg3Edit->setValue(recipe->est_fg); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
430 | ui->est_fgShow->setRange(recipe->st_fg_min, recipe->st_fg_max); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
431 | ui->est_fgShow->setPrecision(3); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
432 | ui->est_fgShow->setMarkerTextIsValue(true); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
433 | ui->est_fgShow->setValue(recipe->est_fg); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
434 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
435 | ui->est_abvEdit->setValue(recipe->est_abv); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
436 | ui->est_abv2Edit->setValue(recipe->est_abv); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
437 | ui->est_abvShow->setRange(recipe->st_abv_min, recipe->st_abv_max); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
438 | ui->est_abvShow->setPrecision(1); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
439 | ui->est_abvShow->setMarkerTextIsValue(true); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
440 | ui->est_abvShow->setValue(recipe->est_abv); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
441 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
442 | ui->est_colorEdit->setValue(recipe->est_color); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
443 | ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(recipe->est_color)); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
444 | ui->est_color2Edit->setValue(recipe->est_color); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
445 | ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(recipe->est_color)); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
446 | ui->est_colorShow->setPrecision(0); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
447 | ui->est_colorShow->setMarkerTextIsValue(true); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
448 | ui->est_colorShow->setRange(recipe->st_color_min, recipe->st_color_max); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
449 | ui->est_colorShow->setValue(recipe->est_color); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
450 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
451 | ui->color_methodEdit->setCurrentIndex(recipe->color_method); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
452 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
453 | ui->est_ibuEdit->setValue(recipe->est_ibu); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
454 | ui->est_ibu2Edit->setValue(recipe->est_ibu); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
455 | ui->est_ibuShow->setPrecision(0); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
456 | ui->est_ibuShow->setMarkerTextIsValue(true); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
457 | ui->est_ibuShow->setRange(recipe->st_ibu_min, recipe->st_ibu_max); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
458 | ui->est_ibuShow->setValue(recipe->est_ibu); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
459 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
460 | ui->ibu_methodEdit->setCurrentIndex(recipe->ibu_method); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
461 | |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
462 | ui->est_carbEdit->setValue(recipe->est_carb); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
463 | ui->est_carbShow->setPrecision(1); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
464 | ui->est_carbShow->setMarkerTextIsValue(true); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
465 | ui->est_carbShow->setRange(recipe->st_carb_min, recipe->st_carb_max); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
466 | ui->est_carbShow->setValue(recipe->est_carb); |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
467 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
468 | // All signals from tab "Generic" |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
469 | connect(ui->lockedEdit, &QCheckBox::stateChanged, this, &EditRecipe::is_changed); |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
470 | connect(ui->nameEdit, &QLineEdit::textChanged, this, &EditRecipe::name_changed); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
471 | connect(ui->notesEdit, SIGNAL(textChanged()), this, SLOT(notes_changed())); |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
472 | connect(ui->typeEdit, &QComboBox::currentTextChanged, this, &EditRecipe::is_changed); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
473 | connect(ui->batch_sizeEdit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
474 | connect(ui->boil_timeEdit, &QSpinBox::textChanged, this, &EditRecipe::is_changed); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
475 | connect(ui->efficiencyEdit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
476 | connect(ui->beerstyleEdit, &QComboBox::currentTextChanged, this, &EditRecipe::style_changed); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
477 | connect(ui->est_ogEdit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
478 | connect(ui->color_methodEdit, &QComboBox::currentTextChanged, this, &EditRecipe::colormethod_changed); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
479 | connect(ui->ibu_methodEdit, &QComboBox::currentTextChanged, this, &EditRecipe::is_changed); |
95
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
480 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
481 | // All signals from tab "Fermentables" |
106
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
482 | ui->fermentablesTable->setEditTriggers(QAbstractItemView::NoEditTriggers); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
483 | connect(ui->est_og2Edit, &QDoubleSpinBox::textChanged, this, &EditRecipe::is_changed); |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
484 | connect(ui->perc_mashShow, &QProgressBar::valueChanged, this, &EditRecipe::on_perc_mash_valueChanged); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
485 | connect(ui->perc_sugarsShow, &QProgressBar::valueChanged, this, &EditRecipe::on_perc_sugars_valueChanged); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
486 | connect(ui->perc_caraShow, &QProgressBar::valueChanged, this, &EditRecipe::on_perc_cara_valueChanged); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
487 | connect(ui->lintnerShow, &QProgressBar::valueChanged, this, &EditRecipe::on_lintner_valueChanged); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
488 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
489 | // All signals from tab "Hops" |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
490 | // connect(ui->hopsTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int))); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
491 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
492 | // All signals from tab "Miscs" |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
493 | // connect(ui->hopsTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int))); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
494 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
495 | // All signals from tab "Yeasts" |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
496 | // connect(ui->hopsTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int))); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
497 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
498 | // All signals from tab "Mash" |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
499 | // connect(ui->hopsTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int))); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
500 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
501 | // All signals from tab "Water" |
100
d11a3e713e3b
Added more edit fields to the first recipe editor tab. Cleanup of RangedSlider is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
502 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
503 | ui->saveButton->setEnabled(false); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
504 | ui->deleteButton->setEnabled((id >= 0) ? true:false); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
505 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
506 | emit refreshAll(); |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
507 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
508 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
509 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
510 | EditRecipe::~EditRecipe() |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
511 | { |
95
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
512 | qDebug() << "EditRecipe done start"; |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
513 | delete ui; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
514 | emit entry_changed(); |
95
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
515 | qDebug() << "EditRecipe done final"; |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
516 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
517 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
518 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
519 | bool EditRecipe::ferment_sort_test(const Fermentables &D1, const Fermentables &D2) |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
520 | { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
521 | return (D1.f_added <= D2.f_added) && (D1.f_amount >= D2.f_amount) && (D1.f_color < D2.f_color); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
522 | } |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
523 | |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
524 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
525 | void EditRecipe::refreshFermentables() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
526 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
527 | QString w; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
528 | QWidget* pWidget; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
529 | QHBoxLayout* pLayout; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
530 | QTableWidgetItem *item; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
531 | QLabel *label; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
532 | |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
533 | qDebug() << "refreshFermentables" << recipe->fermentables.size(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
534 | std::sort(recipe->fermentables.begin(), recipe->fermentables.end(), ferment_sort_test); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
535 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
536 | /* |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
537 | * During filling the table turn off the cellChanged signal because every cell that is filled |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
538 | * triggers the cellChanged signal. The QTableWidget has no better signal to use. |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
539 | */ |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
540 | this->ignoreChanges = true; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
541 | |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
542 | const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"), |
106
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
543 | tr("Amount"), tr("Procent"), tr("100%"), tr("Delete"), tr("Edit") }); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
544 | ui->fermentablesTable->setColumnCount(12); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
545 | ui->fermentablesTable->setColumnWidth(0, 150); /* Supplier */ |
106
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
546 | ui->fermentablesTable->setColumnWidth(1, 225); /* Fermentable */ |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
547 | ui->fermentablesTable->setColumnWidth(2, 50); /* Color */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
548 | ui->fermentablesTable->setColumnWidth(3, 75); /* Type */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
549 | ui->fermentablesTable->setColumnWidth(4, 75); /* Graintype */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
550 | ui->fermentablesTable->setColumnWidth(5, 75); /* Added */ |
106
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
551 | ui->fermentablesTable->setColumnWidth(6, 60); /* Yield */ |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
552 | ui->fermentablesTable->setColumnWidth(7, 90); /* Amount */ |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
553 | ui->fermentablesTable->setColumnWidth(8, 60); /* Procent */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
554 | ui->fermentablesTable->setColumnWidth(9, 50); /* 100% */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
555 | ui->fermentablesTable->setColumnWidth(10, 80); /* Delete */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
556 | ui->fermentablesTable->setColumnWidth(11, 80); /* Edit */ |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
557 | ui->fermentablesTable->setHorizontalHeaderLabels(labels); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
558 | ui->fermentablesTable->verticalHeader()->hide(); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
559 | ui->fermentablesTable->setRowCount(recipe->fermentables.size()); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
560 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
561 | for (int i = 0; i < recipe->fermentables.size(); i++) { |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
562 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
563 | ui->fermentablesTable->setItem(i, 0, new QTableWidgetItem(recipe->fermentables.at(i).f_supplier)); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
564 | ui->fermentablesTable->setItem(i, 1, new QTableWidgetItem(recipe->fermentables.at(i).f_name)); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
565 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
566 | w = QString("%1").arg(recipe->fermentables.at(i).f_color, 1, 'f', 0, '0'); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
567 | item = new QTableWidgetItem(w); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
568 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
569 | ui->fermentablesTable->setItem(i, 2, item); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
570 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
571 | item = new QTableWidgetItem(f_types[recipe->fermentables.at(i).f_type]); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
572 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
573 | ui->fermentablesTable->setItem(i, 3, item); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
574 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
575 | item = new QTableWidgetItem(f_graintypes[recipe->fermentables.at(i).f_graintype]); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
576 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
577 | ui->fermentablesTable->setItem(i, 4, item); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
578 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
579 | item = new QTableWidgetItem(f_added[recipe->fermentables.at(i).f_added]); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
580 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
581 | ui->fermentablesTable->setItem(i, 5, item); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
582 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
583 | item = new QTableWidgetItem(QString("%1%").arg(recipe->fermentables.at(i).f_yield, 2, 'f', 1, '0')); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
584 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
585 | ui->fermentablesTable->setItem(i, 6, item); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
586 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
587 | item = new QTableWidgetItem(QString("%1 Kg").arg(recipe->fermentables.at(i).f_amount, 4, 'f', 3, '0')); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
588 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
589 | ui->fermentablesTable->setItem(i, 7, item); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
590 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
591 | item = new QTableWidgetItem(QString("%1%").arg(recipe->fermentables.at(i).f_percentage, 2, 'f', 1, '0')); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
592 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
593 | ui->fermentablesTable->setItem(i, 8, item); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
594 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
595 | if (recipe->fermentables.at(i).f_adjust_to_total_100) { |
106
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
596 | pWidget = new QWidget(); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
597 | label = new QLabel; |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
598 | label->setPixmap(QPixmap(":icons/silk/tick.png")); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
599 | pLayout = new QHBoxLayout(pWidget); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
600 | pLayout->addWidget(label); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
601 | pLayout->setAlignment(Qt::AlignCenter); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
602 | pLayout->setContentsMargins(0, 0, 0, 0); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
603 | pWidget->setLayout(pLayout); |
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
604 | ui->fermentablesTable->setCellWidget(i, 9, pWidget); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
605 | } else { |
106
2924fb71dce9
Global table edit lock. The 100% mark is now display only, editing goes into the popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
105
diff
changeset
|
606 | ui->fermentablesTable->removeCellWidget(i, 9); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
607 | } |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
608 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
609 | /* Add the Delete row button */ |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
610 | pWidget = new QWidget(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
611 | QPushButton* btn_dele = new QPushButton(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
612 | btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
613 | btn_dele->setText(tr("Delete")); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
614 | connect(btn_dele, SIGNAL(clicked()), this, SLOT(on_deleteFermentRow_clicked())); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
615 | pLayout = new QHBoxLayout(pWidget); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
616 | pLayout->addWidget(btn_dele); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
617 | pLayout->setContentsMargins(5, 0, 5, 0); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
618 | pWidget->setLayout(pLayout); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
619 | ui->fermentablesTable->setCellWidget(i, 10, pWidget); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
620 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
621 | pWidget = new QWidget(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
622 | QPushButton* btn_edit = new QPushButton(); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
623 | btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
624 | btn_edit->setText(tr("Edit")); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
625 | connect(btn_edit, SIGNAL(clicked()), this, SLOT(on_editFermentRow_clicked())); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
626 | pLayout = new QHBoxLayout(pWidget); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
627 | pLayout->addWidget(btn_edit); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
628 | pLayout->setContentsMargins(5, 0, 5, 0); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
629 | pWidget->setLayout(pLayout); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
630 | ui->fermentablesTable->setCellWidget(i, 11, pWidget); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
631 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
632 | this->ignoreChanges = false; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
633 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
634 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
635 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
636 | void EditRecipe::refreshHops() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
637 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
638 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
639 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
640 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
641 | void EditRecipe::refreshMiscs() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
642 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
643 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
644 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
645 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
646 | void EditRecipe::refreshYeasts() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
647 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
648 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
649 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
650 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
651 | void EditRecipe::refreshMashs() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
652 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
653 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
654 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
655 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
656 | void EditRecipe::refreshAll() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
657 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
658 | refreshFermentables(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
659 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
660 | calcFermentables(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
661 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
662 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
663 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
664 | void EditRecipe::calcFermentables() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
665 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
666 | int i; |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
667 | double psugar = 0, pcara = 0, d, s = 0, x, color; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
668 | double vol = 0; // Volume sugars after boil |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
669 | double addedS = 0; // Added sugars after boil |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
670 | double addedmass = 0; // Added mass after boil |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
671 | double mvol = 0; // Mash volume |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
672 | double lintner = 0; // Total recipe lintner |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
673 | double mashkg = 0; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
674 | double sugarsf = 0; // fermentable sugars mash + boil |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
675 | double sugarsm = 0; // fermentable sugars in mash |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
676 | double sugardensity = 1.611; // kg/l in solution |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
677 | double mashtime = 0; // Total mash time |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
678 | double mashtemp = 0; // Average mash temperature |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
679 | double mashinfuse = 0; // Mash infuse amount |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
680 | double colort = 0; // Colors srm * vol totals |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
681 | double colorh = 0; // Colors ebc * vol * kt |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
682 | double colorn = 0; // Colors ebc * pt * pct |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
683 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
684 | qDebug() << "calcFermentables()"; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
685 | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
686 | /* |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
687 | * Get average mashtemp and mashtime from the Mash schedule. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
688 | * It is possible that the schedule is not (yet) present. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
689 | */ |
109
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
690 | if (recipe->mashs.size() > 0) { |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
691 | for (i = 0; i < recipe->mashs.size(); i++) { |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
692 | if (recipe->mashs.at(i).step_type == 0) // Infusion |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
693 | mashinfuse += recipe->mashs.at(i).step_infuse_amount; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
694 | if (recipe->mashs.at(i).step_temp < 75) { // Ignore mashout |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
695 | mashtime += recipe->mashs.at(i).step_time; |
1ce50e72a6b1
Completed read MySQL recipe record. Mash schedule moved to recipe QList.
Michiel Broek <mbroek@mbse.eu>
parents:
108
diff
changeset
|
696 | mashtemp += recipe->mashs.at(i).step_time * recipe->mashs.at(i).step_temp; |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
697 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
698 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
699 | mashtemp = mashtemp / mashtime; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
700 | mvol = mashinfuse; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
701 | qDebug() << " mash time" << mashtime << "temp" << mashtemp << "infuse" << mashinfuse; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
702 | } else { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
703 | qDebug() << " no mash schedule"; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
704 | } |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
705 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
706 | if (recipe->fermentables.size() < 1) { |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
707 | qDebug() << " no fermentables, return."; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
708 | return; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
709 | } |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
710 | qDebug() << " adjust to 100" << recipe->fermentables_use100; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
711 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
712 | for (i = 0; i < recipe->fermentables.size(); i++) { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
713 | if (recipe->fermentables.at(i).f_type == 1 && recipe->fermentables.at(i).f_added < 4) // Sugars |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
714 | psugar += recipe->fermentables.at(i).f_percentage; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
715 | if (recipe->fermentables.at(i).f_graintype == 2 && recipe->fermentables.at(i).f_added < 4) // Crystal/Cara |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
716 | pcara += recipe->fermentables.at(i).f_percentage; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
717 | d = recipe->fermentables.at(i).f_amount * (recipe->fermentables.at(i).f_yield / 100) * (1 - recipe->fermentables.at(i).f_moisture / 100); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
718 | if (recipe->fermentables.at(i).f_added == 0) { // Mash |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
719 | if (mvol > 0) { // If mash volume is known |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
720 | mvol += recipe->fermentables.at(i).f_amount * recipe->fermentables.at(i).f_moisture / 100; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
721 | s += d; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
722 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
723 | d = ui->efficiencyEdit->value() / 100 * d; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
724 | sugarsm += d; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
725 | mashkg += recipe->fermentables.at(i).f_amount; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
726 | } |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
727 | if (recipe->fermentables.at(i).f_added == 0 || recipe->fermentables.at(i).f_added == 1) // Mash or boil |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
728 | sugarsf += d; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
729 | if (recipe->fermentables.at(i).f_added == 2 || recipe->fermentables.at(i).f_added == 3) { // Fermentation or lagering |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
730 | x = (recipe->fermentables.at(i).f_yield / 100) * (1 - recipe->fermentables.at(i).f_moisture / 100); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
731 | addedS += recipe->fermentables.at(i).f_amount * x; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
732 | addedmass += recipe->fermentables.at(i).f_amount; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
733 | vol += (x * sugardensity + (1 - x) * 1) * recipe->fermentables.at(i).f_amount; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
734 | } |
114
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
735 | if (recipe->fermentables.at(i).f_added == 0 && |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
736 | (recipe->fermentables.at(i).f_type == 0 || recipe->fermentables.at(i).f_type == 4) && |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
737 | recipe->fermentables.at(i).f_color < 50) { |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
738 | lintner += recipe->fermentables.at(i).f_diastatic_power * recipe->fermentables.at(i).f_amount; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
739 | } |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
740 | if (recipe->fermentables.at(i).f_added < 4) { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
741 | colort += recipe->fermentables.at(i).f_amount * Utils::ebc_to_srm(recipe->fermentables.at(i).f_color); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
742 | colorh += recipe->fermentables.at(i).f_amount * recipe->fermentables.at(i).f_color * Utils::get_kt(recipe->fermentables.at(i).f_color); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
743 | colorn += (recipe->fermentables.at(i).f_percentage / 100) * recipe->fermentables.at(i).f_color; // For 8.6 Pt wort. |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
744 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
745 | } |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
746 | qDebug() << " colort" << colort << "colorh" << colorh << "colorn" << colorn; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
747 | qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
748 | qDebug() << " sugarsf" << sugarsf << "sugarsm" << sugarsm; |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
749 | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
750 | double og = Utils::estimate_sg(sugarsf + addedS, ui->batch_sizeEdit->value()); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
751 | qDebug() << " OG" << ui->est_ogEdit->value() << og; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
752 | ui->est_ogEdit->setValue(og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
753 | ui->est_og2Edit->setValue(og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
754 | ui->est_og3Edit->setValue(og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
755 | ui->est_ogShow->setValue(og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
756 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
757 | double preboil_sg = Utils::estimate_sg(sugarsm, ui->boil_sizeEdit->value()); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
758 | qDebug() << " preboil SG" << preboil_sg; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
759 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
760 | /* |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
761 | * Color of the wort |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
762 | */ |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
763 | if (ui->color_methodEdit->currentIndex() == 4) { // Naudts |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
764 | color = round(((Utils::sg_to_plato(og) / 8.6) * colorn) + (ui->boil_timeEdit->value() / 60)); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
765 | } else if (ui->color_methodEdit->currentIndex() == 3) { // Hans Halberstadt |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
766 | double bv = 0.925; // Beer loss efficiency |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
767 | double sr = 0.95; // Mash and sparge efficiency |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
768 | color = round((4.46 * bv * sr) / ui->batch_sizeEdit->value() * colorh); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
769 | } else { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
770 | double cw = colort / ui->batch_sizeEdit->value() * 8.34436; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
771 | color = Utils::kw_to_ebc(ui->color_methodEdit->currentIndex(), cw); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
772 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
773 | qDebug() << " color" << ui->est_colorEdit->value() << color; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
774 | ui->est_colorEdit->setValue(color); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
775 | ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color)); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
776 | ui->est_color2Edit->setValue(color); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
777 | ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color)); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
778 | ui->est_colorShow->setValue(color); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
779 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
780 | /* |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
781 | * We don't have a equipment profile in recipes, |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
782 | * so we assume a certain guessed mashtun size. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
783 | */ |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
784 | ui->perc_mashShow->setValue(round(mashkg / (ui->boil_sizeEdit->value() / 3) * 100)); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
785 | ui->perc_sugarsShow->setValue(round(psugar)); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
786 | ui->perc_caraShow->setValue(round(pcara)); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
787 | qDebug() << " lintner" << lintner << " mashkg" << mashkg << "final" << round(lintner / mashkg); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
788 | ui->lintnerShow->setValue(round(lintner / mashkg)); |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
789 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
790 | /* |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
791 | * Calculate the apparant attenuation. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
792 | */ |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
793 | double svg = 0; |
111 | 794 | if (recipe->yeasts.size() > 0) { |
795 | for (i = 0; i < recipe->yeasts.size(); i++) { | |
796 | if (recipe->yeasts.at(i).y_use == 0) { // Used in primary | |
797 | if (recipe->yeasts.at(i).y_attenuation > svg) | |
798 | svg = recipe->yeasts.at(i).y_attenuation; // Take the highest if multiple yeasts. | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
799 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
800 | // TODO: brett or others in secondary. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
801 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
802 | qDebug() << " SVG" << svg; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
803 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
804 | if (svg == 0) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
805 | svg = 77.0; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
806 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
807 | double fg; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
808 | if (mashkg > 0 && mashinfuse > 0 && mashtime > 0 && mashtemp > 0) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
809 | fg = Utils::estimate_fg(psugar, pcara, mashinfuse / mashkg, mashtime, mashtemp, svg, og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
810 | else |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
811 | fg = Utils::estimate_fg(psugar, pcara, 0, 0, 0, svg, og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
812 | qDebug() << " FG" << ui->est_fgEdit->value() << fg; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
813 | ui->est_fgEdit->setValue(fg); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
814 | ui->est_fg3Edit->setValue(fg); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
815 | ui->est_fgShow->setValue(fg); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
816 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
817 | double abv = Utils::abvol(og, fg); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
818 | qDebug() << " ABV" << ui->est_abvEdit->value() << abv; |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
819 | ui->est_abvEdit->setValue(abv); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
820 | ui->est_abv2Edit->setValue(abv); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
821 | ui->est_abvShow->setValue(abv); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
822 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
823 | /* |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
824 | * Calculate kilocalories/liter. Formula from brouwhulp. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
825 | * Take the alcohol and sugar parts and then combine. |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
826 | */ |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
827 | double alc = 1881.22 * fg * (og - fg) / (1.775 - og); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
828 | double sug = 3550 * fg * (0.1808 * og + 0.8192 * fg - 1.0004); |
104
c02dfb7bb2f9
Show kcal/l in the first tab
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
829 | ui->calEdit->setValue(round((alc + sug) / (12 * 0.0295735296))); |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
830 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
831 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
832 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
833 | void EditRecipe::on_perc_mash_valueChanged(int value) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
834 | { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
835 | if (value < 90) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
836 | ui->perc_mashShow->setStyleSheet(bar_green); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
837 | else if (value < 100) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
838 | ui->perc_mashShow->setStyleSheet(bar_orange); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
839 | else |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
840 | ui->perc_mashShow->setStyleSheet(bar_red); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
841 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
842 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
843 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
844 | void EditRecipe::on_perc_sugars_valueChanged(int value) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
845 | { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
846 | if (value < 20) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
847 | ui->perc_sugarsShow->setStyleSheet(bar_green); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
848 | else |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
849 | ui->perc_sugarsShow->setStyleSheet(bar_red); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
850 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
851 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
852 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
853 | void EditRecipe::on_perc_cara_valueChanged(int value) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
854 | { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
855 | if (value < 25) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
856 | ui->perc_caraShow->setStyleSheet(bar_green); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
857 | else |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
858 | ui->perc_caraShow->setStyleSheet(bar_red); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
859 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
860 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
861 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
862 | void EditRecipe::on_lintner_valueChanged(int value) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
863 | { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
864 | if (value < 30) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
865 | ui->lintnerShow->setStyleSheet(bar_red); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
866 | else if (value < 40) |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
867 | ui->lintnerShow->setStyleSheet(bar_orange); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
868 | else |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
869 | ui->lintnerShow->setStyleSheet(bar_green); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
870 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
871 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
872 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
873 | /* |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
874 | * Window header, mark any change with '**' |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
875 | */ |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
876 | void EditRecipe::WindowTitle() |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
877 | { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
878 | QString txt; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
879 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
880 | if (this->recno < 0) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
881 | txt = QString(tr("BMSapp - Add new recipe")); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
882 | } else { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
883 | txt = QString(tr("BMSapp - Edit recipe %1").arg(this->recno)); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
884 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
885 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
886 | if (this->textIsChanged) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
887 | txt.append((QString(" **"))); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
888 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
889 | setWindowTitle(txt); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
890 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
891 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
892 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
893 | void EditRecipe::on_saveButton_clicked() |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
894 | { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
895 | QSqlQuery query; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
896 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
897 | /* If there are errors in the form, show a message and do "return;" */ |
95
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
898 | if (ui->nameEdit->text().length() < 2) { |
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
899 | QMessageBox::warning(this, tr("Edit Recipe"), tr("Name empty or too short.")); |
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
900 | return; |
ef6048186cb3
Added part of a beercolor plugin that needs a lot of work. Added some rangesliders in the recipe editor. Added EBC and SRM color mapping to QColor.
Michiel Broek <mbroek@mbse.eu>
parents:
92
diff
changeset
|
901 | } |
114
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
902 | if (ui->st_nameEdit->text().length() < 2) { |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
903 | QMessageBox::warning(this, tr("Edit Recipe"), tr("No beerstyle selected.")); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
904 | return; |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
905 | } |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
906 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
907 | if (this->textIsChanged) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
908 | if (this->recno == -1) { |
107
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
909 | query.prepare("INSERT INTO recipes SET locked=:locked, st_name=:st_name, st_letter=:st_letter, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
910 | "st_guide=:st_guide, st_category=:st_category, st_category_number=:st_catnr, st_type=:st_type, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
911 | "st_og_min=:st_og_min, st_og_max=:st_og_max, st_fg_min=:st_fg_min, st_fg_max=:st_fg_max, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
912 | "st_ibu_min=:st_ibu_min, st_ibu_max=:st_ibu_max, st_color_min=:st_color_min, st_color_max=:st_color_max, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
913 | "st_carb_min=:st_carb_min, st_carb_max=:st_carb_max, st_abv_min=:st_abv_min, st_abv_max=:st_abv_max, " |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
914 | "name=:name, notes=:notes, type=:type, batch_size=:batch_size, boil_size=:boil_size, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
915 | "boil_time=:boil_time, efficiency=:efficiency, sparge_temp=:sparge_temp, sparge_ph=:sparge_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
916 | "sparge_volume=:sparge_volume, sparge_source=:sparge_source, sparge_acid_type=:sparge_acid_type, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
917 | "sparge_acid_perc=:sparge_acid_perc, sparge_acid_amount=:sparge_acid_amount, mash_ph=:mash_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
918 | "mash_name=:mash_name, calc_acid=:calc_acid, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
919 | "w1_name=:w1_name, w1_amount=:w1_amount, w1_calcium=:w1_calcium, w1_sulfate=:w1_sulfate, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
920 | "w1_chloride=:w1_chloride, w1_sodium=:w1_sodium, w1_magnesium=:w1_magnesium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
921 | "w1_total_alkalinity=:w1_total_alkalinity, w1_ph=:w1_ph, w1_cost=:w1_cost, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
922 | "w2_name=:w2_name, w2_amount=:w2_amount, w2_calcium=:w2_calcium, w2_sulfate=:w2_sulfate, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
923 | "w2_chloride=:w2_chloride, w2_sodium=:w2_sodium, w2_magnesium=:w2_magnesium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
924 | "w2_total_alkalinity=:w2_total_alkalinity, w2_ph=:w2_ph, w2_cost=:w2_cost, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
925 | "wg_amount=:wg_amount, wg_calcium=:wg_calcium, wg_sulfate=:wg_sulfate, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
926 | "wg_chloride=:wg_chloride, wg_sodium=:wg_sodium, wg_magnesium=:wg_magnesium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
927 | "wg_total_alkalinity=:wg_total_alkalinity, wg_ph=:wg_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
928 | "wb_calcium=:wb_calcium, wb_sulfate=:wb_sulfate, wb_chloride=:wb_chloride, wb_sodium=:wb_sodium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
929 | "wb_magnesium=:wb_magnesium, wb_total_alkalinity=:wb_total_alkalinity, wb_ph=:wb_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
930 | "wa_acid_name=:wa_acid_name, wa_acid_perc=:wa_acid_perc, wa_base_name=:wa_base_name, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
931 | "json_fermentables=:json_fermentables, json_hops=:json_hops, json_miscs=:json_miscs, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
932 | "json_yeasts=:json_yeasts, json_mashs=:json_mashs, uuid=:uuid"); |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
933 | } else { |
107
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
934 | query.prepare("UPDATE recipes SET locked=:locked, st_name=:st_name, st_letter=:st_letter, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
935 | "st_guide=:st_guide, st_category=:st_category, st_category_number=:st_catnr, st_type=:st_type, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
936 | "st_og_min=:st_og_min, st_og_max=:st_og_max, st_fg_min=:st_fg_min, st_fg_max=:st_fg_max, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
937 | "st_ibu_min=:st_ibu_min, st_ibu_max=:st_ibu_max, st_color_min=:st_color_min, st_color_max=:st_color_max, " |
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
938 | "st_carb_min=:st_carb_min, st_carb_max=:st_carb_max, st_abv_min=:st_abv_min, st_abv_max=:st_abv_max, " |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
939 | "name=:name, notes=:notes, type=:type, batch_size=:batch_size, boil_size=:boil_size, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
940 | "boil_time=:boil_time, efficiency=:efficiency, sparge_temp=:sparge_temp, sparge_ph=:sparge_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
941 | "sparge_volume=:sparge_volume, sparge_source=:sparge_source, sparge_acid_type=:sparge_acid_type, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
942 | "sparge_acid_perc=:sparge_acid_perc, sparge_acid_amount=:sparge_acid_amount, mash_ph=:mash_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
943 | "mash_name=:mash_name, calc_acid=:calc_acid, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
944 | "w1_name=:w1_name, w1_amount=:w1_amount, w1_calcium=:w1_calcium, w1_sulfate=:w1_sulfate, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
945 | "w1_chloride=:w1_chloride, w1_sodium=:w1_sodium, w1_magnesium=:w1_magnesium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
946 | "w1_total_alkalinity=:w1_total_alkalinity, w1_ph=:w1_ph, w1_cost=:w1_cost, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
947 | "w2_name=:w2_name, w2_amount=:w2_amount, w2_calcium=:w2_calcium, w2_sulfate=:w2_sulfate, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
948 | "w2_chloride=:w2_chloride, w2_sodium=:w2_sodium, w2_magnesium=:w2_magnesium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
949 | "w2_total_alkalinity=:w2_total_alkalinity, w2_ph=:w2_ph, w2_cost=:w2_cost, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
950 | "wg_amount=:wg_amount, wg_calcium=:wg_calcium, wg_sulfate=:wg_sulfate, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
951 | "wg_chloride=:wg_chloride, wg_sodium=:wg_sodium, wg_magnesium=:wg_magnesium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
952 | "wg_total_alkalinity=:wg_total_alkalinity, wg_ph=:wg_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
953 | "wb_calcium=:wb_calcium, wb_sulfate=:wb_sulfate, wb_chloride=:wb_chloride, wb_sodium=:wb_sodium, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
954 | "wb_magnesium=:wb_magnesium, wb_total_alkalinity=:wb_total_alkalinity, wb_ph=:wb_ph, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
955 | "wa_acid_name=:wa_acid_name, wa_acid_perc=:wa_acid_perc, wa_base_name=:wa_base_name, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
956 | "json_fermentables=:json_fermentables, json_hops=:json_hops, json_miscs=:json_miscs, " |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
957 | "json_yeasts=:json_yeasts, json_mashs=:json_mashs WHERE record = :recno"); |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
958 | } |
114
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
959 | query.bindValue(":locked", recipe->locked ? 1:0); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
960 | query.bindValue(":st_name", recipe->st_name); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
961 | query.bindValue(":st_letter", recipe->st_letter); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
962 | query.bindValue(":st_guide", recipe->st_guide); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
963 | query.bindValue(":st_category", recipe->st_category); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
964 | query.bindValue(":st_catnr", recipe->st_category_number); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
965 | query.bindValue(":st_type", recipe->st_type); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
966 | query.bindValue(":st_og_min", round(recipe->st_og_min * 1000) / 1000); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
967 | query.bindValue(":st_og_max", round(recipe->st_og_max * 1000) / 1000); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
968 | query.bindValue(":st_fg_min", round(recipe->st_fg_min * 1000) / 1000); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
969 | query.bindValue(":st_fg_max", round(recipe->st_fg_max * 1000) / 1000); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
970 | query.bindValue(":st_ibu_min", round(recipe->st_ibu_min * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
971 | query.bindValue(":st_ibu_max", round(recipe->st_ibu_max * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
972 | query.bindValue(":st_color_min", round(recipe->st_color_min * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
973 | query.bindValue(":st_color_max", round(recipe->st_color_max * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
974 | query.bindValue(":st_carb_min", round(recipe->st_carb_min * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
975 | query.bindValue(":st_carb_max", round(recipe->st_carb_max * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
976 | query.bindValue(":st_abv_min", round(recipe->st_abv_min * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
977 | query.bindValue(":st_abv_max", round(recipe->st_abv_max * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
978 | query.bindValue(":name", recipe->name); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
979 | query.bindValue(":notes", recipe->notes); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
980 | query.bindValue(":type", recipe->type); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
981 | query.bindValue(":batch_size", round(recipe->batch_size * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
982 | query.bindValue(":boil_size", round(recipe->boil_size * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
983 | query.bindValue(":boil_time", round(recipe->boil_time * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
984 | query.bindValue(":efficiency", round(recipe->efficiency * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
985 | query.bindValue(":est_og", round(recipe->est_og * 1000) / 1000); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
986 | query.bindValue(":est_fg", round(recipe->est_fg * 1000) / 1000); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
987 | query.bindValue(":est_abv", round(recipe->est_abv * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
988 | query.bindValue(":est_color", round(recipe->est_color * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
989 | query.bindValue(":color_method", recipe->color_method); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
990 | query.bindValue(":est_ibu", round(recipe->est_ibu * 10) / 10); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
991 | query.bindValue(":ibu_method", recipe->ibu_method); |
b027aa2a01d4
Code cleanup after last changes.
Michiel Broek <mbroek@mbse.eu>
parents:
113
diff
changeset
|
992 | query.bindValue(":est_carb", round(recipe->est_carb * 10) / 10); |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
993 | query.bindValue(":sparge_temp", round(recipe->sparge_temp * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
994 | query.bindValue(":sparge_ph", round(recipe->sparge_ph * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
995 | query.bindValue(":sparge_volume", round(recipe->sparge_volume * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
996 | query.bindValue(":sparge_source", recipe->sparge_source); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
997 | query.bindValue(":sparge_acid_type", recipe->sparge_acid_type); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
998 | query.bindValue(":sparge_acid_perc", round(recipe->sparge_acid_perc * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
999 | query.bindValue(":sparge_acid_amount", round(recipe->sparge_acid_amount * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1000 | query.bindValue(":mash_ph", round(recipe->mash_ph * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1001 | query.bindValue(":mash_name", recipe->mash_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1002 | query.bindValue(":calc_acid", recipe->calc_acid ?1:0); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1003 | query.bindValue(":w1_name", recipe->w1_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1004 | query.bindValue(":w1_amount", round(recipe->w1_amount * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1005 | query.bindValue(":w1_calcium", round(recipe->w1_calcium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1006 | query.bindValue(":w1_sulfate", round(recipe->w1_sulfate * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1007 | query.bindValue(":w1_chloride", round(recipe->w1_chloride * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1008 | query.bindValue(":w1_sodium", round(recipe->w1_sodium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1009 | query.bindValue(":w1_magnesium", round(recipe->w1_magnesium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1010 | query.bindValue(":w1_total_alkalinity", round(recipe->w1_total_alkalinity * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1011 | query.bindValue(":w1_ph", round(recipe->w1_ph * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1012 | query.bindValue(":w1_cost", round(recipe->w1_cost * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1013 | query.bindValue(":w2_name", recipe->w2_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1014 | query.bindValue(":w2_amount", round(recipe->w2_amount * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1015 | query.bindValue(":w2_calcium", round(recipe->w2_calcium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1016 | query.bindValue(":w2_sulfate", round(recipe->w2_sulfate * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1017 | query.bindValue(":w2_chloride", round(recipe->w2_chloride * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1018 | query.bindValue(":w2_sodium", round(recipe->w2_sodium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1019 | query.bindValue(":w2_magnesium", round(recipe->w2_magnesium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1020 | query.bindValue(":w2_total_alkalinity", round(recipe->w2_total_alkalinity * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1021 | query.bindValue(":w2_ph", round(recipe->w2_ph * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1022 | query.bindValue(":w2_cost", round(recipe->w2_cost * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1023 | query.bindValue(":wg_amount", round(recipe->wg_amount * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1024 | query.bindValue(":wg_calcium", round(recipe->wg_calcium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1025 | query.bindValue(":wg_sulfate", round(recipe->wg_sulfate * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1026 | query.bindValue(":wg_chloride", round(recipe->wg_chloride * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1027 | query.bindValue(":wg_sodium", round(recipe->wg_sodium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1028 | query.bindValue(":wg_magnesium", round(recipe->wg_magnesium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1029 | query.bindValue(":wg_total_alkalinity", round(recipe->wg_total_alkalinity * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1030 | query.bindValue(":wg_ph", round(recipe->wg_ph * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1031 | query.bindValue(":wb_calcium", round(recipe->wb_calcium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1032 | query.bindValue(":wb_sulfate", round(recipe->wb_sulfate * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1033 | query.bindValue(":wb_chloride", round(recipe->wb_chloride * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1034 | query.bindValue(":wb_sodium", round(recipe->wb_sodium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1035 | query.bindValue(":wb_magnesium", round(recipe->wb_magnesium * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1036 | query.bindValue(":wb_total_alkalinity", round(recipe->wb_total_alkalinity * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1037 | query.bindValue(":wb_ph", round(recipe->wb_ph * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1038 | query.bindValue(":wa_acid_name", recipe->wa_acid_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1039 | query.bindValue(":wa_acid_perc", round(recipe->wa_acid_perc * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1040 | query.bindValue(":wa_base_name", recipe->wa_base_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1041 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1042 | if (recipe->fermentables.size() == 0) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1043 | query.bindValue(":json_fermentables", "[]"); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1044 | } else { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1045 | QJsonArray array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1046 | for (int i = 0; i < recipe->fermentables.size(); i++) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1047 | QJsonObject obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1048 | obj.insert("f_acid_to_ph_57", round(recipe->fermentables.at(i).f_acid_to_ph_57 * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1049 | obj.insert("f_add_after_boil", recipe->fermentables.at(i).f_add_after_boil); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1050 | obj.insert("f_added", recipe->fermentables.at(i).f_added); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1051 | obj.insert("f_adjust_to_total_100", recipe->fermentables.at(i).f_adjust_to_total_100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1052 | obj.insert("f_amount", round(recipe->fermentables.at(i).f_added * 10000) / 10000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1053 | obj.insert("f_coarse_fine_diff", round(recipe->fermentables.at(i).f_coarse_fine_diff * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1054 | obj.insert("f_color", round(recipe->fermentables.at(i).f_color * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1055 | obj.insert("f_cost", round(recipe->fermentables.at(i).f_cost * 1000) / 1000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1056 | obj.insert("f_di_ph", round(recipe->fermentables.at(i).f_di_ph * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1057 | obj.insert("f_diastatic_power", round(recipe->fermentables.at(i).f_diastatic_power * 100000) / 100000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1058 | obj.insert("f_dissolved_protein", round(recipe->fermentables.at(i).f_dissolved_protein * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1059 | obj.insert("f_graintype", recipe->fermentables.at(i).f_graintype); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1060 | obj.insert("f_max_in_batch", recipe->fermentables.at(i).f_max_in_batch); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1061 | obj.insert("f_moisture", round(recipe->fermentables.at(i).f_moisture * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1062 | obj.insert("f_name", recipe->fermentables.at(i).f_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1063 | obj.insert("f_origin", recipe->fermentables.at(i).f_origin); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1064 | obj.insert("f_percentage", round(recipe->fermentables.at(i).f_percentage * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1065 | obj.insert("f_protein", round(recipe->fermentables.at(i).f_protein * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1066 | obj.insert("f_recommend_mash", recipe->fermentables.at(i).f_recommend_mash); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1067 | obj.insert("f_supplier", recipe->fermentables.at(i).f_supplier); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1068 | obj.insert("f_type", recipe->fermentables.at(i).f_type); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1069 | obj.insert("f_yield", round(recipe->fermentables.at(i).f_yield * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1070 | // qDebug() << "fermentable_Json" << i << obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1071 | array.append(obj); /* Append this object */ |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1072 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1073 | // qDebug() << array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1074 | query.bindValue(":json_fermentables", array); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1075 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1076 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1077 | if (recipe->hops.size() == 0) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1078 | query.bindValue(":json_hops", "[]"); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1079 | } else { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1080 | QJsonArray array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1081 | for (int i = 0; i < recipe->hops.size(); i++) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1082 | QJsonObject obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1083 | obj.insert("h_name", recipe->hops.at(i).h_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1084 | obj.insert("h_origin", recipe->hops.at(i).h_origin); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1085 | obj.insert("h_amount", round(recipe->hops.at(i).h_amount * 10000) / 10000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1086 | obj.insert("h_cost", round(recipe->hops.at(i).h_cost * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1087 | obj.insert("h_type", recipe->hops.at(i).h_type); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1088 | obj.insert("h_form", recipe->hops.at(i).h_form); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1089 | obj.insert("h_useat", recipe->hops.at(i).h_useat); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1090 | obj.insert("h_time", recipe->hops.at(i).h_time); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1091 | obj.insert("h_alpha", round(recipe->hops.at(i).h_alpha * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1092 | obj.insert("h_beta", round(recipe->hops.at(i).h_beta * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1093 | obj.insert("h_hsi", round(recipe->hops.at(i).h_hsi * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1094 | obj.insert("h_humulene", round(recipe->hops.at(i).h_humulene * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1095 | obj.insert("h_caryophyllene", round(recipe->hops.at(i).h_caryophyllene * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1096 | obj.insert("h_cohumulone", round(recipe->hops.at(i).h_cohumulone * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1097 | obj.insert("h_myrcene", round(recipe->hops.at(i).h_myrcene * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1098 | obj.insert("h_total_oil", round(recipe->hops.at(i).h_total_oil * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1099 | qDebug() << "hops_Json" << i << obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1100 | array.append(obj); /* Append this object */ |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1101 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1102 | // qDebug() << array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1103 | query.bindValue(":json_hops", array); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1104 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1105 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1106 | if (recipe->miscs.size() == 0) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1107 | query.bindValue(":json_miscs", "[]"); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1108 | } else { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1109 | QJsonArray array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1110 | for (int i = 0; i < recipe->miscs.size(); i++) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1111 | QJsonObject obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1112 | obj.insert("m_name", recipe->miscs.at(i).m_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1113 | obj.insert("m_amount", round(recipe->miscs.at(i).m_amount * 10000) / 10000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1114 | obj.insert("m_type", recipe->miscs.at(i).m_type); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1115 | obj.insert("m_use_use", recipe->miscs.at(i).m_use_use); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1116 | obj.insert("m_time", recipe->miscs.at(i).m_time); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1117 | obj.insert("m_amount_is_weight", recipe->miscs.at(i).m_amount_is_weight); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1118 | obj.insert("m_cost", recipe->miscs.at(i).m_cost); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1119 | qDebug() << "miscs_Json" << i << obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1120 | array.append(obj); /* Append this object */ |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1121 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1122 | // qDebug() << array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1123 | query.bindValue(":json_miscs", array); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1124 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1125 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1126 | if (recipe->yeasts.size() == 0) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1127 | query.bindValue(":json_yeasts", "[]"); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1128 | } else { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1129 | QJsonArray array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1130 | for (int i = 0; i < recipe->yeasts.size(); i++) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1131 | QJsonObject obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1132 | obj.insert("y_name", recipe->yeasts.at(i).y_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1133 | obj.insert("y_laboratory", recipe->yeasts.at(i).y_laboratory); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1134 | obj.insert("y_product_id", recipe->yeasts.at(i).y_product_id); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1135 | obj.insert("y_amount", round(recipe->yeasts.at(i).y_amount * 10000) / 10000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1136 | obj.insert("y_type", recipe->yeasts.at(i).y_type); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1137 | obj.insert("y_form", recipe->yeasts.at(i).y_form); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1138 | obj.insert("y_min_temperature", round(recipe->yeasts.at(i).y_min_temperature * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1139 | obj.insert("y_max_temperature", round(recipe->yeasts.at(i).y_max_temperature * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1140 | obj.insert("y_flocculation", recipe->yeasts.at(i).y_flocculation); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1141 | obj.insert("y_attenuation", round(recipe->yeasts.at(i).y_attenuation * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1142 | obj.insert("y_cells", recipe->yeasts.at(i).y_cells); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1143 | obj.insert("y_tolerance", round(recipe->yeasts.at(i).y_tolerance * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1144 | obj.insert("y_inventory", round(recipe->yeasts.at(i).y_inventory * 10000) / 10000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1145 | obj.insert("y_use", recipe->yeasts.at(i).y_use); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1146 | obj.insert("y_sta1", recipe->yeasts.at(i).y_sta1); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1147 | obj.insert("y_bacteria", recipe->yeasts.at(i).y_bacteria); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1148 | obj.insert("y_harvest_top", recipe->yeasts.at(i).y_harvest_top); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1149 | obj.insert("y_harvest_time", recipe->yeasts.at(i).y_harvest_time); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1150 | obj.insert("y_pitch_temperature", round(recipe->yeasts.at(i).y_pitch_temperature * 10) / 10); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1151 | obj.insert("y_pofpos", recipe->yeasts.at(i).y_pofpos); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1152 | obj.insert("y_zymocide", recipe->yeasts.at(i).y_zymocide); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1153 | obj.insert("y_gr_hl_lo", recipe->yeasts.at(i).y_gr_hl_lo); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1154 | obj.insert("y_sg_lo", round(recipe->yeasts.at(i).y_sg_lo * 1000) / 1000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1155 | obj.insert("y_gr_hl_hi", recipe->yeasts.at(i).y_gr_hl_hi); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1156 | obj.insert("y_sg_hi", round(recipe->yeasts.at(i).y_sg_hi * 1000) / 1000); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1157 | obj.insert("y_cost", recipe->yeasts.at(i).y_cost); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1158 | qDebug() << "yeasts_Json" << i << obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1159 | array.append(obj); /* Append this object */ |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1160 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1161 | // qDebug() << array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1162 | query.bindValue(":json_yeasts", array); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1163 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1164 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1165 | if (recipe->mashs.size() == 0) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1166 | query.bindValue(":json_mashs", "[]"); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1167 | } else { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1168 | QJsonArray array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1169 | for (int i = 0; i < recipe->mashs.size(); i++) { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1170 | QJsonObject obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1171 | obj.insert("step_name", recipe->mashs.at(i).step_name); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1172 | obj.insert("step_type", recipe->mashs.at(i).step_type); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1173 | obj.insert("step_volume", round(recipe->mashs.at(i).step_volume * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1174 | obj.insert("step_infuse_amount", round(recipe->mashs.at(i).step_infuse_amount * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1175 | obj.insert("step_infuse_temp", round(recipe->mashs.at(i).step_infuse_temp * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1176 | obj.insert("step_temp", round(recipe->mashs.at(i).step_temp * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1177 | obj.insert("step_time", round(recipe->mashs.at(i).step_time * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1178 | obj.insert("ramp_time", round(recipe->mashs.at(i).ramp_time * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1179 | obj.insert("end_temp", round(recipe->mashs.at(i).end_temp * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1180 | obj.insert("step_wg_ratio", round(recipe->mashs.at(i).step_wg_ratio * 100) / 100); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1181 | qDebug() << "mashs_Json" << i << obj; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1182 | array.append(obj); /* Append this object */ |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1183 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1184 | // qDebug() << array; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1185 | query.bindValue(":json_mashs", array); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1186 | } |
107
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
1187 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1188 | if (this->recno == -1) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1189 | query.bindValue(":uuid", QUuid::createUuid().toString().mid(1, 36)); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1190 | } else { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1191 | query.bindValue(":recno", this->recno); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1192 | } |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1193 | query.exec(); |
107
bb4607e23065
Added minval() and maxval() read to RangedSlider. Filled the MySQL query with the values that are ready at this point.
Michiel Broek <mbroek@mbse.eu>
parents:
106
diff
changeset
|
1194 | qDebug() << query.lastQuery(); |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1195 | if (query.lastError().isValid()) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1196 | qDebug() << "EditRecipe" << query.lastError(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1197 | QMessageBox::warning(this, tr("Database error"), |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1198 | tr("MySQL error: %1\n%2\n%3") |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1199 | .arg(query.lastError().nativeErrorCode()) |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1200 | .arg(query.lastError().driverText()) |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1201 | .arg(query.lastError().databaseText())); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1202 | } else { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1203 | qDebug() << "EditRecipe Saved"; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1204 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1205 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1206 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1207 | ui->saveButton->setEnabled(false); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1208 | this->textIsChanged = false; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1209 | WindowTitle(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1210 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1211 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1212 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1213 | void EditRecipe::on_deleteButton_clicked() |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1214 | { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1215 | QSqlQuery query; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1216 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1217 | query.prepare("DELETE FROM recipes WHERE record = :recno"); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1218 | query.bindValue(":recno", this->recno); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1219 | query.exec(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1220 | if (query.lastError().isValid()) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1221 | qDebug() << "EditRecipe" << query.lastError(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1222 | QMessageBox::warning(this, tr("Database error"), |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1223 | tr("MySQL error: %1\n%2\n%3") |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1224 | .arg(query.lastError().nativeErrorCode()) |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1225 | .arg(query.lastError().driverText()) |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1226 | .arg(query.lastError().databaseText())); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1227 | } else { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1228 | qDebug() << "EditRecipe Deleted" << this->recno; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1229 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1230 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1231 | this->close(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1232 | this->setResult(1); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1233 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1234 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1235 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1236 | void EditRecipe::is_changed() |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1237 | { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1238 | ui->saveButton->setEnabled(true); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1239 | ui->deleteButton->setEnabled((this->recno >= 0) ? true:false); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1240 | this->textIsChanged = true; |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1241 | WindowTitle(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1242 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1243 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1244 | |
115
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1245 | void EditRecipe::name_changed(QString name) |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1246 | { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1247 | recipe->name = name; |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1248 | is_changed(); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1249 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1250 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1251 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1252 | void EditRecipe::notes_changed() |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1253 | { |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1254 | /* The text cannot be passed in a simple way :) */ |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1255 | recipe->notes = ui->notesEdit->toPlainText(); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1256 | is_changed(); |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1257 | } |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1258 | |
9c90a00fd9dd
Completed recipe save record. Recipe name and notes can be edited.
Michiel Broek <mbroek@mbse.eu>
parents:
114
diff
changeset
|
1259 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1260 | /* |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1261 | * New beerstyle is selected. |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1262 | */ |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1263 | void EditRecipe::style_changed() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1264 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1265 | QSqlQuery query; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1266 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1267 | if (ui->beerstyleEdit->currentIndex() < 1) |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1268 | return; |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1269 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1270 | query.prepare("SELECT * FROM profile_styles ORDER BY style_guide,style_letter,name"); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1271 | query.exec(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1272 | query.first(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1273 | // Skip to the record index. |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1274 | for (int i = 0; i < (ui->beerstyleEdit->currentIndex() - 1); i++) { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1275 | query.next(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1276 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1277 | // Set relevant fields and update ranges. |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1278 | recipe->st_name = query.value(1).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1279 | recipe->st_category = query.value(2).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1280 | recipe->st_category_number = query.value(3).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1281 | recipe->st_letter = query.value(4).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1282 | recipe->st_guide = query.value(5).toString(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1283 | recipe->st_type = query.value(6).toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1284 | recipe->st_og_min = query.value(7).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1285 | recipe->st_og_max = query.value(8).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1286 | recipe->st_fg_min = query.value(9).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1287 | recipe->st_fg_max = query.value(10).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1288 | recipe->st_ibu_min = query.value(11).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1289 | recipe->st_ibu_max = query.value(12).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1290 | recipe->st_color_min = query.value(13).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1291 | recipe->st_color_max = query.value(14).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1292 | recipe->st_carb_min = query.value(15).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1293 | recipe->st_carb_max = query.value(16).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1294 | recipe->st_abv_min = query.value(17).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1295 | recipe->st_abv_max = query.value(18).toDouble(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1296 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1297 | ui->st_nameEdit->setText(recipe->st_name); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1298 | ui->st_groupEdit->setText(recipe->st_letter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1299 | ui->st_guideEdit->setText(recipe->st_guide); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1300 | ui->st_catEdit->setText(recipe->st_category); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1301 | ui->st_catnrEdit->setText(QString("%1").arg(recipe->st_category_number)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1302 | ui->st_typeEdit->setText(s_types[recipe->st_type]); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1303 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1304 | ui->est_ogShow->setRange(query.value(7).toDouble(), query.value(8).toDouble()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1305 | ui->est_fgShow->setRange(query.value(9).toDouble(), query.value(10).toDouble()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1306 | ui->est_ibuShow->setRange(query.value(11).toDouble(), query.value(12).toDouble()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1307 | ui->est_colorShow->setRange(query.value(13).toDouble(), query.value(14).toDouble()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1308 | ui->est_carbShow->setRange(query.value(15).toDouble(), query.value(16).toDouble()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1309 | ui->est_abvShow->setRange(query.value(17).toDouble(), query.value(18).toDouble()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1310 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1311 | is_changed(); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1312 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1313 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1314 | |
102
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1315 | void EditRecipe::colormethod_changed() |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1316 | { |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1317 | calcFermentables(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1318 | is_changed(); |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1319 | } |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1320 | |
b017001850df
Almost finished calcFermentables()
Michiel Broek <mbroek@mbse.eu>
parents:
101
diff
changeset
|
1321 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1322 | /* TODO: move this code to MySQL save */ |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1323 | void EditRecipe::fermentable_Json() |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1324 | { |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1325 | QTableWidgetItem *item; |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1326 | QJsonArray array; |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1327 | |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1328 | qDebug() << "fermentable_Json()"; |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1329 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1330 | for (int i = 0; i < recipe->fermentables.size(); i++) { |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1331 | |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1332 | QJsonObject obj; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1333 | obj.insert("f_acid_to_ph_57", recipe->fermentables.at(i).f_acid_to_ph_57); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1334 | obj.insert("f_add_after_boil", recipe->fermentables.at(i).f_add_after_boil); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1335 | obj.insert("f_added", recipe->fermentables.at(i).f_added); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1336 | obj.insert("f_adjust_to_total_100", recipe->fermentables.at(i).f_adjust_to_total_100); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1337 | obj.insert("f_amount", recipe->fermentables.at(i).f_added); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1338 | obj.insert("f_coarse_fine_diff", recipe->fermentables.at(i).f_coarse_fine_diff); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1339 | obj.insert("f_color", recipe->fermentables.at(i).f_color); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1340 | obj.insert("f_cost", recipe->fermentables.at(i).f_cost); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1341 | obj.insert("f_di_ph", recipe->fermentables.at(i).f_di_ph); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1342 | obj.insert("f_diastatic_power", recipe->fermentables.at(i).f_diastatic_power); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1343 | obj.insert("f_dissolved_protein", recipe->fermentables.at(i).f_dissolved_protein); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1344 | obj.insert("f_graintype", recipe->fermentables.at(i).f_graintype); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1345 | obj.insert("f_max_in_batch", recipe->fermentables.at(i).f_max_in_batch); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1346 | obj.insert("f_moisture", recipe->fermentables.at(i).f_moisture); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1347 | obj.insert("f_name", recipe->fermentables.at(i).f_name); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1348 | obj.insert("f_origin", recipe->fermentables.at(i).f_origin); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1349 | obj.insert("f_percentage", recipe->fermentables.at(i).f_percentage); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1350 | obj.insert("f_protein", recipe->fermentables.at(i).f_protein); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1351 | obj.insert("f_recommend_mash", recipe->fermentables.at(i).f_recommend_mash); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1352 | obj.insert("f_supplier", recipe->fermentables.at(i).f_supplier); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1353 | obj.insert("f_type", recipe->fermentables.at(i).f_type); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1354 | obj.insert("f_yield", recipe->fermentables.at(i).f_yield); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1355 | qDebug() << "fermentable_Json" << i << obj; |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1356 | array.append(obj); /* Append this object */ |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1357 | } |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1358 | |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1359 | qDebug() << array; |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1360 | /* Copy to the global array and refresh */ |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1361 | // this->fermentables.setArray(array); |
103
6da4e93b6ceb
Experiment with checkboxes in the fermentable table.
Michiel Broek <mbroek@mbse.eu>
parents:
102
diff
changeset
|
1362 | } |
6da4e93b6ceb
Experiment with checkboxes in the fermentable table.
Michiel Broek <mbroek@mbse.eu>
parents:
102
diff
changeset
|
1363 | |
6da4e93b6ceb
Experiment with checkboxes in the fermentable table.
Michiel Broek <mbroek@mbse.eu>
parents:
102
diff
changeset
|
1364 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1365 | void EditRecipe::on_deleteFermentRow_clicked() |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1366 | { |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1367 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1368 | int row = pb->objectName().toInt(); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1369 | qDebug() << "Delete fermentable row" << row; |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1370 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1371 | int rc = QMessageBox::warning(this, tr("Delete fermentable"), tr("Delete %1").arg(recipe->fermentables.at(row).f_name), |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1372 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1373 | if (rc == QMessageBox::No) |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1374 | return; |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1375 | |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1376 | ui->fermentablesTable->removeRow(row); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1377 | // recalculate percentages |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1378 | // fermentable_Json(); |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1379 | } |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1380 | |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1381 | |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1382 | void EditRecipe::ferment_amount_changed(double val) |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1383 | { |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1384 | QTableWidgetItem *item; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1385 | double total = 0, perc; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1386 | |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1387 | if (recipe->fermentables_use100) |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1388 | return; |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1389 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1390 | qDebug() << "ferment_amount_changed()" << editrow << val; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1391 | this->ignoreChanges = true; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1392 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1393 | recipe->fermentables[editrow].f_amount = val; |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1394 | item = new QTableWidgetItem(QString("%1 Kg").arg(val, 4, 'f', 3, '0')); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1395 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1396 | ui->fermentablesTable->setItem(editrow, 7, item); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1397 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1398 | for (int i = 0; i < recipe->fermentables.size(); i++) |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1399 | total += recipe->fermentables.at(i).f_amount; |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1400 | |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1401 | /* |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1402 | * Recalculate the percentages |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1403 | */ |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1404 | for (int i = 0; i < recipe->fermentables.size(); i++) { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1405 | perc = recipe->fermentables.at(i).f_amount / total * 100; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1406 | recipe->fermentables[i].f_percentage = perc; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1407 | item = new QTableWidgetItem(QString("%1%").arg(perc, 2, 'f', 1, '0')); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1408 | item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1409 | ui->fermentablesTable->setItem(i, 8, item); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1410 | if (i == editrow) |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1411 | this->pctEdit->setValue(perc); |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1412 | } |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1413 | this->ignoreChanges = false; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1414 | } |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1415 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1416 | void EditRecipe::ferment_pct_changed(double val) |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1417 | { |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1418 | if (! recipe->fermentables_use100) |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1419 | return; |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1420 | |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1421 | qDebug() << "ferment_pct_changed()" << val; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1422 | } |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1423 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1424 | |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1425 | void EditRecipe::on_editFermentRow_clicked() |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1426 | { |
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1427 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1428 | editrow = pb->objectName().toInt(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1429 | qDebug() << "Edit fermentable row" << editrow; |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1430 | Fermentables backup = recipe->fermentables.at(editrow); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1431 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1432 | QDialog* dialog = new QDialog(this); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1433 | dialog->resize(738, 287); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1434 | QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1435 | buttonBox->setObjectName(QString::fromUtf8("buttonBox")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1436 | buttonBox->setGeometry(QRect(30, 240, 671, 32)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1437 | buttonBox->setLayoutDirection(Qt::LeftToRight); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1438 | buttonBox->setOrientation(Qt::Horizontal); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1439 | buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1440 | buttonBox->setCenterButtons(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1441 | QLabel *nameLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1442 | nameLabel->setObjectName(QString::fromUtf8("nameLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1443 | nameLabel->setText(tr("Current ingredient:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1444 | nameLabel->setGeometry(QRect(10, 10, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1445 | nameLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1446 | QLabel *supplierLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1447 | supplierLabel->setObjectName(QString::fromUtf8("supplierLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1448 | supplierLabel->setText(tr("Supplier:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1449 | supplierLabel->setGeometry(QRect(10, 40, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1450 | supplierLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1451 | QLabel *amountLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1452 | amountLabel->setObjectName(QString::fromUtf8("amountLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1453 | amountLabel->setText(tr("Amount in kg:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1454 | amountLabel->setGeometry(QRect(10, 100, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1455 | amountLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1456 | QLabel *pctLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1457 | pctLabel->setObjectName(QString::fromUtf8("pctLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1458 | pctLabel->setText(tr("Percentage in batch:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1459 | pctLabel->setGeometry(QRect(10, 130, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1460 | pctLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1461 | QLabel *to100Label = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1462 | to100Label->setObjectName(QString::fromUtf8("to100Label")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1463 | to100Label->setText(tr("Auto fill to 100%:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1464 | to100Label->setGeometry(QRect(10, 160, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1465 | to100Label->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1466 | QLabel *addedLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1467 | addedLabel->setObjectName(QString::fromUtf8("addedLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1468 | addedLabel->setText(tr("Use at:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1469 | addedLabel->setGeometry(QRect(10, 190, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1470 | addedLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1471 | QLabel *selectLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1472 | selectLabel->setObjectName(QString::fromUtf8("selectLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1473 | selectLabel->setText(tr("Select ingredient:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1474 | selectLabel->setGeometry(QRect(10, 70, 141, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1475 | selectLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1476 | QLabel *instockLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1477 | instockLabel->setObjectName(QString::fromUtf8("instockLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1478 | instockLabel->setText(tr("In stock:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1479 | instockLabel->setGeometry(QRect(420, 70, 121, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1480 | instockLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1481 | QLabel *maxLabel = new QLabel(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1482 | maxLabel->setObjectName(QString::fromUtf8("maxLabel")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1483 | maxLabel->setText(tr("Max in batch:")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1484 | maxLabel->setGeometry(QRect(420, 130, 121, 20)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1485 | maxLabel->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1486 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1487 | selectEdit = new QComboBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1488 | selectEdit->setObjectName(QString::fromUtf8("selectEdit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1489 | selectEdit->setGeometry(QRect(160, 70, 251, 23)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1490 | nameEdit = new QLineEdit(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1491 | nameEdit->setObjectName(QString::fromUtf8("nameEdit")); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1492 | nameEdit->setText(recipe->fermentables.at(editrow).f_name); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1493 | nameEdit->setGeometry(QRect(160, 10, 511, 23)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1494 | nameEdit->setReadOnly(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1495 | supplierEdit = new QLineEdit(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1496 | supplierEdit->setObjectName(QString::fromUtf8("supplierEdit")); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1497 | supplierEdit->setText(recipe->fermentables.at(editrow).f_supplier); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1498 | supplierEdit->setGeometry(QRect(160, 40, 511, 23)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1499 | supplierEdit->setReadOnly(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1500 | amountEdit = new QDoubleSpinBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1501 | amountEdit->setObjectName(QString::fromUtf8("amountEdit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1502 | amountEdit->setGeometry(QRect(160, 100, 121, 24)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1503 | amountEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1504 | amountEdit->setAccelerated(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1505 | amountEdit->setDecimals(3); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1506 | amountEdit->setReadOnly(recipe->fermentables_use100); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1507 | amountEdit->setMaximum(100000.0); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1508 | amountEdit->setSingleStep(0.0010); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1509 | amountEdit->setValue(recipe->fermentables.at(editrow).f_amount); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1510 | connect(amountEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::ferment_amount_changed); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1511 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1512 | pctEdit = new QDoubleSpinBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1513 | pctEdit->setObjectName(QString::fromUtf8("pctEdit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1514 | pctEdit->setGeometry(QRect(160, 130, 121, 24)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1515 | pctEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1516 | pctEdit->setAccelerated(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1517 | pctEdit->setDecimals(1); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1518 | if (recipe->fermentables_use100) { |
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1519 | if (recipe->fermentables.at(editrow).f_adjust_to_total_100) |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1520 | pctEdit->setReadOnly(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1521 | else |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1522 | pctEdit->setReadOnly(false); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1523 | } else { |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1524 | pctEdit->setReadOnly(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1525 | } |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1526 | pctEdit->setMaximum(100.0); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1527 | pctEdit->setSingleStep(0.1); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1528 | pctEdit->setValue(recipe->fermentables.at(editrow).f_percentage); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1529 | connect(pctEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditRecipe::ferment_pct_changed); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1530 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1531 | addedEdit = new QComboBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1532 | addedEdit->setObjectName(QString::fromUtf8("addedEdit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1533 | addedEdit->setGeometry(QRect(160, 190, 161, 23)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1534 | addedEdit->addItem(tr("Mash")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1535 | addedEdit->addItem(tr("Boil")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1536 | addedEdit->addItem(tr("Fermentation")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1537 | addedEdit->addItem(tr("Lagering")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1538 | addedEdit->addItem(tr("Bottle")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1539 | addedEdit->addItem(tr("Kegs")); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1540 | addedEdit->setCurrentIndex(recipe->fermentables.at(editrow).f_added); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1541 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1542 | to100Edit = new QCheckBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1543 | to100Edit->setObjectName(QString::fromUtf8("to100Edit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1544 | to100Edit->setGeometry(QRect(160, 160, 85, 21)); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1545 | to100Edit->setChecked(recipe->fermentables.at(editrow).f_adjust_to_total_100); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1546 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1547 | instockEdit = new QCheckBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1548 | instockEdit->setObjectName(QString::fromUtf8("instockEdit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1549 | instockEdit->setGeometry(QRect(550, 70, 85, 21)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1550 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1551 | maxEdit = new QDoubleSpinBox(dialog); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1552 | maxEdit->setObjectName(QString::fromUtf8("maxEdit")); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1553 | maxEdit->setGeometry(QRect(550, 130, 121, 24)); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1554 | maxEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1555 | maxEdit->setReadOnly(true); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1556 | maxEdit->setButtonSymbols(QAbstractSpinBox::NoButtons); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1557 | maxEdit->setDecimals(1); |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1558 | maxEdit->setValue(recipe->fermentables.at(editrow).f_max_in_batch); |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1559 | |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1560 | connect(buttonBox, SIGNAL(rejected()), dialog, SLOT(reject())); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1561 | connect(buttonBox, SIGNAL(accepted()), dialog, SLOT(accept())); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1562 | dialog->exec(); |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1563 | if (dialog->result() == QDialog::Rejected) { |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1564 | qDebug() << "rejected"; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1565 | // restore fermentbackup |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1566 | // recalculate percentages |
108
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1567 | } else { |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1568 | qDebug() << "accepted"; |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1569 | } |
ecfcbee4a9b2
Redesign the database interface for the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
107
diff
changeset
|
1570 | |
105
e79079bf013d
Hide not visible fermentables data inside the fermentablesTable so that all data stays together. Format the fermentables json data again after changes. Add confirmation message to delete a fermentable row. Added buttons for a fermentables row editor.
Michiel Broek <mbroek@mbse.eu>
parents:
104
diff
changeset
|
1571 | // disconnect |
110
224be4d9f8eb
Fermentables are loaded in the main recipe record in a QList. The refresh table function does the sorting, on added moment (mash first), amount and finally color of the malt. Removed the old hidden table columns. Do all manipulation on the recipe record with QList arrays. The ferment_amount_changed() slot is complete. The whole recipe editor is going in the right direction.
Michiel Broek <mbroek@mbse.eu>
parents:
109
diff
changeset
|
1572 | emit refreshAll(); |
101
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1573 | } |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1574 | |
1d14d3bf2465
Added change beerstyle, the fermentables table, and first part of calcFermentables to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
100
diff
changeset
|
1575 | |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1576 | void EditRecipe::on_quitButton_clicked() |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1577 | { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1578 | if (this->textIsChanged) { |
98
1425bf3e18ed
Solved the segmentation fault when viewing recipes twice. Set colored display for the EBC color fields using a modified dynamic stylesheet.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
1579 | int rc = QMessageBox::warning(this, tr("Recipe changed"), tr("The recipe has been modified. Save changes?"), |
92
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1580 | QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Save); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1581 | switch (rc) { |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1582 | case QMessageBox::Save: |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1583 | on_saveButton_clicked(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1584 | break; /* Saved and then Quit */ |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1585 | case QMessageBox::Discard: |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1586 | break; /* Quit without Save */ |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1587 | case QMessageBox::Cancel: |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1588 | return; /* Return to the editor page */ |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1589 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1590 | } |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1591 | |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1592 | this->close(); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1593 | this->setResult(1); |
fb0bb9a2a7e1
Added support to build designer plugins, but it is nog yet complete. Added RangedSlider fro the brewtarget project to make our version of it. Started EditRecipe screen.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1594 | } |