From 32482c6083eb75f5bd6aded78cdc7ad45593b029 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 28 Oct 2011 13:45:31 +1000
Subject: [PATCH] Shift click on summary chart jumps to Daily view with
 selected date

---
 Graphs/gGraphView.cpp    |  5 +++++
 Graphs/gSummaryChart.cpp | 18 ++++++++++++++++++
 Graphs/gSummaryChart.h   |  2 ++
 daily.cpp                |  6 ++++++
 daily.h                  |  1 +
 main.cpp                 |  1 +
 mainwindow.cpp           |  4 ++++
 mainwindow.h             |  4 ++++
 8 files changed, 41 insertions(+)

diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp
index c7c8a1af..5b9d5c19 100644
--- a/Graphs/gGraphView.cpp
+++ b/Graphs/gGraphView.cpp
@@ -1314,6 +1314,10 @@ void gGraph::mouseDoubleClickEvent(QMouseEvent * event)
 }
 void gGraph::keyPressEvent(QKeyEvent * event)
 {
+    bool ok=false;
+    for (QVector<Layer *>::iterator i=m_layers.begin();i!=m_layers.end();i++) {
+        (*i)->keyPressEvent(event);
+    }
     qDebug() << m_title << "Key Pressed.. implement me" << event->key();
 }
 
@@ -2255,6 +2259,7 @@ void gGraphView::keyPressEvent(QKeyEvent * event)
         }
     }
     if (!g) return;
+    g->keyPressEvent(event);
 
     if (event->key()==Qt::Key_Left) {
         double xx=g->max_x-g->min_x;
diff --git a/Graphs/gSummaryChart.cpp b/Graphs/gSummaryChart.cpp
index df03e2f4..0059debe 100644
--- a/Graphs/gSummaryChart.cpp
+++ b/Graphs/gSummaryChart.cpp
@@ -495,12 +495,30 @@ bool SummaryChart::mouseMoveEvent(QMouseEvent *event)
 
 bool SummaryChart::mousePressEvent(QMouseEvent * event)
 {
+    if (event->modifiers() && Qt::ShiftModifier) {
+        //qDebug() << "Jump to daily view?";
+        return true;
+    }
     Q_UNUSED(event)
     return false;
 }
 
+bool SummaryChart::keyPressEvent(QKeyEvent * event)
+{
+    //qDebug() << "Summarychart Keypress";
+}
+
+#include "mainwindow.h"
+extern MainWindow *mainwin;
 bool SummaryChart::mouseReleaseEvent(QMouseEvent * event)
 {
+    if (event->modifiers() && Qt::ShiftModifier) {
+        QDateTime d=QDateTime::fromTime_t(hl_day*86400).toUTC();
+        mainwin->getDaily()->LoadDate(d.date());
+        mainwin->JumpDaily();
+        //qDebug() << "Jump to daily view?" << d;
+        return true;
+    }
     Q_UNUSED(event)
     hl_day=-1;
     graph->timedRedraw(2000);
diff --git a/Graphs/gSummaryChart.h b/Graphs/gSummaryChart.h
index 7457b1ed..301d5b29 100644
--- a/Graphs/gSummaryChart.h
+++ b/Graphs/gSummaryChart.h
@@ -51,6 +51,8 @@ class SummaryChart:public Layer
         gGraph * graph;
         GraphType m_graphtype;
         MachineType m_machinetype;
+
+        virtual bool keyPressEvent(QKeyEvent * event);
         virtual bool mouseMoveEvent(QMouseEvent * event);
         virtual bool mousePressEvent(QMouseEvent * event);
         virtual bool mouseReleaseEvent(QMouseEvent * event);
diff --git a/daily.cpp b/daily.cpp
index 3156e349..9c84d80d 100644
--- a/daily.cpp
+++ b/daily.cpp
@@ -343,6 +343,12 @@ void Daily::UpdateCalendarDay(QDate date)
     ui->calendar->setHorizontalHeaderFormat(QCalendarWidget::ShortDayNames);
 
 }
+void Daily::LoadDate(QDate date)
+{
+    ui->calendar->setSelectedDate(date);
+    on_calendar_selectionChanged();
+}
+
 void Daily::on_calendar_selectionChanged()
 {
     if (previous_date.isValid())
diff --git a/daily.h b/daily.h
index a08feeb1..1f4d83f3 100644
--- a/daily.h
+++ b/daily.h
@@ -41,6 +41,7 @@ public:
     void ResetGraphLayout();
     gGraphView *SharedWidget() { return GraphView; }
     void RedrawGraphs();
+    void LoadDate(QDate date);
 
 private slots:
 
diff --git a/main.cpp b/main.cpp
index e0ecb0cd..0e5905b0 100644
--- a/main.cpp
+++ b/main.cpp
@@ -63,6 +63,7 @@ int main(int argc, char *argv[])
     XInitThreads();
 #endif
     QGL::setPreferredPaintEngine(QPaintEngine::OpenGL);
+
     QApplication a(argc, argv);
     a.setApplicationName("SleepyHead");
     initialize();
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 6ce8e4b9..dc4cbed0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -326,6 +326,10 @@ void MainWindow::on_dailyButton_clicked()
     daily->RedrawGraphs();
     qstatus2->setText("Daily");
 }
+void MainWindow::JumpDaily()
+{
+    on_dailyButton_clicked();
+}
 
 void MainWindow::on_overviewButton_clicked()
 {
diff --git a/mainwindow.h b/mainwindow.h
index 3e602fed..175d05ad 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -45,6 +45,10 @@ public:
     QMenu * CreateMenu(QString title);
     void CheckForUpdates();
     void Notify(QString s);
+    Daily *getDaily() { return daily; }
+    Overview *getOverview() { return overview; }
+    Oximetry *getOximetry() { return oximetry; }
+    void JumpDaily();
 private slots:
     void on_action_Import_Data_triggered();