# HG changeset patch # User Michiel Broek # Date 1656753793 -7200 # Node ID ee2c8b29f389e49e7a17a8c918666185334b4a37 # Parent f44bb52f760f803258ac7d8a2fa0bf77be62d468 Added CO2 meter monitor detail screen. diff -r f44bb52f760f -r ee2c8b29f389 CMakeLists.txt --- a/CMakeLists.txt Fri Jul 01 22:57:31 2022 +0200 +++ b/CMakeLists.txt Sat Jul 02 11:23:13 2022 +0200 @@ -222,6 +222,7 @@ ${SRCDIR}/MonCO2meters.cpp ${SRCDIR}/MoniSpindels.cpp ${SRCDIR}/DetailFermenter.cpp + ${SRCDIR}/DetailCO2meter.cpp ${SRCDIR}/EditProduct.cpp ${SRCDIR}/ImportXML.cpp ${SRCDIR}/Setup.cpp @@ -279,6 +280,7 @@ ${SRCDIR}/MonCO2meters.h ${SRCDIR}/MoniSpindels.h ${SRCDIR}/DetailFermenter.h + ${SRCDIR}/DetailCO2meter.h ${SRCDIR}/EditProduct.h ${SRCDIR}/ImportXML.h ${SRCDIR}/Setup.h @@ -316,6 +318,7 @@ ${UIDIR}/EditRecipe.ui ${UIDIR}/EditProduct.ui ${UIDIR}/DetailFermenter.ui + ${UIDIR}/DetailCO2meter.ui ${UIDIR}/ImportXML.ui ${UIDIR}/MainWindow.ui ) diff -r f44bb52f760f -r ee2c8b29f389 src/DetailCO2meter.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/DetailCO2meter.cpp Sat Jul 02 11:23:13 2022 +0200 @@ -0,0 +1,172 @@ +/** + * DetailCO2meter.cpp is part of bmsapp. + * + * bmsapp is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * bmsapp is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#include "DetailCO2meter.h" +#include "../ui/ui_DetailCO2meter.h" +#include "global.h" +#include "MainWindow.h" + + +/* + * Results are available via MySQL and websockets. Because we initialize using + * MySQL we only use that for the results and up to date status. + * Commands are send via websockets only. + */ + +DetailCO2meter::DetailCO2meter(int id, QWidget *parent) : QDialog(parent), ui(new Ui::DetailCO2meter) +{ + QSqlQuery query; + + qDebug() << "DetailCO2meter record:" << id; + ui->setupUi(this); + this->recno = id; + setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint); + setWindowTitle(tr("BMSapp - Details Carbonation")); + + ui->thermoMeter->setMaximum(40.0); + ui->thermoMeter->setNominal(20.0); + ui->thermoMeter->setCritical(25.0); + ui->thermoMeter->setSuffix(QString("°C")); + + ui->barMeter->setMaximum(6.0); + ui->barMeter->setNominal(1.0); + ui->barMeter->setCritical(3.0); + ui->barMeter->setSuffix(QString(" bar")); + + ui->codePick->addItem("Free - Dummy"); // Will be replaced later + query.exec("SELECT code,name FROM products WHERE stage='1' OR stage='2' OR stage='3' OR stage='4' OR stage='5' OR stage='6' OR stage='7' ORDER BY code"); + while (query.next()) { + ui->codePick->addItem(query.value("code").toString()+" - "+query.value("name").toString()); + } + + connect(ui->codePick, QOverload::of(&QComboBox::currentIndexChanged), this, &DetailCO2meter::code_changed); + connect(parent, SIGNAL(updateCO2meter(QString)), this, SLOT(refreshCO2meter(QString))); + emit refreshTable(); +} + + +void DetailCO2meter::refreshTable() +{ + QSqlQuery query; + + qDebug() << "refreshTable co2meter rec:" << this->recno; + + query.prepare("SELECT * FROM mon_co2meters WHERE record = :recno"); + query.bindValue(":recno", this->recno); + query.exec(); + if (query.next()) { + + const QSignalBlocker blocker1(ui->codePick); + const QSignalBlocker blocker2(ui->modeEdit); + + _node = query.value("node").toString(); + _alias = query.value("alias").toString(); + _uuid = query.value("uuid").toString(); + _beercode = query.value("beercode").toString(); + _beername = query.value("beername").toString(); + + ui->uuidEdit->setText(_uuid); + ui->systemEdit->setText(_node+"/"+_alias); + ui->codePick->setItemText(0, _alias.toUpper()+" - "+_alias); + + if (query.value("online").toInt()) { + ui->statusEdit->setText(tr("Online")); + ui->codeEdit->setText(_beercode+" - "+_beername); + ui->modeEdit->setText(query.value("mode").toString()); + ui->modeEdit->show(); + if (query.value("mode").toString() == "OFF") { + ui->powerLED->setChecked(false); + ui->codePick->show(); + } else { + ui->powerLED->setChecked(true); + ui->codePick->hide(); + } + ui->alarmLED->setChecked((query.value("alarm").toInt() != 0) ? true:false); + + ui->thermoBox->show(); + if (query.value("temperature_state").toString() == "OK") { + ui->thermoMeter->setValue(query.value("temperature").toDouble()); + } + if (query.value("pressure_state").toString() == "OK") { + ui->barMeter->setValue(query.value("pressure_bar").toDouble()); + } + + } else { + /* Offline */ + ui->statusEdit->setText(tr("Offline")); + ui->powerLED->setChecked(false); + ui->alarmLED->setChecked(true); + ui->codePick->hide(); + ui->modeEdit->hide(); + ui->thermoBox->hide(); + ui->logButton->hide(); + } + } + +} + + +DetailCO2meter::~DetailCO2meter() +{ + qDebug() << "DetailCO2meter done"; + delete ui; + emit entry_changed(); +} + + +/* + * Receive signals destined for all co2meters. + * Check if the signal is for us. + */ +void DetailCO2meter::refreshCO2meter(QString data) +{ + if (_node+"/"+_alias == data) { + emit refreshTable(); + } +} + + +void DetailCO2meter::on_quitButton_clicked() +{ + this->close(); + this->setResult(1); +} + + +void DetailCO2meter::code_changed(int val) +{ + QJsonParseError parseError; + QSqlQuery query; + + QString msg = QString("{\"device\":\"co2meters\",\"node\":\"" + _node + "\",\"unit\":\"" + _alias + "\","); + if (val == 0) { + msg.append(QString("\"beeruuid\":\"") + _uuid + "\","); + msg.append(QString("\"beercode\":\"") + _alias.toUpper() + "\","); + msg.append(QString("\"beername\":\"") + _alias + "\"}"); + } else { + query.exec("SELECT code,name,uuid,stage,json_yeasts FROM products WHERE stage='1' OR stage='2' OR stage='3' OR stage='4' OR stage='5' OR stage='6' OR stage='7' ORDER BY code"); + for (int i = 0; i < val; i++) { + query.next(); + } + msg.append(QString("\"beeruuid\":\"") + query.value("uuid").toString() + "\","); + msg.append(QString("\"beercode\":\"") + query.value("code").toString() + "\","); + msg.append(QString("\"beername\":\"") + query.value("name").toString() + "\"}"); + } + + qDebug() << "code_changed" << val << msg; + webSocket->sendTextMessage(msg); +} + diff -r f44bb52f760f -r ee2c8b29f389 src/DetailCO2meter.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/DetailCO2meter.h Sat Jul 02 11:23:13 2022 +0200 @@ -0,0 +1,42 @@ +#ifndef _DETAILCO2METER_H +#define _DETAILCO2METER_H + +#include +#include +#include +#include +#include +#include +#include + + +namespace Ui { +class DetailCO2meter; +} + +class DetailCO2meter : public QDialog +{ + Q_OBJECT + +signals: + void entry_changed(); + +public: + explicit DetailCO2meter(int id, QWidget *parent = 0); + ~DetailCO2meter(); + +private slots: + void on_quitButton_clicked(); + void refreshTable(void); + void code_changed(int val); + +public slots: + void refreshCO2meter(QString); + +private: + Ui::DetailCO2meter *ui; + QString _node, _alias, _uuid, _beercode, _beername; + int recno; +}; + +#endif diff -r f44bb52f760f -r ee2c8b29f389 src/DetailFermenter.cpp --- a/src/DetailFermenter.cpp Fri Jul 01 22:57:31 2022 +0200 +++ b/src/DetailFermenter.cpp Sat Jul 02 11:23:13 2022 +0200 @@ -117,10 +117,11 @@ _node = query.value("node").toString(); _alias = query.value("alias").toString(); + _uuid = query.value("uuid").toString(); _beercode = query.value("beercode").toString(); _beername = query.value("beername").toString(); - ui->uuidEdit->setText(query.value("uuid").toString()); + ui->uuidEdit->setText(_uuid); ui->systemEdit->setText(_node+"/"+_alias); ui->codePick->setItemText(0, _alias.toUpper()+" - "+_alias); @@ -462,7 +463,7 @@ QString msg = QString("{\"device\":\"fermenters\",\"node\":\"" + _node + "\",\"unit\":\"" + _alias + "\","); if (val == 0) { - msg.append(QString("\"beeruuid\":\"66ecccbf-e942-4a35-af49-8b02314561a5\",")); + msg.append(QString("\"beeruuid\":\"") + _uuid + "\","); msg.append(QString("\"beercode\":\"") + _alias.toUpper() + "\","); msg.append(QString("\"beername\":\"") + _alias + "\","); msg.append(QString("\"yeast_lo\":12.0,")); diff -r f44bb52f760f -r ee2c8b29f389 src/DetailFermenter.h --- a/src/DetailFermenter.h Fri Jul 01 22:57:31 2022 +0200 +++ b/src/DetailFermenter.h Sat Jul 02 11:23:13 2022 +0200 @@ -45,7 +45,7 @@ private: Ui::DetailFermenter *ui; - QString _node, _alias, _profile, _beercode, _beername; + QString _node, _alias, _uuid, _profile, _beercode, _beername; int recno; double lo_set = 0, hi_set = 0; bool heat_state = false; diff -r f44bb52f760f -r ee2c8b29f389 src/MonCO2meters.cpp --- a/src/MonCO2meters.cpp Fri Jul 01 22:57:31 2022 +0200 +++ b/src/MonCO2meters.cpp Sat Jul 02 11:23:13 2022 +0200 @@ -15,7 +15,7 @@ * along with this program. If not, see . */ #include "MonCO2meters.h" -#include "EditSupplier.h" +#include "DetailCO2meter.h" #include "MainWindow.h" #include "config.h" @@ -73,16 +73,17 @@ qDebug() << "MonCO2meters reload"; QSqlQuery query("SELECT record,node,alias,online,mode,beercode,beername,temperature,pressure_bar FROM mon_co2meters ORDER BY node,alias"); - const QStringList labels({tr("Node"), tr("Unit"), tr("Status"), tr("Beer"), tr("Temperature"), tr("Pressure"), tr("Details")}); + const QStringList labels({tr("Node"), tr("Unit"), tr("Status"), tr("Mode"), tr("Beer"), tr("Temperature"), tr("Pressure"), tr("Details")}); - this->tableCO2meters->setColumnCount(7); + this->tableCO2meters->setColumnCount(8); this->tableCO2meters->setColumnWidth(0, 150); /* Node */ this->tableCO2meters->setColumnWidth(1, 100); /* Unit */ - this->tableCO2meters->setColumnWidth(2, 100); /* Status */ - this->tableCO2meters->setColumnWidth(3, 390); /* Beer */ - this->tableCO2meters->setColumnWidth(4, 100); /* Temperature */ - this->tableCO2meters->setColumnWidth(5, 100); /* Pressure */ - this->tableCO2meters->setColumnWidth(6, 90); /* Edit button */ + this->tableCO2meters->setColumnWidth(2, 80); /* Status */ + this->tableCO2meters->setColumnWidth(3, 80); /* Mode */ + this->tableCO2meters->setColumnWidth(4, 350); /* Beer */ + this->tableCO2meters->setColumnWidth(5, 90); /* Temperature */ + this->tableCO2meters->setColumnWidth(6, 90); /* Pressure */ + this->tableCO2meters->setColumnWidth(7, 90); /* Edit button */ this->tableCO2meters->setRowCount(query.size()); this->tableCO2meters->setHorizontalHeaderLabels(labels); this->tableCO2meters->verticalHeader()->hide(); @@ -102,23 +103,23 @@ item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); this->tableCO2meters->setItem(i, 2, item); - if (query.value("mode").toString() == "ON") { - item = new QTableWidgetItem(query.value("beercode").toString()+" - "+query.value("beername").toString()); - this->tableCO2meters->setItem(i, 3, item); - } else { - this->tableCO2meters->setItem(i, 3, new QTableWidgetItem(QString(""))); - } + item = new QTableWidgetItem(query.value("mode").toString()); + item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); + this->tableCO2meters->setItem(i, 3, item); + + item = new QTableWidgetItem(query.value("beercode").toString()+" - "+query.value("beername").toString()); + this->tableCO2meters->setItem(i, 4, item); if (query.value("online").toInt()) { item = new QTableWidgetItem(QString("%1°C").arg(query.value("temperature").toDouble(), 4, 'f', 3, '0')); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); - this->tableCO2meters->setItem(i, 4, item); + this->tableCO2meters->setItem(i, 5, item); item = new QTableWidgetItem(QString("%1 bar").arg(query.value("pressure_bar").toDouble(), 3, 'f', 2, '0')); item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); - this->tableCO2meters->setItem(i, 5, item); + this->tableCO2meters->setItem(i, 6, item); } else { - this->tableCO2meters->setItem(i, 4, new QTableWidgetItem(QString(""))); this->tableCO2meters->setItem(i, 5, new QTableWidgetItem(QString(""))); + this->tableCO2meters->setItem(i, 6, new QTableWidgetItem(QString(""))); } /* Add the Edit button */ @@ -131,7 +132,7 @@ pLayout->addWidget(btn_edit); pLayout->setContentsMargins(5, 0, 5, 0); pWidget->setLayout(pLayout); - this->tableCO2meters->setCellWidget(i, 6, pWidget); + this->tableCO2meters->setCellWidget(i, 7, pWidget); query.next(); } emit setStatus(QString(tr("Total items: %1")).arg(query.size())); @@ -145,16 +146,15 @@ { qDebug() << "refreshCO2meters" << data; emit refreshTable(); + emit updateCO2meter(data); } void MonCO2meters::edit(int recno) { -// EditSupplier dialog(recno, this); - /* Signal from editor if a refresh is needed */ -// connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); -// dialog.setModal(true); -// dialog.exec(); + DetailCO2meter dialog(recno, this); + dialog.setModal(true); + dialog.exec(); } diff -r f44bb52f760f -r ee2c8b29f389 src/MonCO2meters.h --- a/src/MonCO2meters.h Fri Jul 01 22:57:31 2022 +0200 +++ b/src/MonCO2meters.h Sat Jul 02 11:23:13 2022 +0200 @@ -23,6 +23,7 @@ signals: void setStatus(QString); + void updateCO2meter(QString); private slots: void on_editButton_clicked(); diff -r f44bb52f760f -r ee2c8b29f389 src/MonFermenters.cpp --- a/src/MonFermenters.cpp Fri Jul 01 22:57:31 2022 +0200 +++ b/src/MonFermenters.cpp Sat Jul 02 11:23:13 2022 +0200 @@ -153,8 +153,6 @@ void MonFermenters::edit(int recno) { DetailFermenter dialog(recno, this); - /* Signal from editor if a refresh is needed */ -// connect(&dialog, SIGNAL(entry_changed()), this, SLOT(refreshTable())); dialog.setModal(true); dialog.exec(); } diff -r f44bb52f760f -r ee2c8b29f389 ui/DetailCO2meter.ui --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/DetailCO2meter.ui Sat Jul 02 11:23:13 2022 +0200 @@ -0,0 +1,496 @@ + + + DetailCO2meter + + + + 0 + 0 + 1024 + 560 + + + + Dialog + + + + + + + + 740 + 0 + 261 + 121 + + + + + + 190 + 70 + 61 + 20 + + + + Power + + + Qt::AlignCenter + + + + + + 130 + 70 + 61 + 20 + + + + Alarm + + + Qt::AlignCenter + + + + + + 210 + 40 + 20 + 20 + + + + Color Led component + + + Led indicator + + + false + + + + 28 + 113 + 216 + + + + + + + 150 + 40 + 20 + 20 + + + + Color Led component + + + Led indicator + + + false + + + + + + + 0 + 0 + 721 + 231 + + + + + + 10 + 60 + 141 + 20 + + + + Uuid: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 90 + 141 + 20 + + + + System and unit: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 150 + 141 + 20 + + + + Code and beer: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + 180 + 141 + 20 + + + + Working mode: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 15 + 20 + 691 + 25 + + + + + 12 + 75 + true + + + + Carbonation Pressure overview + + + Qt::AlignCenter + + + + + + 160 + 60 + 271 + 23 + + + + true + + + true + + + + + + 160 + 90 + 181 + 23 + + + + true + + + true + + + + + + 160 + 120 + 111 + 23 + + + + true + + + + + + 160 + 150 + 381 + 23 + + + + true + + + + + + 560 + 150 + 141 + 23 + + + + QComboBox::AdjustToContentsOnFirstShow + + + + + + 10 + 120 + 141 + 20 + + + + Current status: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 160 + 180 + 111 + 23 + + + + true + + + + + + true + + + + 0 + 240 + 721 + 291 + + + + + + 160 + 260 + 71 + 20 + + + + Temperature + + + Qt::AlignCenter + + + + + + 490 + 260 + 71 + 20 + + + + Pressure + + + Qt::AlignCenter + + + + + + 400 + 10 + 251 + 251 + + + + Shows the beer temperature + + + + 18 + + + + + 14 + + + + 110.000000000000000 + + + + + + 70 + 10 + 251 + 251 + + + + Shows the air temperature + + + false + + + + 18 + + + + + 14 + + + + 110.000000000000000 + + + + + + + 740 + 130 + 261 + 101 + + + + + + + 740 + 240 + 261 + 121 + + + + + + + 740 + 430 + 261 + 101 + + + + + + 90 + 60 + 80 + 23 + + + + + 0 + 0 + + + + Quit + + + + :icons/silk/door_out.png:icons/silk/door_out.png + + + + + + 90 + 20 + 80 + 23 + + + + Log + + + + :/icons/silk/chart_line.png:/icons/silk/chart_line.png + + + + + + + + + + Led + QWidget +
analog/led.h
+
+ + ManoMeter + QWidget +
analog/manometer.h
+
+
+ + quitButton + + + + + +