comparison src/MainWindow.cpp @ 296:d4530fab80bd

very simple, probably too simple implementation of select by move note

     m_deleteSelectedAction(0),
     m_ffwdAction(0),
     m_rwdAction(0),
     m_intelligentActionOn(true), //GF: !!! temporary
     m_activityLog(new ActivityLog()),
-    m_keyReference(new KeyReference())
+    m_keyReference(new KeyReference()),
+    m_selectionAnchor(0)
 {
     setWindowTitle(QApplication::applicationName());
 
 #ifdef Q_OS_MAC
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 2, 0))

 
 void
 MainWindow::moveOneNoteRight()
 {
     // cerr << "MainWindow::moveOneNoteRight" << endl;
-    moveByOneNote(true);
+    moveByOneNote(true, false);
 }
 
 void
 MainWindow::moveOneNoteLeft()
 {
     // cerr << "MainWindow::moveOneNoteLeft" << endl;
-    moveByOneNote(false);
+    moveByOneNote(false, false);
 }
 
 void
 MainWindow::selectOneNoteRight()
 {
-    int left = m_viewManager->getPlaybackFrame();
-    moveByOneNote(false);
-    int right = m_viewManager->getPlaybackFrame();    
+    moveByOneNote(true, true);
 }
 
 void
 MainWindow::selectOneNoteLeft()
 {
-    int right = m_viewManager->getPlaybackFrame();
-    moveByOneNote(false);
-    int left = m_viewManager->getPlaybackFrame();
-}
-
-
-void
-MainWindow::moveByOneNote(bool right)
+    moveByOneNote(false, true);
+}
+
+
+void
+MainWindow::moveByOneNote(bool right, bool doSelect)
 {
     // cerr << "MainWindow::moveByOneNote" << endl;
     int frame = m_viewManager->getPlaybackFrame();
     
     Pane *p = m_analyser->getPane();
+
+    if (!doSelect) {
+        m_selectionAnchor = frame;
+    }
 
     Layer *layer = m_analyser->getLayer(Analyser::Notes);
     if (!layer) return;
 
     FlexiNoteModel *model = qobject_cast<FlexiNoteModel *>(layer->getModel());

     } else {
         if (i2 != snapFrames.begin()) i2--;
     }
     frame = *i2;
     m_viewManager->setPlaybackFrame(frame);
+    if (doSelect) {
+        Selection sel;
+        if (frame > m_selectionAnchor) {
+            sel = Selection(m_selectionAnchor, frame);
+        } else {
+            sel = Selection(frame, m_selectionAnchor);
+        }
+        m_viewManager->setSelection(sel);
+    }
 }
 
 void
 MainWindow::toolNavigateSelected()
 {