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

Overview graphs right edge now on correct date in GMT+ timezones

Browse Source 
Changed a lot of Qt::UTC to Qt::LocalTime.  Some risk of having changed ones that should not have been changed.
This commit is contained in:
Guy Scharf 2020-08-09 10:25:45 -07:00
parent a89b5f8cdd
commit 4885abf76a
7 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Htmldocs/release_notes.html
View File

@ -23,6 +23,7 @@
<li>[new] Privacy feature allows suppressing profile info in Statistics page and printed reports.</li>
<li>[new] Add option to print reports in black and white (monochrome).</li>
<li>[new] Hold down the Shift key while selecting a range on a chart to measure the duration without zooming.</li>
<li>[new] Allow second (or more) import on same day for ResMed data.</li>
<li>[fix] Improve support for rare events in 50-series Philips Respironics devices.</li>
<li>[fix] Improve warning on Daily page when settings are missing.</li>
<li>[fix] No longer zoom charts to maximum when clicking on chart with popup menu present.</li>
@ -35,6 +36,7 @@
<li>[fix] Hours used on Welcome and Daily page are now hours of CPAP machine use.</li>
<li>[fix] Popout graphs now limited to desktop height and multiple popout graphs work better.</li>
<li>[fix] Overview tooltips now list chart components in same order as displayed in chart.</li>
<li>[fix] Overview graphs now show last day on charts for timezones near GMT.</li>
</ul>
<p>
<b>Changes and fixes in OSCAR v1.1.1</b>

4
oscar/Graphs/gGraphView.cpp
View File

@ -717,7 +717,7 @@ void gGraphView::dumpInfo()
Day * day = p_profile->GetGoodDay(date, MT_CPAP);
if (day) {
QDateTime dt=QDateTime::fromMSecsSinceEpoch(day->first(), Qt::UTC);
QDateTime dt=QDateTime::fromMSecsSinceEpoch(day->first(), Qt::LocalTime);
mainwin->log(QString("Available Channels for %1").arg(dt.toString("MMM dd yyyy")));
QHash<schema::ChanType, QList<schema::Channel *> > list;
@ -3189,7 +3189,7 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
m_metaselect=false;
qint64 start,end;
getSelectionTimes(start,end);
QDateTime d1 = QDateTime::fromMSecsSinceEpoch(start, Qt::UTC);
QDateTime d1 = QDateTime::fromMSecsSinceEpoch(start, Qt::LocalTime);
mainwin->getDaily()->addBookmark(start, end, QString("Bookmark at %1").arg(d1.time().toString("HH:mm:ss")));
m_graphs[m_graph_index]->cancelSelection();

14
oscar/Graphs/gSessionTimesChart.cpp
View File

@ -89,8 +89,8 @@ void gSummaryChart::SetDay(Day *unused_day)
date = date.addDays(1);
} while (date <= lastday);
m_minx = QDateTime(firstday, QTime(0,0,0), Qt::UTC).toMSecsSinceEpoch();
m_maxx = QDateTime(lastday, QTime(23,59,59), Qt::UTC).toMSecsSinceEpoch();
m_minx = QDateTime(firstday, QTime(0,0,0), Qt::LocalTime).toMSecsSinceEpoch();
m_maxx = QDateTime(lastday, QTime(23,59,59), Qt::LocalTime).toMSecsSinceEpoch();
m_miny = 0;
m_maxy = 20;
@ -148,7 +148,7 @@ bool gSummaryChart::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
graph->roundY(miny, maxy);
QDate date = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC).date();
QDate date = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::LocalTime).date();
int days = ceil(double(m_maxx - m_minx) / 86400000.0);
@ -415,8 +415,8 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion &regio
m_minx = graph.min_x;
m_maxx = graph.max_x;
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC);
QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC);
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::LocalTime);
QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::LocalTime);
QDate date = date2.date();
QDate enddate = enddate2.date();
@ -839,8 +839,8 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
m_minx = graph.min_x;
m_maxx = graph.max_x;
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::UTC);
QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::UTC);
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(m_minx, Qt::LocalTime);
QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(m_maxx, Qt::LocalTime);
QDate date = date2.date();
QDate enddate = enddate2.date();

2
oscar/Graphs/gSummaryChart.cpp
View File

@ -1084,6 +1084,7 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event, gGraph *graph)
int y = event->y() - m_rect.top() + rtop - 15;
//QDateTime dt1=QDateTime::fromTime_t(hl_day*86400).toLocalTime();
QDateTime dt2 = QDateTime::fromTime_t(hl_day * 86400).toUTC();
// QDateTime dt2 = QDateTime::fromTime_t(hl_day * 86400).toLocalTime();
//QTime t1=dt1.time();
//QTime t2=dt2.time();
@ -1281,6 +1282,7 @@ bool SummaryChart::mouseReleaseEvent(QMouseEvent *event, gGraph *graph)
if (hl_day > 0) {
QDateTime d = QDateTime::fromTime_t(hl_day * 86400).toUTC();
// QDateTime d = QDateTime::fromTime_t(hl_day * 86400).toLocalTime();
mainwin->getDaily()->LoadDate(d.date());
mainwin->JumpDaily();
//qDebug() << "Jump to daily view?" << d;

4
oscar/Graphs/gXAxis.cpp
View File

@ -298,7 +298,7 @@ void gXAxis::paint(QPainter &painter, gGraph &w, const QRegion &region)
if (fitmode == 0) {
d = (j / 1000);
QDateTime dt = QDateTime::fromTime_t(d).toUTC();
QDateTime dt = QDateTime::fromTime_t(d).toLocalTime();
QDate date = dt.date();
// SLOW SLOW SLOW!!! On Mac especially, this function is pathetically slow.
//dt.toString("MMM dd");
@ -403,7 +403,7 @@ void gXAxisDay::paint(QPainter &painter, gGraph &graph, const QRegion &region)
minx = graph.min_x;
maxx = graph.max_x;
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(minx, Qt::UTC);
QDateTime date2 = QDateTime::fromMSecsSinceEpoch(minx, Qt::LocalTime);
// QDateTime enddate2 = QDateTime::fromMSecsSinceEpoch(maxx, Qt::UTC);
//qInfo() << "Drawing date axis from " << date2 << " to " << enddate2;

2
oscar/SleepLib/event.cpp
View File

@ -66,7 +66,7 @@ EventDataType EventList::data2(quint32 i)
static QString ts(qint64 msecs)
{
// TODO: make this UTC so that tests don't vary by where they're run
return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate);
return QDateTime::fromMSecsSinceEpoch(msecs).toString(Qt::ISODate); //FIXME? LocalTime?
}
void EventList::AddEvent(qint64 time, EventStoreType data)

2
oscar/overview.cpp
View File

@ -298,7 +298,7 @@ void Overview::on_LineCursorUpdate(double time)
// even though the generated string is displayed to the user
// no time zone conversion is neccessary, so pass UTC
// to prevent QT from automatically converting to local time
QDateTime dt = QDateTime::fromMSecsSinceEpoch(time/*, Qt::UTC*/);
QDateTime dt = QDateTime::fromMSecsSinceEpoch(time, Qt::LocalTime/*, Qt::UTC*/);
QString txt = dt.toString("dd MMM yyyy (dddd)");
dateLabel->setText(txt);
} else dateLabel->setText(QString(GraphView->emptyText()));