chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Date bar on bottom of Daily graph now in local time when no line cursor displayed, and formatting updated

Browse Source
This commit is contained in:
Seeker4 2019-08-09 22:54:00 -07:00
parent a08798cda2
commit 83a01fa203
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
oscar/Graphs/gGraphView.cpp
View File

@ -1554,6 +1554,30 @@ void gGraphView::paintGL()
QString gGraphView::getRangeString() QString gGraphView::getRangeString()
{ {
QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx);
QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx);
QDate std = st.date();
QDate etd = et.date();
// Format if Begin and End are on different days
if (std != etd) {
QString txt = st.toString(" d MMM [ HH:mm:ss") + " - " + et.toString("HH:mm:ss ] d MMM yyyy");
return txt;
}
qint64 diff = m_maxx - m_minx;
QString fmt;
if (diff > 60000) {
fmt = "HH:mm:ss";
} else {
fmt = "HH:mm:ss:zzz";
}
QString txt = st.toString(QObject::tr("d MMM yyyy [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ;
return txt;
/***** WTF is this code trying to do? Replaced by above 8/9/2019
// a note about time zone usage here // a note about time zone usage here
// even though this string will be displayed to the user // even though this string will be displayed to the user
// the graph is drawn using UTC times, so no conversion // the graph is drawn using UTC times, so no conversion
@ -1566,7 +1590,7 @@ QString gGraphView::getRangeString()
qint64 diff = m_maxx - m_minx; qint64 diff = m_maxx - m_minx;
if (diff > 86400000) { if (diff > 86400000) { // 86400000 is one day, in milliseconds
int days = ceil(double(m_maxx-m_minx) / 86400000.0); int days = ceil(double(m_maxx-m_minx) / 86400000.0);
qint64 minx = floor(double(m_minx)/86400000.0); qint64 minx = floor(double(m_minx)/86400000.0);
@ -1584,12 +1608,11 @@ QString gGraphView::getRangeString()
} else { } else {
fmt = "HH:mm:ss:zzz"; fmt = "HH:mm:ss:zzz";
} }
QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC);
QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC);
QString txt = st.toString(QObject::tr("d MMM [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ; QString txt = st.toString(QObject::tr("d MMM [ %1 - %2 ]").arg(fmt).arg(et.toString(fmt))) ;
return txt; return txt;
*/
} }
void gGraphView::leaveEvent(QEvent * event) void gGraphView::leaveEvent(QEvent * event)