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

Correct date problems on bottom of Overview page. Remove UTC conversions. Improve date formatting for 1 day and more than a year.

Browse Source
This commit is contained in:
Seeker4 2019-08-24 17:47:22 -07:00
parent 9010ca5ae4
commit 61142830ae
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
oscar/Graphs/gGraphView.cpp
View File

@ -1566,7 +1566,7 @@ void gGraphView::paintGL()
} }
QString gGraphView::getRangeString() QString gGraphView::getRangeString(bool daysOnly)
{ {
QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx); QDateTime st = QDateTime::fromMSecsSinceEpoch(m_minx);
QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx); QDateTime et = QDateTime::fromMSecsSinceEpoch(m_maxx);
@ -1574,10 +1574,20 @@ QString gGraphView::getRangeString()
QDate std = st.date(); QDate std = st.date();
QDate etd = et.date(); QDate etd = et.date();
// If just a day range wanted (as used by Overview)
if (daysOnly) {
if (std.year() == etd.year())
return st.toString(" d MMM") + " - " + et.toString("d MMM yyyy");
else
return st.toString(" d MMM yyyy") + " - " + et.toString("d MMM yyyy");
}
// Format if Begin and End are on different days // Format if Begin and End are on different days
if (std != etd) { if (std != etd) { // further adjust formatting if on different years
QString txt = st.toString(" d MMM [ HH:mm:ss") + " - " + et.toString("HH:mm:ss ] d MMM yyyy"); if (std.year() == etd.year())
return txt; return st.toString(" d MMM [ HH:mm:ss") + " - " + et.toString("HH:mm:ss ] d MMM yyyy");
else
return st.toString(" d MMM yyyy [ HH:mm:ss") + " - " + et.toString("HH:mm:ss ] d MMM yyyy");
} }
// Range is within one (local) day // Range is within one (local) day

2
oscar/Graphs/gGraphView.h
View File

@ -512,7 +512,7 @@ class gGraphView
inline double currentTime() { return m_currenttime; } inline double currentTime() { return m_currenttime; }
//! \brief Returns a context formatted text string with the currently selected time range //! \brief Returns a context formatted text string with the currently selected time range
QString getRangeString(); QString getRangeString(bool daysOnly = false);
Layer * findLayer(gGraph * graph, LayerType type); Layer * findLayer(gGraph * graph, LayerType type);

16
oscar/overview.cpp
View File

@ -291,7 +291,7 @@ void Overview::on_LineCursorUpdate(double time)
// even though the generated string is displayed to the user // even though the generated string is displayed to the user
// no time zone conversion is neccessary, so pass UTC // no time zone conversion is neccessary, so pass UTC
// to prevent QT from automatically converting to local time // to prevent QT from automatically converting to local time
QDateTime dt = QDateTime::fromMSecsSinceEpoch(time, Qt::UTC); QDateTime dt = QDateTime::fromMSecsSinceEpoch(time/*, Qt::UTC*/);
QString txt = dt.toString("dd MMM yyyy (dddd)"); QString txt = dt.toString("dd MMM yyyy (dddd)");
dateLabel->setText(txt); dateLabel->setText(txt);
} else dateLabel->setText(QString(GraphView->emptyText())); } else dateLabel->setText(QString(GraphView->emptyText()));
@ -300,7 +300,7 @@ void Overview::on_LineCursorUpdate(double time)
void Overview::on_RangeUpdate(double minx, double /* maxx */) void Overview::on_RangeUpdate(double minx, double /* maxx */)
{ {
if (minx > 1) { if (minx > 1) {
dateLabel->setText(GraphView->getRangeString()); dateLabel->setText(GraphView->getRangeString(true));
} else { } else {
dateLabel->setText(QString(GraphView->emptyText())); dateLabel->setText(QString(GraphView->emptyText()));
} }
@ -419,16 +419,16 @@ void Overview::dateEnd_currentPageChanged(int year, int month)
void Overview::on_dateEnd_dateChanged(const QDate &date) void Overview::on_dateEnd_dateChanged(const QDate &date)
{ {
qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0), Qt::UTC).toTime_t()) * 1000L; qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
qint64 d2 = qint64(QDateTime(date, QTime(23, 0, 0), Qt::UTC).toTime_t()) * 1000L; qint64 d2 = qint64(QDateTime(date, QTime(23, 0, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
GraphView->SetXBounds(d1, d2); GraphView->SetXBounds(d1, d2);
ui->dateStart->setMaximumDate(date); ui->dateStart->setMaximumDate(date);
} }
void Overview::on_dateStart_dateChanged(const QDate &date) void Overview::on_dateStart_dateChanged(const QDate &date)
{ {
qint64 d1 = qint64(QDateTime(date, QTime(0, 10, 0), Qt::UTC).toTime_t()) * 1000L; qint64 d1 = qint64(QDateTime(date, QTime(0, 10, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 0, 0), Qt::UTC).toTime_t()) * 1000L; qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 0, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
GraphView->SetXBounds(d1, d2); GraphView->SetXBounds(d1, d2);
ui->dateEnd->setMinimumDate(date); ui->dateEnd->setMinimumDate(date);
} }
@ -436,8 +436,8 @@ void Overview::on_dateStart_dateChanged(const QDate &date)
// Zoom to 100% button clicked or called back from 100% zoom in popup menu // Zoom to 100% button clicked or called back from 100% zoom in popup menu
void Overview::on_zoomButton_clicked() void Overview::on_zoomButton_clicked()
{ {
qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0), Qt::UTC).toTime_t()) * 1000L; // GTS why UTC? qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0)/*, Qt::UTC*/).toTime_t()) * 1000L; // GTS why UTC?
qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 00, 0), Qt::UTC).toTime_t()) * 1000L; // Interesting: start date set to 10 min after midnight, ending at 11 pm qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 0, 0)/*, Qt::UTC*/).toTime_t()) * 1000L; // Interesting: start date set to 10 min after midnight, ending at 11 pm
GraphView->SetXBounds(d1, d2); GraphView->SetXBounds(d1, d2);
} }