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

Refactor getRangeString for date line at bottom of Overview page

Browse Source
This commit is contained in:
Seeker4 2019-08-25 07:46:48 -07:00
parent 61142830ae
commit 61270ae83e
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
oscar/Graphs/gGraphView.cpp
View File

@ -1566,7 +1566,7 @@ void gGraphView::paintGL()
} }
QString gGraphView::getRangeString(bool daysOnly) QString gGraphView::getRangeInDaysString()
{ {
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,13 +1574,19 @@ QString gGraphView::getRangeString(bool daysOnly)
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 (std.year() == etd.year())
if (daysOnly) { return st.toString(" d MMM") + " - " + et.toString("d MMM yyyy");
if (std.year() == etd.year()) else
return st.toString(" d MMM") + " - " + et.toString("d MMM yyyy"); return st.toString(" d MMM yyyy") + " - " + et.toString("d MMM yyyy");
else }
return st.toString(" d MMM yyyy") + " - " + et.toString("d MMM yyyy");
} 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 // Format if Begin and End are on different days
if (std != etd) { // further adjust formatting if on different years if (std != etd) { // further adjust formatting if on different years

5
oscar/Graphs/gGraphView.h
View File

@ -511,8 +511,11 @@ class gGraphView
//! \brief The current time the mouse pointer is hovering over //! \brief The current time the mouse pointer is hovering over
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 in days
QString getRangeInDaysString();
//! \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(bool daysOnly = false); QString getRangeString();
Layer * findLayer(gGraph * graph, LayerType type); Layer * findLayer(gGraph * graph, LayerType type);

2
oscar/overview.cpp
View File

@ -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(true)); dateLabel->setText(GraphView->getRangeInDaysString());
} else { } else {
dateLabel->setText(QString(GraphView->emptyText())); dateLabel->setText(QString(GraphView->emptyText()));
} }