Fri, 29 Jul 2022 13:12:26 +0200
First load of changes for hops. In EditHop load the dropdown buttons from the global table. Use named query fields. Added database utilisation and bu_factor fields for hop extracts. Added edit fields for these new fields. Added post boil SG, utilisation and bu_factor parameters to the toIBU function. Added hops form parameter to the hopFlavourContribution and hopAromaContribution display bars. In the hops inventory list dispay volumes instead of weight for hop extracts. Modified the TinsethIBU function to use utilisation and bu_factor parameters. Add calculations for co2 and iso hop extracts, this is work in progress. The toIBU function makes use of the preSG and postSG values to use the correct SG to caall the TinsethIBU function. This results in a bit lower IBU values mostly affecting the late additions. Added use hop at bottling for iso hop extracts like Tetra hops using the formula from BarthHaas.
310 | 1 | /** |
2 | * MonCO2meters.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 | */ | |
17 | #include "MonCO2meters.h" | |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
18 | #include "DetailCO2meter.h" |
310 | 19 | #include "MainWindow.h" |
20 | #include "config.h" | |
21 | ||
22 | ||
23 | ||
24 | /* | |
25 | * Build the table and buttons on the mainscreen. | |
26 | * Don't use a ui file, do it dynamicly. | |
27 | */ | |
28 | MonCO2meters::MonCO2meters(QWidget *parent) : QDialog(parent) | |
29 | { | |
30 | qDebug() << "MonCO2meters start"; | |
31 | ||
32 | gridLayout = new QGridLayout(this); | |
33 | gridLayout->setObjectName(QString::fromUtf8("gridLayout")); | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
34 | tableCO2meters = new QTableWidget(this); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
35 | tableCO2meters->setObjectName(QString::fromUtf8("tableCO2meters")); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
36 | tableCO2meters->setEnabled(true); |
310 | 37 | QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); |
38 | sizePolicy.setHorizontalStretch(0); | |
39 | sizePolicy.setVerticalStretch(0); | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
40 | sizePolicy.setHeightForWidth(tableCO2meters->sizePolicy().hasHeightForWidth()); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
41 | tableCO2meters->setSizePolicy(sizePolicy); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
42 | tableCO2meters->setMinimumSize(QSize(1054, 0)); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
43 | gridLayout->addWidget(tableCO2meters, 0, 0, 1, 1); |
310 | 44 | |
45 | groupBox = new QGroupBox(this); | |
46 | groupBox->setObjectName(QString::fromUtf8("groupBox")); | |
47 | groupBox->setEnabled(true); | |
48 | groupBox->setFlat(false); | |
49 | horizontalLayout = new QHBoxLayout(groupBox); | |
50 | horizontalLayout->setSpacing(6); | |
51 | horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); | |
52 | horizontalLayout->setContentsMargins(0, 0, 0, 0); | |
53 | quitButton = new QPushButton(groupBox); | |
54 | quitButton->setObjectName(QString::fromUtf8("quitButton")); | |
55 | quitButton->setMinimumSize(QSize(80, 24)); | |
56 | quitButton->setText(tr("Quit")); | |
57 | QIcon icon; | |
58 | icon.addFile(QString::fromUtf8(":icons/silk/door_out.png"), QSize(), QIcon::Normal, QIcon::Off); | |
59 | quitButton->setIcon(icon); | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
60 | horizontalLayout->addWidget(quitButton, 0, Qt::AlignCenter); |
310 | 61 | gridLayout->addWidget(groupBox, 1, 0, 1, 1); |
62 | ||
63 | connect(quitButton, SIGNAL(clicked()), parent, SLOT(fromMonCO2meters())); | |
64 | connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
65 | connect(parent, SIGNAL(updateCO2meters(QString)), this, SLOT(refreshCO2meters(QString))); |
310 | 66 | emit refreshTable(); |
67 | } | |
68 | ||
69 | ||
70 | void MonCO2meters::refreshTable() | |
71 | { | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
72 | QTableWidgetItem *item; |
310 | 73 | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
74 | qDebug() << "MonCO2meters reload"; |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
75 | QSqlQuery query("SELECT record,node,alias,online,mode,beercode,beername,temperature,pressure_bar FROM mon_co2meters ORDER BY node,alias"); |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
76 | const QStringList labels({tr("Node"), tr("Unit"), tr("Status"), tr("Mode"), tr("Beer"), tr("Temperature"), tr("Pressure"), tr("Details")}); |
310 | 77 | |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
78 | this->tableCO2meters->setColumnCount(8); |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
79 | this->tableCO2meters->setColumnWidth(0, 150); /* Node */ |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
80 | this->tableCO2meters->setColumnWidth(1, 100); /* Unit */ |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
81 | this->tableCO2meters->setColumnWidth(2, 80); /* Status */ |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
82 | this->tableCO2meters->setColumnWidth(3, 80); /* Mode */ |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
83 | this->tableCO2meters->setColumnWidth(4, 350); /* Beer */ |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
84 | this->tableCO2meters->setColumnWidth(5, 90); /* Temperature */ |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
85 | this->tableCO2meters->setColumnWidth(6, 90); /* Pressure */ |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
86 | this->tableCO2meters->setColumnWidth(7, 90); /* Edit button */ |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
87 | this->tableCO2meters->setRowCount(query.size()); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
88 | this->tableCO2meters->setHorizontalHeaderLabels(labels); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
89 | this->tableCO2meters->verticalHeader()->hide(); |
310 | 90 | /* Set the widget size to 1054 x 575 in the ui. */ |
91 | ||
92 | query.first(); | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
93 | for (int i = 0 ; i < query.size() ; i++ ) { |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
94 | this->tableCO2meters->setItem(i, 0, new QTableWidgetItem(query.value("node").toString())); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
95 | this->tableCO2meters->setItem(i, 1, new QTableWidgetItem(query.value("alias").toString())); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
96 | |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
97 | if (query.value("online").toInt()) { |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
98 | item = new QTableWidgetItem(QString("Ok")); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
99 | } else { |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
100 | item = new QTableWidgetItem(QString("Offline")); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
101 | item->setForeground(QBrush(QColor(Qt::red))); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
102 | } |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
103 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
104 | this->tableCO2meters->setItem(i, 2, item); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
105 | |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
106 | item = new QTableWidgetItem(query.value("mode").toString()); |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
107 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
108 | this->tableCO2meters->setItem(i, 3, item); |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
109 | |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
110 | item = new QTableWidgetItem(query.value("beercode").toString()+" - "+query.value("beername").toString()); |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
111 | this->tableCO2meters->setItem(i, 4, item); |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
112 | |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
113 | if (query.value("online").toInt()) { |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
114 | item = new QTableWidgetItem(QString("%1°C").arg(query.value("temperature").toDouble(), 4, 'f', 3, '0')); |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
115 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
116 | this->tableCO2meters->setItem(i, 5, item); |
326
6728b4c29cb4
Extra decimal digit for the pressure.
Michiel Broek <mbroek@mbse.eu>
parents:
313
diff
changeset
|
117 | item = new QTableWidgetItem(QString("%1 bar").arg(query.value("pressure_bar").toDouble(), 3, 'f', 2, '0')); |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
118 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
119 | this->tableCO2meters->setItem(i, 6, item); |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
120 | } else { |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
121 | this->tableCO2meters->setItem(i, 5, new QTableWidgetItem(QString(""))); |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
122 | this->tableCO2meters->setItem(i, 6, new QTableWidgetItem(QString(""))); |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
123 | } |
310 | 124 | |
125 | /* Add the Edit button */ | |
126 | QWidget* pWidget = new QWidget(); | |
127 | QPushButton* btn_edit = new QPushButton(); | |
128 | btn_edit->setObjectName(QString("%1").arg(query.value(0).toString())); /* Send record with the button */ | |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
129 | btn_edit->setText(tr("Details")); |
310 | 130 | connect(btn_edit, SIGNAL(clicked()), this, SLOT(on_editButton_clicked())); |
131 | QHBoxLayout* pLayout = new QHBoxLayout(pWidget); | |
132 | pLayout->addWidget(btn_edit); | |
133 | pLayout->setContentsMargins(5, 0, 5, 0); | |
134 | pWidget->setLayout(pLayout); | |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
135 | this->tableCO2meters->setCellWidget(i, 7, pWidget); |
310 | 136 | query.next(); |
137 | } | |
138 | emit setStatus(QString(tr("Total items: %1")).arg(query.size())); | |
139 | } | |
140 | ||
141 | ||
142 | MonCO2meters::~MonCO2meters() {} | |
143 | ||
144 | ||
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
145 | void MonCO2meters::refreshCO2meters(QString data) |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
146 | { |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
147 | qDebug() << "refreshCO2meters" << data; |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
148 | emit refreshTable(); |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
149 | emit updateCO2meter(data); |
313
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
150 | } |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
151 | |
966b5de3182e
Added monitor co2meters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
152 | |
310 | 153 | void MonCO2meters::edit(int recno) |
154 | { | |
328
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
155 | DetailCO2meter dialog(recno, this); |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
156 | dialog.setModal(true); |
ee2c8b29f389
Added CO2 meter monitor detail screen.
Michiel Broek <mbroek@mbse.eu>
parents:
326
diff
changeset
|
157 | dialog.exec(); |
310 | 158 | } |
159 | ||
160 | ||
161 | void MonCO2meters::on_editButton_clicked() | |
162 | { | |
163 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); | |
164 | int recno = pb->objectName().toInt(); | |
165 | edit(recno); | |
166 | } | |
167 | ||
168 |