diff --git a/oscar/Graphs/gGraphView.cpp b/oscar/Graphs/gGraphView.cpp
index 9ca8074e..cfc3b65c 100644
--- a/oscar/Graphs/gGraphView.cpp
+++ b/oscar/Graphs/gGraphView.cpp
@@ -1554,6 +1554,30 @@ void gGraphView::paintGL()
 
 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
     // even though this string will be displayed to the user
     // the graph is drawn using UTC times, so no conversion
@@ -1566,7 +1590,7 @@ QString gGraphView::getRangeString()
 
     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);
 
         qint64 minx = floor(double(m_minx)/86400000.0);
@@ -1584,12 +1608,11 @@ QString gGraphView::getRangeString()
     } else {
         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))) ;
 
     return txt;
+*/
 }
 
 void gGraphView::leaveEvent(QEvent * event)