eyecreate/qiflora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added units of graphs and rounded temperature.

Browse Source
This commit is contained in:
Kevin Whitaker
2019-11-14 10:53:42 -05:00
parent f0d203c6d6
commit 003a484fc4
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
packaging/mobile_window.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

10
packaging/org.eyecreate.qiflora.appdata.xml
View File

@@ -15,10 +15,18 @@
</description>
<screenshots>
<screenshot type="default">
<image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1/packaging/main_window.png</image>
<image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.1/packaging/main_window.png</image>
</screenshot>
<screenshot>
<image type="source">https://git.eyecreate.org/eyecreate/qiflora/raw/v1.1.1/packaging/mobile_window.png</image>
</screenshot>
</screenshots>
<releases>
<release version="1.1.1" date="2019-11-14" type="stable">
<description>
<p>Cleaned up graph markings and temperature rounding.</p>
</description>
</release>
<release version="1.1" date="2019-11-13" type="stable">
<description>
<p>This release adds history graph for the last 48 hours.</p>

7
src/contents/ui/main.qml
View File

@@ -73,6 +73,7 @@ Kirigami.ApplicationWindow {
title: "Temperature"
icon: "filename-bpm-amarok"
lineColor: "red"
units: "&deg;C"
yMin: -20
yMax: 40
modelCol: 1
@@ -82,6 +83,7 @@ Kirigami.ApplicationWindow {
title: "Moisture"
icon: "colors-chromablue"
lineColor: "cyan"
units: "%"
yMin: 0
yMax: 75
modelCol: 3
@@ -91,6 +93,7 @@ Kirigami.ApplicationWindow {
title: "Conductivity"
icon: "quickopen"
lineColor: "gold"
units: "&#181;S/cm"
yMin: 0
yMax: 6000
modelCol: 4
@@ -100,6 +103,7 @@ Kirigami.ApplicationWindow {
title: "Brightness"
icon: "contrast"
lineColor: "orange"
units: "lux"
yMin: 0
yMax: 30000
modelCol: 2
@@ -127,7 +131,7 @@ Kirigami.ApplicationWindow {
Layouts.Layout.alignment: Qt.AlignCenter
level: 3
text: {
if(model.chartType == "temperature") qiflora.temperature + "°C\n" + (qiflora.temperature*1.8+32) + "°F"
if(model.chartType == "temperature") Math.round(qiflora.temperature*10)/10 + "°C\n" + (Math.round((qiflora.temperature*1.8+32)*10)/10) + "°F"
else if(model.chartType == "moisture") qiflora.moisture + "%"
else if(model.chartType == "conductivity") qiflora.conduction + " µS/cm"
else if(model.chartType == "brightness") qiflora.brightness + " lux"
@@ -163,6 +167,7 @@ Kirigami.ApplicationWindow {
}
axisY: Charts.ValueAxis {
id: valueAx
labelFormat: "%d "+units
labelsColor: Kirigami.Theme.textColor
min: yMin
max: yMax

7
src/miflora/florahistory.cpp
View File

@@ -17,6 +17,7 @@
#include "florahistory.h"
#include <QDebug>
#include <cmath>
QVariant FloraHistory::data(const QModelIndex& index, int role) const
{
@@ -24,13 +25,15 @@ QVariant FloraHistory::data(const QModelIndex& index, int role) const
if(index.column() == 0) {
return QVariant(tableData[index.row()].time);
} else if(index.column() == 1) {
return QVariant(tableData[index.row()].temperature);
return QVariant(std::round(tableData[index.row()].temperature*10)/10); //temp in C
} else if(index.column() == 2) {
return QVariant(tableData[index.row()].brightness);
} else if(index.column() == 3) {
return QVariant(tableData[index.row()].moisture);
} else if(index.column() == 4) {
return QVariant(tableData[index.row()].conductivity);
} else if(index.column() == 5) {
return QVariant((std::round((tableData[index.row()].temperature*1.8+32)*10)/10)); //temp in F
} else {
return QVariant();
}
@@ -41,7 +44,7 @@ QVariant FloraHistory::data(const QModelIndex& index, int role) const
int FloraHistory::columnCount(const QModelIndex& parent) const
{
return 5;
return 6;
}
int FloraHistory::rowCount(const QModelIndex& parent) const