# HG changeset patch # User Michiel Broek # Date 1668501745 -3600 # Node ID e06b04ef15799b65023adf9cdc9166392d7fd60f # Parent e6b5510ca1d9df25a282bce6ad3b48b3dec3b29c Small changes to the iSpindel graph. Translated the dutch product edit window title. diff -r e6b5510ca1d9 -r e06b04ef1579 src/ChartiSpindel.cpp --- 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); diff -r e6b5510ca1d9 -r e06b04ef1579 src/ChartiSpindel.h --- 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 diff -r e6b5510ca1d9 -r e06b04ef1579 translations/bmsapp_en.ts --- 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 @@ - + Measured pH: - + Measured SG: @@ -4145,7 +4145,7 @@ - + Delete %1 @@ -4575,67 +4575,67 @@ - + Delete mash step - + Step name: - + Step type: - + Infusion - + Temperature - - Decoction - - - + Decoction + + + + Step start temp: - + Step end temp: - + Step rest time: - + Step ramp time: - + Measured Brix: - + Infusion volume: - + Infusion Temperature: diff -r e6b5510ca1d9 -r e06b04ef1579 translations/bmsapp_nl.ts --- 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 @@ BMSapp - Edit %1 - %2 - + BMSapp - Wijzig %1 - %2 Source 1 @@ -4523,7 +4523,7 @@ - + Delete %1 Verwijder %1 @@ -4972,81 +4972,81 @@ SG - + Delete mash step Verwijder maisch stap - + Step name: Stap naam: - + Step type: Stap type: - + Infusion Infusie - + Temperature Verwarmen - - Decoction - Decoctie - - + Decoction + Decoctie + + + Step start temp: Start temperatuur: - + Step end temp: Eind temperatuur: - + Step rest time: Rust tijd: - + Step ramp time: Verwarm tijd: - + Measured pH: Gemeten pH: - + Measured Brix: Gemeten Brix: - + Measured SG: Gemeten SG: - + Infusion volume: Infusie volume: - + Infusion Temperature: Infusie temperatuur: