Fri, 08 Jul 2022 13:24:45 +0200
Removed old experiment to calculate flameout and whirlpool ibu's. Changed Tinseth calculation to use a time window so you can select the ibu contribution during a specified time. Added ibu_method Tinset++. Added calculation extensions for Tinseth++, this calculates the flameout and whirlpool effects on all hops. During cooling is to be done.
4 | 1 | /** |
2 | * MainWindow.cpp is part of bmsapp. | |
3 | * | |
4 | * bmsapp is free software: you can redistribute it and/or modify | |
5 | * it under the terms of the GNU General Public License as published by | |
6 | * the Free Software Foundation, either version 3 of the License, or | |
7 | * (at your option) any later version. | |
8 | * | |
9 | * bmsapp is distributed in the hope that it will be useful, | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 | * GNU General Public License for more details. | |
13 | * | |
14 | * You should have received a copy of the GNU General Public License | |
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
16 | */ | |
3 | 17 | #include "MainWindow.h" |
4 | 18 | #include "AboutDialog.h" |
81
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
19 | #include "RecipesTree.h" |
6
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
20 | #include "InventorySuppliers.h" |
19
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
21 | #include "InventoryFermentables.h" |
24 | 22 | #include "InventoryHops.h" |
25
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
23 | #include "InventoryYeasts.h" |
28
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
24 | #include "InventoryMiscs.h" |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
25 | #include "InventoryWaters.h" |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
26 | #include "InventoryEquipments.h" |
173
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
27 | #include "ProdInprod.h" |
228
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
28 | #include "ProdOnName.h" |
231
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
29 | #include "ProdOnCode.h" |
234
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
30 | #include "ProdOnDate.h" |
232
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
31 | #include "ProdOnTree.h" |
48
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
32 | #include "ProfileWaters.h" |
49
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
33 | #include "ProfileMashs.h" |
56
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
34 | #include "ProfileStyles.h" |
57
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
35 | #include "ProfileFerments.h" |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
36 | #include "MonNodes.h" |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
37 | #include "MonFermenters.h" |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
38 | #include "MonCO2meters.h" |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
39 | #include "MoniSpindels.h" |
275
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
40 | #include "ImportXML.h" |
15
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
41 | #include "Setup.h" |
52
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
42 | #include "PrinterDialog.h" |
3 | 43 | #include "../ui/ui_MainWindow.h" |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
44 | #include "database/database.h" |
6
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
45 | #include "config.h" |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
46 | #include "global.h" |
3 | 47 | |
48 | #include <QApplication> | |
49 | #include <QCloseEvent> | |
50 | #include <QDebug> | |
51 | #include <QStandardItem> | |
52 | #include <QWidget> | |
65
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
53 | #include <QtWidgets/QTableWidget> |
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
54 | #include <QtWidgets/QGroupBox> |
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
55 | #include <QtWidgets/QPushButton> |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
56 | #include <QUrl> |
3 | 57 | |
58 | ||
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
59 | MainWindow::MainWindow(bool useDevelopOption, bool startConfigOption, QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) |
3 | 60 | { |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
61 | qDebug() << Q_FUNC_INFO << useDevelopOption << startConfigOption; |
4 | 62 | ui->setupUi(this); |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
63 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
6
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
64 | |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
65 | readsettings(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
66 | db = new DataBase(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
67 | db->openDataBase(useDevelopOption); |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
68 | |
133
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
69 | loadSetup(); |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
70 | maintDataBase(); |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
71 | openWS(useDevelopOption); |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
72 | |
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
73 | Acid a; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
74 | a.name_en = "Lactic"; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
75 | a.name_nl = "Melkzuur"; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
76 | a.pK1 = 3.86; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
77 | a.pK2 = 20.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
78 | a.pK3 = 20.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
79 | a.MolWt = 90.08; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
80 | a.AcidSG = 1238.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
81 | a.AcidPrc = 80.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
82 | my_acids.append(a); |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
83 | a.name_en = "Hydrochloric"; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
84 | a.name_nl = "Zoutzuur"; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
85 | a.pK1 = -7.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
86 | a.pK2 = 20.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
87 | a.pK3 = 20.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
88 | a.MolWt = 36.46; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
89 | a.AcidSG = 1497.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
90 | a.AcidPrc = 28.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
91 | my_acids.append(a); |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
92 | a.name_en = "Phosphoric"; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
93 | a.name_nl = "Fosforzuur"; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
94 | a.pK1 = 2.12; |
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
95 | a.pK2 = 7.20; |
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
96 | a.pK3 = 12.44; |
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
97 | a.MolWt = 98.00; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
98 | a.AcidSG = 1982.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
99 | a.AcidPrc = 75.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
100 | my_acids.append(a); |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
101 | a.name_en = "Sulfuric"; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
102 | a.name_nl = "Zwavelzuur"; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
103 | a.pK1 = -1.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
104 | a.pK2 = 1.92; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
105 | a.pK3 = 20.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
106 | a.MolWt = 98.07; |
135
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
107 | a.AcidSG = 1884.0; |
e68b27ad8a40
Added dutch translations to the internal acids array. Added slot for calc_acid checkbox. Added more water calculations. The miscs amount fields now have two decimal digits. Show treated waters and good/bad indicators.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
108 | a.AcidPrc = 93.0; |
131
0115b97e8c39
Added global variables, C++ lovers will hate that. Added global acid data. Fixed several load and save errors in the json arrays in the recipe record. Added first part of the miscs table. The first part of the water tab has values.
Michiel Broek <mbroek@mbse.eu>
parents:
103
diff
changeset
|
109 | my_acids.append(a); |
3 | 110 | } |
111 | ||
112 | ||
113 | MainWindow::~MainWindow() | |
114 | { | |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
115 | writesettings(); |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
116 | webSocket->close(QWebSocketProtocol::CloseCodeNormal, ""); |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
117 | db->closeDataBase(); |
4 | 118 | delete ui; |
3 | 119 | } |
120 | ||
121 | ||
133
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
122 | void MainWindow::loadSetup() |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
123 | { |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
124 | /* |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
125 | * Load dedaults from the setup. |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
126 | */ |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
127 | QSqlQuery query("SELECT * FROM profile_setup WHERE record='1'"); |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
128 | query.first(); |
337
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
129 | my_brewery_name = query.value("brewery_name").toString(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
130 | my_logoByteArray = query.value("brewery_logo").toByteArray(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
131 | my_factor_mashhop = query.value("factor_mashhop").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
132 | my_factor_fwh = query.value("factor_fwh").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
133 | my_factor_pellet = query.value("factor_pellet").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
134 | my_factor_plug = query.value("factor_plug").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
135 | my_factor_wethop = query.value("factor_wethop").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
136 | my_factor_cryohop = query.value("factor_cryohop").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
137 | my_ibu_method = query.value("ibu_method").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
138 | my_color_method = query.value("color_method").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
139 | my_brix_correction = query.value("brix_correction").toDouble(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
140 | my_grain_absorbtion = query.value("grain_absorbtion").toDouble(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
141 | my_default_water = query.value("default_water").toInt(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
142 | my_yeastlab = query.value("my_yeastlab").toString(); |
8133cdb19aa1
Added my_height global variable and edit in profile setup. This sets the height of the brewery above or below sealevel. Added calculations for the air pressure, boilpoint and IBU_reduction that all depend on the height. Currently not yet in use. Split out the real IBU calculation from the generic toIBU function. This has no effect on the results.
Michiel Broek <mbroek@mbse.eu>
parents:
332
diff
changeset
|
143 | my_height = query.value("brewery_height").toInt(); |
133
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
144 | |
254
b0adda0053c5
Installed MessageHandler for logging
Michiel Broek <mbroek@mbse.eu>
parents:
234
diff
changeset
|
145 | qInfo() << "loadSetup" << my_brewery_name; |
133
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
146 | } |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
147 | |
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
148 | |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
149 | /* |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
150 | * On the server where bmsd runs, there is a crontask.php that does these checks |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
151 | * too. Here we do some of the same commands so that we have the results sooner. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
152 | * Currently this takes 6 to 9 mSecs. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
153 | */ |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
154 | void MainWindow::maintDataBase() |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
155 | { |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
156 | QSqlQuery query; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
157 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
158 | /* |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
159 | * Upgrade package values. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
160 | */ |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
161 | query.exec("UPDATE products SET package_volume = bottle_amount + keg_amount WHERE package_volume='0'"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
162 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
163 | qInfo() << "Updated" << query.numRowsAffected() << "products to new package_volume value"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
164 | query.exec("UPDATE products SET bottle_priming_water = bottle_amount * bottle_priming_amount / 500 WHERE bottle_priming_water = 0"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
165 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
166 | qInfo() << "Updated" << query.numRowsAffected() << "products to new bottle_priming_water"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
167 | query.exec("UPDATE products SET keg_priming_water = keg_amount * keg_priming_amount / 500 WHERE keg_priming_water = 0"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
168 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
169 | qInfo() << "Updated" << query.numRowsAffected() << "products to new keg_priming_water"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
170 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
171 | /* |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
172 | * Upgrade inventory_reduced value from old boolean to tiny integer value. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
173 | */ |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
174 | query.exec("UPDATE products SET inventory_reduced=stage WHERE inventory_reduced = 1"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
175 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
176 | qInfo() << "Updated" << query.numRowsAffected() << "products to new inventory_reduced value"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
177 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
178 | /* |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
179 | * Update stages after packaging depending on the age. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
180 | */ |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
181 | query.exec("UPDATE products SET stage=7 WHERE stage = 6 AND DATEDIFF(CURDATE(), package_date) > 0"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
182 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
183 | qInfo() << "Updated" << query.numRowsAffected() << "products to stage 7 (Carbonation)"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
184 | query.exec("UPDATE products SET stage=8 WHERE stage = 7 AND DATEDIFF(CURDATE(), package_date) > 13"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
185 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
186 | qInfo() << "Updated" << query.numRowsAffected() << "products to stage 8 (Mature)"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
187 | query.exec("UPDATE products SET stage=9 WHERE stage = 8 AND DATEDIFF(CURDATE(), package_date) > 41"); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
188 | if (query.numRowsAffected()) |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
189 | qInfo() << "Updated" << query.numRowsAffected() << "products to stage 9 (Taste)"; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
190 | } |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
191 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
192 | |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
193 | bool MainWindow::openWS(bool develop) |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
194 | { |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
195 | QString server; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
196 | if (develop) |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
197 | server = wsDev.host; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
198 | else |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
199 | server = wsProd.host; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
200 | QUrl url(QString("ws://%1/ws").arg(server)); |
254
b0adda0053c5
Installed MessageHandler for logging
Michiel Broek <mbroek@mbse.eu>
parents:
234
diff
changeset
|
201 | qInfo() << "Open websocket:" << url; |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
202 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
203 | webSocket = new QWebSocket; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
204 | QObject::connect(webSocket, &QWebSocket::connected, this, &MainWindow::wsConnected); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
205 | QObject::connect(webSocket, &QWebSocket::disconnected, this, &MainWindow::wsClosed); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
206 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
207 | webSocket->open(QUrl(url)); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
208 | return true; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
209 | } |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
210 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
211 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
212 | void MainWindow::wsConnected() |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
213 | { |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
214 | qDebug() << Q_FUNC_INFO; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
215 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
216 | connect(webSocket, &QWebSocket::textMessageReceived, this, &MainWindow::wsTextMessageReceived); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
217 | } |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
218 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
219 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
220 | void MainWindow::wsClosed() |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
221 | { |
254
b0adda0053c5
Installed MessageHandler for logging
Michiel Broek <mbroek@mbse.eu>
parents:
234
diff
changeset
|
222 | qWarning() << Q_FUNC_INFO << webSocket->closeReason(); |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
223 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
224 | // Should triger a periodic timer to try to reconnect. |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
225 | } |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
226 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
227 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
228 | void MainWindow::wsTextMessageReceived(QString message) |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
229 | { |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
230 | //qDebug() << "WS received:" << message; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
231 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
232 | QJsonParseError parseError; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
233 | QJsonDocument jsonMessage = QJsonDocument::fromJson(message.toUtf8(), &parseError); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
234 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
235 | if (parseError.error != QJsonParseError::NoError) { |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
236 | qWarning() << "wsTextMessageReceived error:" << parseError.errorString() << "at" << parseError.offset ; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
237 | return; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
238 | } |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
239 | |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
240 | /* |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
241 | * Two maingroups, nodes and devices. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
242 | * Node message are detected by the group_id object. |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
243 | * Device messages are detected by the device object. |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
244 | * |
311
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
245 | * Signals can be connected from child widgets so we can emit messages to them. |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
246 | */ |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
247 | QString device = jsonMessage.object()["device"].toString(); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
248 | QString group_id = jsonMessage.object()["group_id"].toString(); |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
249 | if (device != "") { |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
250 | if (device == "fermenters") { |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
251 | //qDebug() << "found fermenter" << jsonMessage.object()["node"].toString()+"/"+jsonMessage.object()["unit"].toString(); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
252 | emit updateFermenters(jsonMessage.object()["node"].toString()+"/"+jsonMessage.object()["unit"].toString()); |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
253 | } else if (device == "co2meters") { |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
254 | //qDebug() << "found co2meter" << jsonMessage.object()["node"].toString()+"/"+jsonMessage.object()["unit"].toString(); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
255 | emit updateCO2meters(jsonMessage.object()["node"].toString()+"/"+jsonMessage.object()["unit"].toString()); |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
256 | } else if (device == "ispindels") { |
311
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
257 | //qDebug() << "found iSpindel" << jsonMessage.object()["node"].toString()+"/"+jsonMessage.object()["unit"].toString(); |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
258 | emit updateiSpindels(jsonMessage.object()["node"].toString()+"/"+jsonMessage.object()["unit"].toString()); |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
259 | } else { |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
260 | qDebug() << "unknown device" << device; |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
261 | } |
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
262 | } else if (group_id != "") { |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
263 | emit updateNodes(jsonMessage.object()["node"].toString()); |
311
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
264 | } else if (jsonMessage.object()["ping"].toInt() ) { |
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
265 | /* |
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
266 | * Reply to ping message. Note that the bmsd ignore's |
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
267 | * our reply, but we send it anyway. |
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
268 | */ |
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
269 | webSocket->sendTextMessage(QString("{\"pong\":1}")); |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
270 | } else { |
311
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
271 | qDebug() << "unknown WS message" << message << jsonMessage; |
308
79f100a84f65
Add database maintenance to the startup code. Start some work ok parsing websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
275
diff
changeset
|
272 | } |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
273 | } |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
274 | |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
275 | |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
276 | void MainWindow::readsettings() |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
277 | { |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
278 | QSettings settings(QSettings::IniFormat, QSettings::UserScope, "mbse", "bmsapp"); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
279 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
280 | settings.beginGroup("dbprod"); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
281 | dbProd.host = settings.value("host").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
282 | if (dbProd.host.isEmpty()) { |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
283 | dbProd.host = "localhost"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
284 | dbProd.port = "3306"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
285 | dbProd.name = "bms_prod"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
286 | dbProd.user = "nobody"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
287 | dbProd.pass = "secret"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
288 | dbProd.charset = "utf8"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
289 | settings.setValue("host", dbProd.host); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
290 | settings.setValue("port", dbProd.port); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
291 | settings.setValue("name", dbProd.name); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
292 | settings.setValue("user", dbProd.user); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
293 | settings.setValue("pass", dbProd.pass); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
294 | settings.setValue("charset", dbProd.charset); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
295 | } else { |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
296 | dbProd.port = settings.value("port").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
297 | dbProd.name = settings.value("name").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
298 | dbProd.user = settings.value("user").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
299 | dbProd.pass = settings.value("pass").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
300 | dbProd.charset = settings.value("charset").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
301 | } |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
302 | settings.endGroup(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
303 | qDebug() << "MySQL prod" << dbProd.host << dbProd.port << dbProd.name << dbProd.pass; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
304 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
305 | settings.beginGroup("dbdev"); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
306 | dbDev.host = settings.value("host").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
307 | if (dbDev.host.isEmpty()) { |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
308 | dbDev.host = "localhost"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
309 | dbDev.port = "3306"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
310 | dbDev.name = "bms_dev"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
311 | dbDev.user = "nobody"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
312 | dbDev.pass = "secret"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
313 | dbDev.charset = "utf8"; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
314 | settings.setValue("host", dbDev.host); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
315 | settings.setValue("port", dbDev.port); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
316 | settings.setValue("name", dbDev.name); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
317 | settings.setValue("user", dbDev.user); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
318 | settings.setValue("pass", dbDev.pass); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
319 | settings.setValue("charset", dbDev.charset); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
320 | } else { |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
321 | dbDev.port = settings.value("port").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
322 | dbDev.name = settings.value("name").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
323 | dbDev.user = settings.value("user").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
324 | dbDev.pass = settings.value("pass").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
325 | dbDev.charset = settings.value("charset").toString(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
326 | } |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
327 | settings.endGroup(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
328 | qDebug() << "MySQL dev" << dbDev.host << dbDev.port << dbDev.name << dbDev.pass; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
329 | |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
330 | settings.beginGroup("wsprod"); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
331 | wsProd.host = settings.value("host").toString(); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
332 | if (wsProd.host.isEmpty()) { |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
333 | wsProd.host = "localhost"; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
334 | settings.setValue("host", wsProd.host); |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
335 | } |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
336 | settings.endGroup(); |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
337 | qDebug() << "WS prod" << wsProd.host; |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
338 | |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
339 | settings.beginGroup("wsdev"); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
340 | wsDev.host = settings.value("host").toString(); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
341 | if (wsDev.host.isEmpty()) { |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
342 | wsDev.host = "localhost"; |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
343 | settings.setValue("host", wsDev.host); |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
344 | } |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
345 | settings.endGroup(); |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
346 | qDebug() << "WS dev" << wsDev.host; |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
347 | } |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
348 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
349 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
350 | void MainWindow::writesettings() |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
351 | { |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
352 | QSettings settings(QSettings::IniFormat, QSettings::UserScope, "mbse", "bmsapp"); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
353 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
354 | settings.beginGroup("dbprod"); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
355 | settings.setValue("host", dbProd.host); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
356 | settings.setValue("port", dbProd.port); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
357 | settings.setValue("name", dbProd.name); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
358 | settings.setValue("user", dbProd.user); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
359 | settings.setValue("pass", dbProd.pass); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
360 | settings.setValue("charset", dbProd.charset); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
361 | settings.endGroup(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
362 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
363 | settings.beginGroup("dbdev"); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
364 | settings.setValue("host", dbDev.host); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
365 | settings.setValue("port", dbDev.port); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
366 | settings.setValue("name", dbDev.name); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
367 | settings.setValue("user", dbDev.user); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
368 | settings.setValue("pass", dbDev.pass); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
369 | settings.setValue("charset", dbDev.charset); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
370 | settings.endGroup(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
371 | |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
372 | settings.beginGroup("wsprod"); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
373 | settings.setValue("host", wsProd.host); |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
374 | settings.endGroup(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
375 | |
91
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
376 | settings.beginGroup("wsdev"); |
409d9c7214be
Added websocket connection to the bmsd server. Dropped MQTT, not needed. MySQL and webSockets is enough.
Michiel Broek <mbroek@mbse.eu>
parents:
90
diff
changeset
|
377 | settings.setValue("host", wsDev.host); |
90
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
378 | settings.endGroup(); |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
379 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
380 | qDebug() << "writesettings() done."; |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
381 | } |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
382 | |
2396457a8167
Moved functions from bmsapp.cpp to MainWindow.cpp
Michiel Broek <mbroek@mbse.eu>
parents:
88
diff
changeset
|
383 | |
4 | 384 | void MainWindow::on_actionExit_triggered() |
385 | { | |
386 | this->close(); | |
387 | } | |
3 | 388 | |
4 | 389 | |
275
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
390 | void MainWindow::fromImportXML() |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
391 | { |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
392 | ui->mainStack->setCurrentIndex(-1); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
393 | ui->mainStack->removeWidget(ImportXMLWindow); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
394 | delete ImportXMLWindow; |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
395 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
396 | ui->menuBar->setVisible(true); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
397 | } |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
398 | |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
399 | |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
400 | void MainWindow::on_actionImport_XML_triggered() |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
401 | { |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
402 | ImportXMLWindow = new ImportXML(this); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
403 | int index = ui->mainStack->count(); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
404 | ui->mainStack->addWidget(ImportXMLWindow); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
405 | ui->mainStack->setCurrentIndex(index); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
406 | setWindowTitle( QString("BMSapp - %1 - Import XML").arg(VERSIONSTRING)); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
407 | ui->menuBar->setVisible(false); |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
408 | } |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
409 | |
f472f9773782
Added import from xml, equipments and beerstyles.
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
410 | |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
411 | void MainWindow::fromMonNodes() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
412 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
413 | ui->mainStack->setCurrentIndex(-1); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
414 | ui->mainStack->removeWidget(MonNodesWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
415 | delete MonNodesWindow; |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
416 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
417 | ui->menuBar->setVisible(true); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
418 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
419 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
420 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
421 | void MainWindow::on_actionMon_Nodes_triggered() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
422 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
423 | MonNodesWindow = new MonNodes(this); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
424 | int index = ui->mainStack->count(); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
425 | ui->mainStack->addWidget(MonNodesWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
426 | ui->mainStack->setCurrentIndex(index); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
427 | setWindowTitle( QString("BMSapp - %1 - Monitor Nodes").arg(VERSIONSTRING)); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
428 | ui->menuBar->setVisible(false); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
429 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
430 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
431 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
432 | void MainWindow::fromMonFermenters() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
433 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
434 | ui->mainStack->setCurrentIndex(-1); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
435 | ui->mainStack->removeWidget(MonFermentersWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
436 | delete MonFermentersWindow; |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
437 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
438 | ui->menuBar->setVisible(true); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
439 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
440 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
441 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
442 | void MainWindow::on_actionMon_Fermenters_triggered() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
443 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
444 | MonFermentersWindow = new MonFermenters(this); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
445 | int index = ui->mainStack->count(); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
446 | ui->mainStack->addWidget(MonFermentersWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
447 | ui->mainStack->setCurrentIndex(index); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
448 | setWindowTitle( QString("BMSapp - %1 - Monitor Fermenters").arg(VERSIONSTRING)); |
311
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
449 | ui->menuBar->setVisible(false); |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
450 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
451 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
452 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
453 | void MainWindow::fromMonCO2meters() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
454 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
455 | ui->mainStack->setCurrentIndex(-1); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
456 | ui->mainStack->removeWidget(MonCO2metersWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
457 | delete MonCO2metersWindow; |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
458 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
459 | ui->menuBar->setVisible(true); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
460 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
461 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
462 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
463 | void MainWindow::on_actionMon_CO2meters_triggered() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
464 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
465 | MonCO2metersWindow = new MonCO2meters(this); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
466 | int index = ui->mainStack->count(); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
467 | ui->mainStack->addWidget(MonCO2metersWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
468 | ui->mainStack->setCurrentIndex(index); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
469 | setWindowTitle( QString("BMSapp - %1 - Monitor CO2meters").arg(VERSIONSTRING)); |
332
146874d7bb47
Added carbonation chart to it's own function. Added this chart to DetailCO2meter too.
Michiel Broek <mbroek@mbse.eu>
parents:
311
diff
changeset
|
470 | ui->menuBar->setVisible(false); |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
471 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
472 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
473 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
474 | void MainWindow::fromMoniSpindels() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
475 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
476 | ui->mainStack->setCurrentIndex(-1); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
477 | ui->mainStack->removeWidget(MoniSpindelsWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
478 | delete MoniSpindelsWindow; |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
479 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
480 | ui->menuBar->setVisible(true); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
481 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
482 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
483 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
484 | void MainWindow::on_actionMon_iSpindels_triggered() |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
485 | { |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
486 | MoniSpindelsWindow = new MoniSpindels(this); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
487 | int index = ui->mainStack->count(); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
488 | ui->mainStack->addWidget(MoniSpindelsWindow); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
489 | ui->mainStack->setCurrentIndex(index); |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
490 | setWindowTitle( QString("BMSapp - %1 - Monitor iSpindels").arg(VERSIONSTRING)); |
311
449116c083bd
Respond to websocket ping. Added iSpindels monitor overview.
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
491 | ui->menuBar->setVisible(false); |
310
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
492 | } |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
493 | |
bdaac24b86ed
Added monitor nodes overview
Michiel Broek <mbroek@mbse.eu>
parents:
308
diff
changeset
|
494 | |
81
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
495 | void MainWindow::fromRecipesTree() |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
496 | { |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
497 | ui->mainStack->setCurrentIndex(-1); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
498 | ui->mainStack->removeWidget(RecipesTreeWindow); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
499 | delete RecipesTreeWindow; |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
500 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
501 | ui->menuBar->setVisible(true); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
502 | } |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
503 | |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
504 | |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
505 | void MainWindow::on_actionRecipes_triggered() |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
506 | { |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
507 | RecipesTreeWindow = new RecipesTree(this); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
508 | int index = ui->mainStack->count(); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
509 | ui->mainStack->addWidget(RecipesTreeWindow); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
510 | ui->mainStack->setCurrentIndex(index); |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
511 | setWindowTitle( QString("BMSapp - %1 - Recipes").arg(VERSIONSTRING)); |
103
6da4e93b6ceb
Experiment with checkboxes in the fermentable table.
Michiel Broek <mbroek@mbse.eu>
parents:
91
diff
changeset
|
512 | ui->menuBar->setVisible(false); |
81
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
513 | } |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
514 | |
562ed7d1b74d
Added start of the Recipes Tree to select a recipe
Michiel Broek <mbroek@mbse.eu>
parents:
79
diff
changeset
|
515 | |
6
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
516 | void MainWindow::fromInventorySuppliers() |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
517 | { |
65
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
518 | ui->mainStack->setCurrentIndex(-1); |
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
519 | ui->mainStack->removeWidget(InventorySuppliersWindow); |
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
520 | delete InventorySuppliersWindow; |
64
b0d30697af67
First step in loading the Inventory Suppliers database on the mainscreen. But, it is loaded at program start en not removed when done. Weird programming to get this working.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
521 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
66
72386c164f54
Added texts on the buttons. Removed a number of debug messages. Hide and show the main menubar during edit. Removed unused and unneeded stackable window pages.
Michiel Broek <mbroek@mbse.eu>
parents:
65
diff
changeset
|
522 | ui->menuBar->setVisible(true); |
6
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
523 | } |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
524 | |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
525 | |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
526 | void MainWindow::on_actionSuppliers_triggered() |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
527 | { |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
528 | InventorySuppliersWindow = new InventorySuppliers(this); |
66
72386c164f54
Added texts on the buttons. Removed a number of debug messages. Hide and show the main menubar during edit. Removed unused and unneeded stackable window pages.
Michiel Broek <mbroek@mbse.eu>
parents:
65
diff
changeset
|
529 | int index = ui->mainStack->count(); |
65
2ef981980daa
Finally found out how to make these databases work on a single main window. And it's dynamic too.
Michiel Broek <mbroek@mbse.eu>
parents:
64
diff
changeset
|
530 | ui->mainStack->addWidget(InventorySuppliersWindow); |
66
72386c164f54
Added texts on the buttons. Removed a number of debug messages. Hide and show the main menubar during edit. Removed unused and unneeded stackable window pages.
Michiel Broek <mbroek@mbse.eu>
parents:
65
diff
changeset
|
531 | ui->mainStack->setCurrentIndex(index); |
64
b0d30697af67
First step in loading the Inventory Suppliers database on the mainscreen. But, it is loaded at program start en not removed when done. Weird programming to get this working.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
532 | setWindowTitle( QString("BMSapp - %1 - Inventory Suppliers").arg(VERSIONSTRING)); |
66
72386c164f54
Added texts on the buttons. Removed a number of debug messages. Hide and show the main menubar during edit. Removed unused and unneeded stackable window pages.
Michiel Broek <mbroek@mbse.eu>
parents:
65
diff
changeset
|
533 | ui->menuBar->setVisible(false); |
6
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
534 | } |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
535 | |
f8474f2c5db9
We can fetch a list of suppliers and show it in the wrong window. Still a lot to learn about Qt5
Michiel Broek <mbroek@mbse.eu>
parents:
4
diff
changeset
|
536 | |
19
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
537 | void MainWindow::fromInventoryFermentables() |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
538 | { |
68
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
539 | ui->mainStack->setCurrentIndex(-1); |
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
540 | ui->mainStack->removeWidget(InventoryFermentablesWindow); |
19
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
541 | delete InventoryFermentablesWindow; |
68
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
542 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
543 | ui->menuBar->setVisible(true); |
78
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
544 | statusBar()->clearMessage(); |
19
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
545 | } |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
546 | |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
547 | |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
548 | void MainWindow::on_actionFermentables_triggered() |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
549 | { |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
550 | InventoryFermentablesWindow = new InventoryFermentables(this); |
68
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
551 | int index = ui->mainStack->count(); |
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
552 | ui->mainStack->addWidget(InventoryFermentablesWindow); |
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
553 | ui->mainStack->setCurrentIndex(index); |
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
554 | setWindowTitle(QString("BMSapp - %1 - Inventory Fermentables").arg(VERSIONSTRING)); |
abac28effb21
Inventory Fermentables now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
66
diff
changeset
|
555 | ui->menuBar->setVisible(false); |
19
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
556 | } |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
557 | |
c94edc758a5b
Added Inventory Fermentables table.
Michiel Broek <mbroek@mbse.eu>
parents:
16
diff
changeset
|
558 | |
24 | 559 | void MainWindow::fromInventoryHops() |
560 | { | |
69
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
561 | ui->mainStack->setCurrentIndex(-1); |
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
562 | ui->mainStack->removeWidget(InventoryHopsWindow); |
24 | 563 | delete InventoryHopsWindow; |
69
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
564 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
565 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
566 | statusBar()->clearMessage(); |
24 | 567 | } |
568 | ||
569 | ||
570 | void MainWindow::on_actionHops_triggered() | |
571 | { | |
572 | InventoryHopsWindow = new InventoryHops(this); | |
69
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
573 | int index = ui->mainStack->count(); |
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
574 | ui->mainStack->addWidget(InventoryHopsWindow); |
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
575 | ui->mainStack->setCurrentIndex(index); |
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
576 | setWindowTitle(QString("BMSapp - %1 - Inventory Hops").arg(VERSIONSTRING)); |
228cb2a01acf
Inventory Hops now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
577 | ui->menuBar->setVisible(false); |
24 | 578 | } |
579 | ||
580 | ||
25
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
581 | void MainWindow::fromInventoryYeasts() |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
582 | { |
70
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
583 | ui->mainStack->setCurrentIndex(-1); |
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
584 | ui->mainStack->removeWidget(InventoryYeastsWindow); |
25
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
585 | delete InventoryYeastsWindow; |
70
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
586 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
587 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
588 | statusBar()->clearMessage(); |
25
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
589 | } |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
590 | |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
591 | |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
592 | void MainWindow::on_actionYeasts_triggered() |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
593 | { |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
594 | InventoryYeastsWindow = new InventoryYeasts(this); |
70
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
595 | int index = ui->mainStack->count(); |
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
596 | ui->mainStack->addWidget(InventoryYeastsWindow); |
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
597 | ui->mainStack->setCurrentIndex(index); |
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
598 | setWindowTitle(QString("BMSapp - %1 - Inventory Yeasts").arg(VERSIONSTRING)); |
556b4202c5e7
Inventory Yeasts now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
69
diff
changeset
|
599 | ui->menuBar->setVisible(false); |
25
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
600 | } |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
601 | |
a9da2744609e
Added inventory yeasts editor. Fixed resource icons location.
Michiel Broek <mbroek@mbse.eu>
parents:
24
diff
changeset
|
602 | |
28
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
603 | void MainWindow::fromInventoryMiscs() |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
604 | { |
71
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
605 | ui->mainStack->setCurrentIndex(-1); |
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
606 | ui->mainStack->removeWidget(InventoryMiscsWindow); |
28
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
607 | delete InventoryMiscsWindow; |
71
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
608 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
609 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
610 | statusBar()->clearMessage(); |
28
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
611 | } |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
612 | |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
613 | |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
614 | void MainWindow::on_actionMiscs_triggered() |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
615 | { |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
616 | InventoryMiscsWindow = new InventoryMiscs(this); |
71
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
617 | int index = ui->mainStack->count(); |
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
618 | ui->mainStack->addWidget(InventoryMiscsWindow); |
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
619 | ui->mainStack->setCurrentIndex(index); |
72
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
620 | setWindowTitle(QString("BMSapp - %1 - Inventory Miscs").arg(VERSIONSTRING)); |
71
5bd0d7be0167
Inventory Miscs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
70
diff
changeset
|
621 | ui->menuBar->setVisible(false); |
28
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
622 | } |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
623 | |
93a70b1502ca
Added the inventory miscs table.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
624 | |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
625 | void MainWindow::fromInventoryWaters() |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
626 | { |
72
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
627 | ui->mainStack->setCurrentIndex(-1); |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
628 | ui->mainStack->removeWidget(InventoryWatersWindow); |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
629 | delete InventoryWatersWindow; |
72
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
630 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
631 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
632 | statusBar()->clearMessage(); |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
633 | } |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
634 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
635 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
636 | void MainWindow::on_actionWaters_triggered() |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
637 | { |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
638 | InventoryWatersWindow = new InventoryWaters(this); |
72
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
639 | int index = ui->mainStack->count(); |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
640 | ui->mainStack->addWidget(InventoryWatersWindow); |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
641 | ui->mainStack->setCurrentIndex(index); |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
642 | setWindowTitle(QString("BMSapp - %1 - Inventory Waters").arg(VERSIONSTRING)); |
7992c686e349
Inventory Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
71
diff
changeset
|
643 | ui->menuBar->setVisible(false); |
29
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
644 | } |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
645 | |
76846c99f827
Added inventory water editor and table. In Yeasts table make sure the fields without a tickmark are empty. Removed Utils::Round function, not reliable.
Michiel Broek <mbroek@mbse.eu>
parents:
28
diff
changeset
|
646 | |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
647 | void MainWindow::fromInventoryEquipments() |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
648 | { |
73
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
649 | ui->mainStack->setCurrentIndex(-1); |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
650 | ui->mainStack->removeWidget(InventoryEquipmentsWindow); |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
651 | delete InventoryEquipmentsWindow; |
73
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
652 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
653 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
654 | statusBar()->clearMessage(); |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
655 | } |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
656 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
657 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
658 | void MainWindow::on_actionEquipments_triggered() |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
659 | { |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
660 | InventoryEquipmentsWindow = new InventoryEquipments(this); |
73
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
661 | int index = ui->mainStack->count(); |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
662 | ui->mainStack->addWidget(InventoryEquipmentsWindow); |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
663 | ui->mainStack->setCurrentIndex(index); |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
664 | setWindowTitle(QString("BMSapp - %1 - Inventory Equipments").arg(VERSIONSTRING)); |
ebd2fc719b1a
Inventory Equipments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
665 | ui->menuBar->setVisible(false); |
30
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
666 | } |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
667 | |
0fec6a1abd13
Added inventory equipment table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
29
diff
changeset
|
668 | |
52
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
669 | void MainWindow::on_actionSupplies_list_triggered() |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
670 | { |
88
64cf5468fd22
Improve the CMakeLists.txt. Cleanup unused variables. Removed som debug messages.
Michiel Broek <mbroek@mbse.eu>
parents:
81
diff
changeset
|
671 | PrinterDialog(PR_SUPPLIES, -1, this); |
52
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
672 | } |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
673 | |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
674 | |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
675 | void MainWindow::on_actionYeast_bank_triggered() |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
676 | { |
88
64cf5468fd22
Improve the CMakeLists.txt. Cleanup unused variables. Removed som debug messages.
Michiel Broek <mbroek@mbse.eu>
parents:
81
diff
changeset
|
677 | PrinterDialog(PR_YEASTBANK, -1, this); |
52
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
678 | } |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
679 | |
ff7b3a41c9b5
After several days experimenting, trials and a lot of errors, a working and nice looking printer support has been added to the application.
Michiel Broek <mbroek@mbse.eu>
parents:
49
diff
changeset
|
680 | |
173
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
681 | void MainWindow::fromProdInprod() |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
682 | { |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
683 | ui->mainStack->setCurrentIndex(-1); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
684 | ui->mainStack->removeWidget(ProdInprodWindow); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
685 | delete ProdInprodWindow; |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
686 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
687 | ui->menuBar->setVisible(true); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
688 | statusBar()->clearMessage(); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
689 | } |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
690 | |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
691 | |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
692 | void MainWindow::on_actionProd_inprod_triggered() |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
693 | { |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
694 | ProdInprodWindow = new ProdInprod(this); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
695 | int index = ui->mainStack->count(); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
696 | ui->mainStack->addWidget(ProdInprodWindow); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
697 | ui->mainStack->setCurrentIndex(index); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
698 | setWindowTitle(QString("BMSapp - %1 - Products in production").arg(VERSIONSTRING)); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
699 | ui->menuBar->setVisible(false); |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
700 | } |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
701 | |
8514932b61aa
Added menu entry products in production
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
702 | |
228
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
703 | void MainWindow::fromProdOnName() |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
704 | { |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
705 | ui->mainStack->setCurrentIndex(-1); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
706 | ui->mainStack->removeWidget(ProdOnNameWindow); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
707 | delete ProdOnNameWindow; |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
708 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
709 | ui->menuBar->setVisible(true); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
710 | statusBar()->clearMessage(); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
711 | } |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
712 | |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
713 | |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
714 | void MainWindow::on_actionOn_Name_triggered() |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
715 | { |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
716 | ProdOnNameWindow = new ProdOnName(this); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
717 | int index = ui->mainStack->count(); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
718 | ui->mainStack->addWidget(ProdOnNameWindow); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
719 | ui->mainStack->setCurrentIndex(index); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
720 | setWindowTitle(QString("BMSapp - %1 - Products archive on name").arg(VERSIONSTRING)); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
721 | ui->menuBar->setVisible(false); |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
722 | } |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
723 | |
c859e8efa470
Added archive products on name.
Michiel Broek <mbroek@mbse.eu>
parents:
173
diff
changeset
|
724 | |
231
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
725 | void MainWindow::fromProdOnCode() |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
726 | { |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
727 | ui->mainStack->setCurrentIndex(-1); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
728 | ui->mainStack->removeWidget(ProdOnCodeWindow); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
729 | delete ProdOnCodeWindow; |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
730 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
731 | ui->menuBar->setVisible(true); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
732 | statusBar()->clearMessage(); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
733 | } |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
734 | |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
735 | |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
736 | void MainWindow::on_actionOn_Code_triggered() |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
737 | { |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
738 | ProdOnCodeWindow = new ProdOnCode(this); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
739 | int index = ui->mainStack->count(); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
740 | ui->mainStack->addWidget(ProdOnCodeWindow); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
741 | ui->mainStack->setCurrentIndex(index); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
742 | setWindowTitle(QString("BMSapp - %1 - Products archive on code").arg(VERSIONSTRING)); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
743 | ui->menuBar->setVisible(false); |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
744 | } |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
745 | |
54b5abd46958
Added archive products sorted on code.
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
746 | |
234
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
747 | void MainWindow::fromProdOnDate() |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
748 | { |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
749 | ui->mainStack->setCurrentIndex(-1); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
750 | ui->mainStack->removeWidget(ProdOnDateWindow); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
751 | delete ProdOnDateWindow; |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
752 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
753 | ui->menuBar->setVisible(true); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
754 | statusBar()->clearMessage(); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
755 | } |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
756 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
757 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
758 | void MainWindow::on_actionOn_Date_triggered() |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
759 | { |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
760 | ProdOnDateWindow = new ProdOnDate(this); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
761 | int index = ui->mainStack->count(); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
762 | ui->mainStack->addWidget(ProdOnDateWindow); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
763 | ui->mainStack->setCurrentIndex(index); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
764 | setWindowTitle(QString("BMSapp - %1 - Products archive on date").arg(VERSIONSTRING)); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
765 | ui->menuBar->setVisible(false); |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
766 | } |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
767 | |
51aea8b798f0
Add product archive tree by date.
Michiel Broek <mbroek@mbse.eu>
parents:
232
diff
changeset
|
768 | |
232
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
769 | void MainWindow::fromProdOnTree() |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
770 | { |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
771 | ui->mainStack->setCurrentIndex(-1); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
772 | ui->mainStack->removeWidget(ProdOnTreeWindow); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
773 | delete ProdOnTreeWindow; |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
774 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
775 | ui->menuBar->setVisible(true); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
776 | statusBar()->clearMessage(); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
777 | } |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
778 | |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
779 | |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
780 | void MainWindow::on_actionOn_Tree_triggered() |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
781 | { |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
782 | ProdOnTreeWindow = new ProdOnTree(this); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
783 | int index = ui->mainStack->count(); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
784 | ui->mainStack->addWidget(ProdOnTreeWindow); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
785 | ui->mainStack->setCurrentIndex(index); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
786 | setWindowTitle(QString("BMSapp - %1 - Products archive on beerstyle").arg(VERSIONSTRING)); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
787 | ui->menuBar->setVisible(false); |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
788 | } |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
789 | |
6d3ba9c44f95
Added the product archives tree by styles.
Michiel Broek <mbroek@mbse.eu>
parents:
231
diff
changeset
|
790 | |
48
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
791 | void MainWindow::fromProfileWaters() |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
792 | { |
74
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
793 | ui->mainStack->setCurrentIndex(-1); |
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
794 | ui->mainStack->removeWidget(ProfileWatersWindow); |
48
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
795 | delete ProfileWatersWindow; |
74
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
796 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
797 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
798 | statusBar()->clearMessage(); |
48
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
799 | } |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
800 | |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
801 | |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
802 | void MainWindow::on_actionWater_profiles_triggered() |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
803 | { |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
804 | ProfileWatersWindow = new ProfileWaters(this); |
74
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
805 | int index = ui->mainStack->count(); |
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
806 | ui->mainStack->addWidget(ProfileWatersWindow); |
4ac38457a709
Profile Waters now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
73
diff
changeset
|
807 | ui->mainStack->setCurrentIndex(index); |
75
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
808 | setWindowTitle(QString("BMSapp - %1 - Water Profiles").arg(VERSIONSTRING)); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
809 | ui->menuBar->setVisible(false); |
48
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
810 | } |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
811 | |
ddd1171ecda5
Added profile water table and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
30
diff
changeset
|
812 | |
49
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
813 | void MainWindow::fromProfileMashs() |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
814 | { |
75
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
815 | ui->mainStack->setCurrentIndex(-1); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
816 | ui->mainStack->removeWidget(ProfileMashsWindow); |
49
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
817 | delete ProfileMashsWindow; |
75
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
818 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
819 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
820 | statusBar()->clearMessage(); |
49
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
821 | } |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
822 | |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
823 | |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
824 | void MainWindow::on_actionMash_profiles_triggered() |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
825 | { |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
826 | ProfileMashsWindow = new ProfileMashs(this); |
75
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
827 | int index = ui->mainStack->count(); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
828 | ui->mainStack->addWidget(ProfileMashsWindow); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
829 | ui->mainStack->setCurrentIndex(index); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
830 | setWindowTitle(QString("BMSapp - %1 - Mash Profiles").arg(VERSIONSTRING)); |
5f953abbd73c
Profile Mashs now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
74
diff
changeset
|
831 | ui->menuBar->setVisible(false); |
49
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
832 | } |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
833 | |
29cf6e350063
Added Mash profiles table and the first part of the Mash profile editor. Edit and write must be written.
Michiel Broek <mbroek@mbse.eu>
parents:
48
diff
changeset
|
834 | |
56
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
835 | void MainWindow::fromProfileStyles() |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
836 | { |
76
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
837 | ui->mainStack->setCurrentIndex(-1); |
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
838 | ui->mainStack->removeWidget(ProfileStylesWindow); |
56
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
839 | delete ProfileStylesWindow; |
76
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
840 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
841 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
842 | statusBar()->clearMessage(); |
56
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
843 | } |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
844 | |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
845 | |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
846 | void MainWindow::on_actionStyles_profiles_triggered() |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
847 | { |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
848 | ProfileStylesWindow = new ProfileStyles(this); |
76
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
849 | int index = ui->mainStack->count(); |
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
850 | ui->mainStack->addWidget(ProfileStylesWindow); |
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
851 | ui->mainStack->setCurrentIndex(index); |
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
852 | setWindowTitle(QString("BMSapp - %1 - Styles Profiles").arg(VERSIONSTRING)); |
93395c4d6c8d
Profile Styles now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
75
diff
changeset
|
853 | ui->menuBar->setVisible(false); |
56
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
854 | } |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
855 | |
eb6c564192f4
Added styles tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
856 | |
57
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
857 | void MainWindow::fromProfileFerments() |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
858 | { |
77
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
859 | ui->mainStack->setCurrentIndex(-1); |
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
860 | ui->mainStack->removeWidget(ProfileFermentsWindow); |
57
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
861 | delete ProfileFermentsWindow; |
77
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
862 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
863 | ui->menuBar->setVisible(true); |
79
e726db72da3c
All inventory and profiles now show the items sizes in the statusbar.
Michiel Broek <mbroek@mbse.eu>
parents:
78
diff
changeset
|
864 | statusBar()->clearMessage(); |
57
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
865 | } |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
866 | |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
867 | |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
868 | void MainWindow::on_actionFerments_profiles_triggered() |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
869 | { |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
870 | ProfileFermentsWindow = new ProfileFerments(this); |
77
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
871 | int index = ui->mainStack->count(); |
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
872 | ui->mainStack->addWidget(ProfileFermentsWindow); |
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
873 | ui->mainStack->setCurrentIndex(index); |
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
874 | setWindowTitle(QString("BMSapp - %1 - Fermentation Profiles").arg(VERSIONSTRING)); |
86a3277a7317
Profile Ferments now on the mainscreen.
Michiel Broek <mbroek@mbse.eu>
parents:
76
diff
changeset
|
875 | ui->menuBar->setVisible(false); |
57
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
876 | } |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
877 | |
75d11cc05ce4
Added profile fermentation tables and editor.
Michiel Broek <mbroek@mbse.eu>
parents:
56
diff
changeset
|
878 | |
15
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
879 | void MainWindow::fromSetup() |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
880 | { |
78
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
881 | ui->mainStack->setCurrentIndex(-1); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
882 | ui->mainStack->removeWidget(SetupWindow); |
15
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
883 | delete SetupWindow; |
78
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
884 | setWindowTitle( QString("BMSapp - %1").arg(VERSIONSTRING) ); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
885 | ui->menuBar->setVisible(true); |
133
08635b028dcf
Load waters during recipe startup. Started calcWater() function. Load profile_setup record global. The print function uses the globals now too instead of loading from the database.
Michiel Broek <mbroek@mbse.eu>
parents:
131
diff
changeset
|
886 | loadSetup(); |
15
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
887 | } |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
888 | |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
889 | |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
890 | void MainWindow::on_actionSetup_triggered() |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
891 | { |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
892 | SetupWindow = new Setup(this); |
78
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
893 | int index = ui->mainStack->count(); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
894 | ui->mainStack->addWidget(SetupWindow); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
895 | ui->mainStack->setCurrentIndex(index); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
896 | ui->menuBar->setVisible(false); |
15
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
897 | } |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
898 | |
c58b82549713
Started adding the global setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
6
diff
changeset
|
899 | |
4 | 900 | void MainWindow::on_actionAbout_triggered() |
901 | { | |
902 | AboutDialog dialog(this); | |
903 | dialog.setModal(true); | |
904 | dialog.exec(); | |
905 | } | |
906 | ||
907 | ||
78
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
908 | void MainWindow::windowTitle(QString msg) |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
909 | { |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
910 | setWindowTitle(QString("BMSapp - %1 - %2").arg(VERSIONSTRING).arg(msg)); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
911 | } |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
912 | |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
913 | |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
914 | void MainWindow::statusMsg(QString msg) |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
915 | { |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
916 | statusBar()->showMessage(msg); |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
917 | } |
3a6cba2dd05d
Status and Windowtitle messages via signals and slots. Global setup now on the mainwindow.
Michiel Broek <mbroek@mbse.eu>
parents:
77
diff
changeset
|
918 |