Tue, 15 Nov 2022 09:42:25 +0100
Small changes to the iSpindel graph. Translated the dutch product edit window title.
--- a/src/ChartiSpindel.cpp Mon Nov 14 16:05:02 2022 +0100 +++ b/src/ChartiSpindel.cpp Tue Nov 15 09:42:25 2022 +0100 @@ -44,9 +44,9 @@ buttonBox->setStandardButtons(QDialogButtonBox::Ok); buttonBox->addButton(saveButton,QDialogButtonBox::ActionRole); - temperature = new QSplineSeries(); - density = new QSplineSeries(); - battery = new QSplineSeries(); + temperature = new QLineSeries(); + density = new QLineSeries(); + battery = new QLineSeries(); query.prepare("SELECT * FROM log_ispindel WHERE code=:code ORDER BY datetime"); query.bindValue(":code", code); @@ -55,7 +55,7 @@ timestamp = query.value("datetime").toDateTime().toSecsSinceEpoch() * 1000; temperature->append(timestamp, query.value("temperature").toDouble()); density->append(timestamp, query.value("sg").toDouble()); - battery ->append(timestamp, query.value("battery").toDouble()); + battery ->append(timestamp, round(query.value("battery").toDouble() * 500) / 500); } temperature->setName(tr("Temperature")); @@ -107,9 +107,9 @@ chart->addAxis(axisYB, Qt::AlignRight); battery->attachAxis(axisYB); - connect(temperature, &QSplineSeries::hovered, this, &ChartiSpindel::tooltip); - connect(density, &QSplineSeries::hovered, this, &ChartiSpindel::tooltip); - connect(battery, &QSplineSeries::hovered, this, &ChartiSpindel::tooltip); + connect(temperature, &QLineSeries::hovered, this, &ChartiSpindel::tooltip); + connect(density, &QLineSeries::hovered, this, &ChartiSpindel::tooltip); + connect(battery, &QLineSeries::hovered, this, &ChartiSpindel::tooltip); chartView = new QChartView(chart); chartView->setRenderHint(QPainter::Antialiasing);
--- a/src/ChartiSpindel.h Mon Nov 14 16:05:02 2022 +0100 +++ b/src/ChartiSpindel.h Tue Nov 15 09:42:25 2022 +0100 @@ -30,7 +30,7 @@ QChartView *chartView; QChart *chart; Callout *t_tooltip = 0; - QSplineSeries *temperature, *density, *battery; + QLineSeries *temperature, *density, *battery; }; #endif
--- a/translations/bmsapp_en.ts Mon Nov 14 16:05:02 2022 +0100 +++ b/translations/bmsapp_en.ts Tue Nov 15 09:42:25 2022 +0100 @@ -3394,14 +3394,14 @@ <message> <location filename="../ui/EditProduct.ui" line="7849"/> <location filename="../ui/EditProduct.ui" line="8957"/> - <location filename="../src/EditProductTab7.cpp" line="624"/> + <location filename="../src/EditProductTab7.cpp" line="629"/> <source>Measured pH:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7865"/> <location filename="../ui/EditProduct.ui" line="9024"/> - <location filename="../src/EditProductTab7.cpp" line="656"/> + <location filename="../src/EditProductTab7.cpp" line="661"/> <source>Measured SG:</source> <translation type="unfinished"></translation> </message> @@ -4145,7 +4145,7 @@ <location filename="../src/EditProductTab4.cpp" line="358"/> <location filename="../src/EditProductTab5.cpp" line="400"/> <location filename="../src/EditProductTab6.cpp" line="748"/> - <location filename="../src/EditProductTab7.cpp" line="303"/> + <location filename="../src/EditProductTab7.cpp" line="308"/> <location filename="../src/EditProduct.cpp" line="870"/> <source>Delete %1</source> <translation type="unfinished"></translation> @@ -4575,67 +4575,67 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="303"/> + <location filename="../src/EditProductTab7.cpp" line="308"/> <source>Delete mash step</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="553"/> + <location filename="../src/EditProductTab7.cpp" line="558"/> <source>Step name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="563"/> + <location filename="../src/EditProductTab7.cpp" line="568"/> <source>Step type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="569"/> + <location filename="../src/EditProductTab7.cpp" line="574"/> <source>Infusion</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="570"/> + <location filename="../src/EditProductTab7.cpp" line="575"/> <source>Temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="571"/> - <source>Decoction</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../src/EditProductTab7.cpp" line="576"/> + <source>Decoction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/EditProductTab7.cpp" line="581"/> <source>Step start temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="588"/> + <location filename="../src/EditProductTab7.cpp" line="593"/> <source>Step end temp:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="600"/> + <location filename="../src/EditProductTab7.cpp" line="605"/> <source>Step rest time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="612"/> + <location filename="../src/EditProductTab7.cpp" line="617"/> <source>Step ramp time:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="642"/> + <location filename="../src/EditProductTab7.cpp" line="647"/> <source>Measured Brix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="676"/> + <location filename="../src/EditProductTab7.cpp" line="681"/> <source>Infusion volume:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="693"/> + <location filename="../src/EditProductTab7.cpp" line="698"/> <source>Infusion Temperature:</source> <translation type="unfinished"></translation> </message>
--- a/translations/bmsapp_nl.ts Mon Nov 14 16:05:02 2022 +0100 +++ b/translations/bmsapp_nl.ts Tue Nov 15 09:42:25 2022 +0100 @@ -4282,7 +4282,7 @@ <message> <location filename="../src/EditProduct.cpp" line="812"/> <source>BMSapp - Edit %1 - %2</source> - <translation type="unfinished"></translation> + <translation>BMSapp - Wijzig %1 - %2</translation> </message> <message> <source>Source 1</source> @@ -4523,7 +4523,7 @@ <location filename="../src/EditProductTab4.cpp" line="358"/> <location filename="../src/EditProductTab5.cpp" line="400"/> <location filename="../src/EditProductTab6.cpp" line="748"/> - <location filename="../src/EditProductTab7.cpp" line="303"/> + <location filename="../src/EditProductTab7.cpp" line="308"/> <location filename="../src/EditProduct.cpp" line="870"/> <source>Delete %1</source> <translation>Verwijder %1</translation> @@ -4972,81 +4972,81 @@ <translation>SG</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="303"/> + <location filename="../src/EditProductTab7.cpp" line="308"/> <source>Delete mash step</source> <translation>Verwijder maisch stap</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="553"/> + <location filename="../src/EditProductTab7.cpp" line="558"/> <source>Step name:</source> <translation>Stap naam:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="563"/> + <location filename="../src/EditProductTab7.cpp" line="568"/> <source>Step type:</source> <translation>Stap type:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="569"/> + <location filename="../src/EditProductTab7.cpp" line="574"/> <source>Infusion</source> <translation>Infusie</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="570"/> + <location filename="../src/EditProductTab7.cpp" line="575"/> <source>Temperature</source> <translation>Verwarmen</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="571"/> - <source>Decoction</source> - <translation>Decoctie</translation> - </message> - <message> <location filename="../src/EditProductTab7.cpp" line="576"/> + <source>Decoction</source> + <translation>Decoctie</translation> + </message> + <message> + <location filename="../src/EditProductTab7.cpp" line="581"/> <source>Step start temp:</source> <translation>Start temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="588"/> + <location filename="../src/EditProductTab7.cpp" line="593"/> <source>Step end temp:</source> <translation>Eind temperatuur:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="600"/> + <location filename="../src/EditProductTab7.cpp" line="605"/> <source>Step rest time:</source> <translation>Rust tijd:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="612"/> + <location filename="../src/EditProductTab7.cpp" line="617"/> <source>Step ramp time:</source> <translation>Verwarm tijd:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7849"/> <location filename="../ui/EditProduct.ui" line="8957"/> - <location filename="../src/EditProductTab7.cpp" line="624"/> + <location filename="../src/EditProductTab7.cpp" line="629"/> <source>Measured pH:</source> <translation>Gemeten pH:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="642"/> + <location filename="../src/EditProductTab7.cpp" line="647"/> <source>Measured Brix:</source> <translation>Gemeten Brix:</translation> </message> <message> <location filename="../ui/EditProduct.ui" line="7865"/> <location filename="../ui/EditProduct.ui" line="9024"/> - <location filename="../src/EditProductTab7.cpp" line="656"/> + <location filename="../src/EditProductTab7.cpp" line="661"/> <source>Measured SG:</source> <translation>Gemeten SG:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="676"/> + <location filename="../src/EditProductTab7.cpp" line="681"/> <source>Infusion volume:</source> <translation>Infusie volume:</translation> </message> <message> - <location filename="../src/EditProductTab7.cpp" line="693"/> + <location filename="../src/EditProductTab7.cpp" line="698"/> <source>Infusion Temperature:</source> <translation>Infusie temperatuur:</translation> </message>