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 | * MonFermenters.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 "MonFermenters.h" | |
315 | 18 | #include "DetailFermenter.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 | MonFermenters::MonFermenters(QWidget *parent) : QDialog(parent) | |
29 | { | |
30 | qDebug() << "MonFermenters start"; | |
31 | ||
32 | gridLayout = new QGridLayout(this); | |
33 | gridLayout->setObjectName(QString::fromUtf8("gridLayout")); | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
34 | tableFermenters = new QTableWidget(this); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
35 | tableFermenters->setObjectName(QString::fromUtf8("tableFermenters")); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
36 | tableFermenters->setEnabled(true); |
310 | 37 | QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding); |
38 | sizePolicy.setHorizontalStretch(0); | |
39 | sizePolicy.setVerticalStretch(0); | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
40 | sizePolicy.setHeightForWidth(tableFermenters->sizePolicy().hasHeightForWidth()); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
41 | tableFermenters->setSizePolicy(sizePolicy); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
42 | tableFermenters->setMinimumSize(QSize(1054, 0)); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
43 | gridLayout->addWidget(tableFermenters, 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); | |
312
251b9aaae916
Added monitor fermenters 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(fromMonFermenters())); | |
64 | connect(this, SIGNAL(setStatus(QString)), parent, SLOT(statusMsg(QString))); | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
65 | connect(parent, SIGNAL(updateFermenters(QString)), this, SLOT(refreshFermenters(QString))); |
310 | 66 | emit refreshTable(); |
67 | } | |
68 | ||
69 | ||
70 | void MonFermenters::refreshTable() | |
71 | { | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
72 | QTableWidgetItem *item; |
310 | 73 | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
74 | qDebug() << "MonFermenters reload"; |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
75 | QSqlQuery query("SELECT record,node,alias,online,beercode,beername,mode,air_temperature,beer_temperature FROM mon_fermenters ORDER BY node,alias"); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
76 | const QStringList labels({tr("Node"), tr("Unit"), tr("Status"), tr("Mode"), tr("Beer"), tr("Air"), tr("Beer"), tr("Details")}); |
310 | 77 | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
78 | this->tableFermenters->setColumnCount(8); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
79 | this->tableFermenters->setColumnWidth(0, 100); /* Node */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
80 | this->tableFermenters->setColumnWidth(1, 100); /* Alias */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
81 | this->tableFermenters->setColumnWidth(2, 100); /* Status */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
82 | this->tableFermenters->setColumnWidth(3, 100); /* Mode */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
83 | this->tableFermenters->setColumnWidth(4, 360); /* Beer */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
84 | this->tableFermenters->setColumnWidth(5, 90); /* Air temp */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
85 | this->tableFermenters->setColumnWidth(6, 90); /* Beer temp */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
86 | this->tableFermenters->setColumnWidth(7, 90); /* Edit button */ |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
87 | this->tableFermenters->setRowCount(query.size()); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
88 | this->tableFermenters->setHorizontalHeaderLabels(labels); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
89 | this->tableFermenters->verticalHeader()->hide(); |
310 | 90 | /* Set the widget size to 1054 x 575 in the ui. */ |
91 | ||
92 | query.first(); | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
93 | for (int i = 0 ; i < query.size() ; i++ ) { |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
94 | this->tableFermenters->setItem(i, 0, new QTableWidgetItem(query.value("node").toString())); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
95 | this->tableFermenters->setItem(i, 1, new QTableWidgetItem(query.value("alias").toString())); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
96 | |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
97 | if (query.value("online").toInt()) { |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
98 | item = new QTableWidgetItem(QString("Ok")); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
99 | } else { |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
100 | item = new QTableWidgetItem(QString("Offline")); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
101 | item->setForeground(QBrush(QColor(Qt::red))); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
102 | } |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
103 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
104 | this->tableFermenters->setItem(i, 2, item); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
105 | |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
106 | item = new QTableWidgetItem(query.value("beercode").toString()+" - "+query.value("beername").toString()); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
107 | this->tableFermenters->setItem(i, 4, item); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
108 | |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
109 | if (query.value("online").toInt()) { |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
110 | item = new QTableWidgetItem(query.value("mode").toString()); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
111 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
112 | this->tableFermenters->setItem(i, 3, item); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
113 | item = new QTableWidgetItem(QString("%1°C").arg(query.value("air_temperature").toDouble(), 4, 'f', 3, '0')); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
114 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
115 | this->tableFermenters->setItem(i, 5, item); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
116 | item = new QTableWidgetItem(QString("%1°C").arg(query.value("beer_temperature").toDouble(), 4, 'f', 3, '0')); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
117 | item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
118 | this->tableFermenters->setItem(i, 6, item); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
119 | } else { |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
120 | this->tableFermenters->setItem(i, 3, new QTableWidgetItem(QString(""))); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
121 | this->tableFermenters->setItem(i, 5, new QTableWidgetItem(QString(""))); |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
122 | this->tableFermenters->setItem(i, 6, new QTableWidgetItem(QString(""))); |
251b9aaae916
Added monitor fermenters 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(); | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
128 | btn_edit->setObjectName(QString("%1").arg(query.value("record").toString())); /* Send record with the button */ |
251b9aaae916
Added monitor fermenters 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); | |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
135 | this->tableFermenters->setCellWidget(i, 7, pWidget); |
310 | 136 | query.next(); |
137 | } | |
138 | emit setStatus(QString(tr("Total items: %1")).arg(query.size())); | |
139 | } | |
140 | ||
141 | ||
142 | MonFermenters::~MonFermenters() {} | |
143 | ||
144 | ||
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
145 | void MonFermenters::refreshFermenters(QString data) |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
146 | { |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
147 | qDebug() << "refreshFermenters" << data; |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
148 | emit refreshTable(); |
323
d053ffbbf3e9
Started with change and signal functions. Implemented mode change for test. The MainWindow webSocket is now global so the Detail screens can send websocket messages.
Michiel Broek <mbroek@mbse.eu>
parents:
315
diff
changeset
|
149 | emit updateFermenter(data); |
312
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
150 | } |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
151 | |
251b9aaae916
Added monitor fermenters overview
Michiel Broek <mbroek@mbse.eu>
parents:
310
diff
changeset
|
152 | |
310 | 153 | void MonFermenters::edit(int recno) |
154 | { | |
315 | 155 | DetailFermenter dialog(recno, this); |
156 | dialog.setModal(true); | |
157 | dialog.exec(); | |
310 | 158 | } |
159 | ||
160 | ||
161 | void MonFermenters::on_editButton_clicked() | |
162 | { | |
163 | QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); | |
164 | int recno = pb->objectName().toInt(); | |
165 | edit(recno); | |
166 | } | |
167 | ||
168 |