New select tool: Hold control/command key while selecting an graph area, then release to select

sleepyhead/Graphs/gGraph.cpp

@@ -1054,6 +1054,18 @@ void gGraph::keyPressEvent(QKeyEvent *event)
     //qDebug() << m_title << "Key Pressed.. implement me" << event->key();
 }
 
+void gGraph::keyReleaseEvent(QKeyEvent *event)
+{
+    if (!m_graphview) return;
+
+    if (m_graphview->selectionInProgress() && m_graphview->metaSelect()) {
+        if (!(event->modifiers() & Qt::ControlModifier)) {
+
+        }
+    }
+}
+
+
 void gGraph::ZoomX(double mult, int origin_px)
 {
 

sleepyhead/Graphs/gGraph.h

@@ -305,6 +305,9 @@ class gGraph : public QObject
     //! \brief Key Pressed event
     virtual void keyPressEvent(QKeyEvent *event);
 
+    //! \brief Key Pressed event
+    virtual void keyReleaseEvent(QKeyEvent *event);
+
     //! \brief Change the current selected time boundaries by mult, from origin position origin_px
     void ZoomX(double mult, int origin_px);
 

sleepyhead/Graphs/gGraphView.cpp

@@ -242,13 +242,14 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
 {
     m_shared = shared;
     m_sizer_index = m_graph_index = 0;
-    m_button_down = m_graph_dragging = m_sizer_dragging = false;
+    m_metaselect = m_button_down = m_graph_dragging = m_sizer_dragging = false;
     m_lastypos = m_lastxpos = 0;
     m_horiz_travel = 0;
     m_minx = m_maxx = 0;
     m_day = nullptr;
     m_selected_graph = nullptr;
     m_scrollbar = nullptr;
+    m_point_released = m_point_clicked = QPoint(0,0);
 
     horizScrollTime.start();
     vertScrollTime.start();
@@ -604,7 +605,7 @@ void gGraphView::scrollbarValueChanged(int val)
     }
 }
 
-void gGraphView::selectionTime()
+void gGraphView::updateSelectionTime()
 {
     qint64 xx = m_maxx - m_minx;
     double d = xx / 86400000L;
@@ -1386,6 +1387,7 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
                     m_point_clicked = QPoint(event->x(), event->y());
                     //QMouseEvent e(event->type(),m_point_clicked,event->button(),event->buttons(),event->modifiers());
                     m_button_down = true;
+                    m_metaselect = event->modifiers() && Qt::ControlModifier;
                     m_horiz_travel = 0;
                     m_graph_index = i;
                     m_selected_graph = m_graphs[i];
@@ -1442,6 +1444,8 @@ void gGraphView::mousePressEvent(QMouseEvent *event)
                         m_point_clicked = QPoint(event->x(), event->y());
                         //QMouseEvent e(event->type(),m_point_clicked,event->button(),event->buttons(),event->modifiers());
                         m_button_down = true;
+                        m_metaselect = event->modifiers() && Qt::ControlModifier;
+
                         m_horiz_travel = 0;
                         m_graph_index = i;
                         m_selected_graph = m_graphs[i];
@@ -1554,10 +1558,31 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event)
     // The graph that got the button press gets the release event
     if (m_button_down) {
         m_button_down = false;
-        m_graphs[m_graph_index]->mouseReleaseEvent(event);
+        if (m_metaselect) {
+            m_point_released = event->pos();
+        } else {
+            m_graphs[m_graph_index]->mouseReleaseEvent(event);
+        }
     }
 }
 
+void gGraphView::keyReleaseEvent(QKeyEvent *event)
+{
+    if (m_metaselect) {
+        QMouseEvent event(QEvent::MouseButtonRelease, m_point_released, Qt::LeftButton, Qt::LeftButton, event.modifiers());
+        if (m_graph_index>=0)
+            m_graphs[m_graph_index]->mouseReleaseEvent(&event);
+
+        qDebug() << "Control released";
+    }
+#ifdef BROKEN_OPENGL_BUILD
+        QWidget::keyReleaseEvent(event);
+#else
+        QGLWidget::keyReleaseEvent(event);
+#endif
+}
+
+
 void gGraphView::mouseDoubleClickEvent(QMouseEvent *event)
 {
     mousePressEvent(event); // signal missing.. a qt change might "fix" this if we are not careful.
@@ -1672,7 +1697,8 @@ void gGraphView::wheelEvent(QWheelEvent *event)
                         // What to do when ctrl+wheel is used on the graph title ??
                     } else {
                         // send event to graph..
-                        m_graphs[i]->wheelEvent(event);
+                        if (!m_button_down)
+                            m_graphs[i]->wheelEvent(event);
                     }
                 } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) {
                     // What to do when the wheel is used on the resize handle?
@@ -1859,6 +1885,8 @@ void gGraphView::keyPressEvent(QKeyEvent *event)
 
     //qDebug() << "Keypress??";
 }
+
+
 void gGraphView::setDay(Day *day)
 {
     m_day = day;

sleepyhead/Graphs/gGraphView.h

@@ -241,6 +241,12 @@ class gGraphView
     //! \brief Returns the graph object matching the graph title, nullptr if it does not exist.
     gGraph *findGraphTitle(QString title);
 
+    //! \brief Returns true if control key is down during select operation
+    inline bool metaSelect() const { return m_metaselect; }
+
+    //! \brief Returns true if currently selecting data with mouse
+    inline bool selectionInProgress() const { return m_button_down; }
+
     inline float printScaleX() const { return print_scaleX; }
     inline float printScaleY() const { return print_scaleY; }
     inline void setPrintScaleX(float x) { print_scaleX = x; }
@@ -262,8 +268,8 @@ class gGraphView
     gToolTip *m_tooltip;
     QTimer *timer;
 
-    //! \brief Show the current selection time in the statusbar area
+    //! \brief Updates the current selection time in the statusbar area
-    void selectionTime();
+    void updateSelectionTime();
 
     //! \brief Add the Text information to the Text Drawing Queue (called by gGraphs renderText method)
     void AddTextQue(const QString &text, short x, short y, float angle = 0.0,
@@ -383,6 +389,8 @@ class gGraphView
     virtual void wheelEvent(QWheelEvent *event);
     //! \brief Keyboard event while main gGraphArea has focus.
     virtual void keyPressEvent(QKeyEvent *event);
+    //! \brief Keyboard event while main gGraphArea has focus.
+    virtual void keyReleaseEvent(QKeyEvent *event);
 
     //! \brief Add Graph to drawing queue, mainly for the benefit of multithreaded drawing code
     void queGraph(gGraph *, int originX, int originY, int width, int height);
@@ -414,6 +422,8 @@ class gGraphView
 
     bool m_button_down;
     QPoint m_point_clicked;
+    QPoint m_point_released;
+    bool m_metaselect;
 
     QPoint m_sizer_point;
     int m_horiz_travel;

sleepyhead/mainwindow.cpp

@@ -1948,10 +1948,10 @@ void MainWindow::on_tabWidget_currentChanged(int index)
         qstatus2->setVisible(false);
     } else if (widget == daily) {
         qstatus2->setVisible(true);
-        daily->graphView()->selectionTime();
+        daily->graphView()->updateSelectionTime();
     } else if (widget == overview) {
         qstatus2->setVisible(true);
-        overview->graphView()->selectionTime();
+        overview->graphView()->updateSelectionTime();
     }
 }