Make 100% zoom work properly on Overview page.

oscar/Graphs/gGraphView.cpp

@@ -36,7 +36,7 @@
 #include "Graphs/gYAxis.h"
 #include "Graphs/gFlagsLine.h"
 #include "SleepLib/profiles.h"
-
+#include "overview.h"
 
 extern MainWindow *mainwin;
 
@@ -294,7 +294,7 @@ gGraph *gGraphView::popGraph()
     return g;
 }
 
-gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
+gGraphView::gGraphView(QWidget *parent, gGraphView *shared, QWidget *caller)
 #ifdef BROKEN_OPENGL_BUILD
     : QWidget(parent),
 #elif QT_VERSION < QT_VERSION_CHECK(5,4,0)
@@ -304,6 +304,7 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
 #endif
       m_offsetY(0), m_offsetX(0), m_scaleY(0.0), m_scrollbar(nullptr)
 {
+    this->caller = caller;
 
 //    this->grabGesture(Qt::SwipeGesture);
 //    this->grabGesture(Qt::PanGesture);
@@ -388,9 +389,11 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
     snap_action = context_menu->addAction(QString(), this, SLOT(onSnapshotGraphToggle()));
     context_menu->addSeparator();
 
-
     zoom100_action = context_menu->addAction(tr("100% zoom level"), this, SLOT(resetZoom()));
-    zoom100_action->setToolTip(tr("Restore X-axis zoom too 100% to view entire days data."));
+    if (caller)
+        zoom100_action->setToolTip(tr("Restore X-axis zoom to 100% to view entire selected period."));
+    else
+        zoom100_action->setToolTip(tr("Restore X-axis zoom to 100% to view entire day's data."));
 
     QAction * action = context_menu->addAction(tr("Reset Graph Layout"), this, SLOT(resetLayout()));
     action->setToolTip(tr("Resets all graphs to a uniform height and default order."));
@@ -1067,6 +1070,16 @@ void gGraphView::GetRXBounds(qint64 &st, qint64 &et)
     }
 }
 
+void gGraphView::resetZoom() {
+    Overview *overvw = qobject_cast<Overview*>(caller);
+    if (overvw) {
+        overvw->on_zoomButton_clicked();
+        return;
+    }
+
+    ResetBounds(true);
+}
+
 void gGraphView::ResetBounds(bool refresh) //short group)
 {
     if (m_graphs.size() == 0) return;

oscar/Graphs/gGraphView.h

@@ -320,7 +320,7 @@ class gGraphView
         But this must not be shared with Printers snapshot gGraphView object,
         or it will lead to display/font corruption
         */
-    explicit gGraphView(QWidget *parent = 0, gGraphView *shared = 0);
+    explicit gGraphView(QWidget *parent = 0, gGraphView *shared = 0, QWidget *caller = 0);
     virtual ~gGraphView();
     void closeEvent(QCloseEvent * event) override;
 
@@ -689,6 +689,7 @@ class gGraphView
     QAction * snap_action;
 
     QAction * zoom100_action;
+    QWidget * caller;
 
     bool m_showAuthorMessage;
 
@@ -710,9 +711,7 @@ class gGraphView
     //! \brief Resets all contained graphs to have a uniform height.
     void resetLayout();
 
-    void resetZoom() {
+    void resetZoom();
-        ResetBounds(true);
-    }
 
     void dataChanged();
 

oscar/overview.cpp

@@ -83,7 +83,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
     border->setAutoFillBackground(false);
 
     // Create the GraphView Object
-    GraphView = new gGraphView(ui->graphArea, m_shared);
+    GraphView = new gGraphView(ui->graphArea, m_shared, this);
     GraphView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 
     GraphView->setEmptyText(STR_Empty_NoData);
@@ -404,7 +404,7 @@ void Overview::on_dateStart_dateChanged(const QDate &date)
     ui->dateEnd->setMinimumDate(date);
 }
 
-void Overview::on_toolButton_clicked()
+void Overview::on_zoomButton_clicked()
 {
     qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0), Qt::UTC).toTime_t()) * 1000L;
     qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 00, 0), Qt::UTC).toTime_t()) * 1000L;
@@ -480,7 +480,7 @@ void Overview::setRange(QDate start, QDate end)
     ui->dateEnd->setDate(end);
     ui->dateEnd->blockSignals(false);
     ui->dateStart->blockSignals(false);
-    this->on_toolButton_clicked();
+    this->on_zoomButton_clicked();
     updateGraphCombo();
 }
 

oscar/overview.h

@@ -87,6 +87,9 @@ class Overview : public QWidget
   public slots:
     void onRebuildGraphs() { RebuildGraphs(true); }
 
+    //! \brief Resets view to currently shown start & end dates
+    void on_zoomButton_clicked();
+
   private slots:
     void updateGraphCombo();
 
@@ -102,9 +105,6 @@ class Overview : public QWidget
     //! \brief Updates the calendar highlighting when changing to a new month
     void dateEnd_currentPageChanged(int year, int month);
 
-    //! \brief Resets view to currently shown start & end dates
-    void on_toolButton_clicked();
-
     //void on_printDailyButton_clicked();
 
     void on_rangeCombo_activated(int index);

oscar/overview.ui

@@ -171,7 +171,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QToolButton" name="toolButton">
+       <widget class="QToolButton" name="zoomButton">
         <property name="toolTip">
          <string>Reset view to selected date range</string>
         </property>