Added units of graphs and rounded temperature.

This commit is contained in:
2019-11-14 10:53:42 -05:00
parent f0d203c6d6
commit 003a484fc4
4 changed files with 20 additions and 4 deletions

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