SF.net SVN: jazzplusplus:[719] trunk/jazz/src

[<pst...@us...>]

Revision: 719
          http://jazzplusplus.svn.sourceforge.net/jazzplusplus/?rev=719&view=rev
Author:   pstieber
Date:     2009-05-16 04:16:22 +0000 (Sat, 16 May 2009)

Log Message:
-----------
Fixed snap selection so recording works.

Modified Paths:
--------------
    trunk/jazz/src/EventWindow.cpp
    trunk/jazz/src/EventWindow.h
    trunk/jazz/src/PianoWindow.cpp
    trunk/jazz/src/PianoWindow.h
    trunk/jazz/src/TrackWindow.cpp
    trunk/jazz/src/TrackWindow.h

Modified: trunk/jazz/src/EventWindow.cpp
===================================================================
--- trunk/jazz/src/EventWindow.cpp	2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/EventWindow.cpp	2009-05-16 04:16:22 UTC (rev 719)
@@ -536,13 +536,13 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZEventWindow::SnapSelStart(wxMouseEvent& MouseEvent)
+void JZEventWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
 {
 }
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZEventWindow::SnapSelStop(wxMouseEvent& MouseEvent)
+void JZEventWindow::SnapSelectionStop(wxMouseEvent& MouseEvent)
 {
 }
 
@@ -563,7 +563,7 @@
       if (MouseEvent.LeftDown())
       {
         {
-          SnapSelStart(MouseEvent);
+          SnapSelectionStart(MouseEvent);
 
 //          if (mpSnapSel->IsSelected())
 //          {
@@ -587,7 +587,7 @@
 
       if (mpMouseAction == mpSnapSel)
       {
-        SnapSelStop(MouseEvent);
+        SnapSelectionStop(MouseEvent);
 
         // inefficient, invalidate rect first instead.
         Refresh();

Modified: trunk/jazz/src/EventWindow.h
===================================================================
--- trunk/jazz/src/EventWindow.h	2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/EventWindow.h	2009-05-16 04:16:22 UTC (rev 719)
@@ -102,9 +102,9 @@
 
     int SnapClock(int Clock, bool Up);
 
-    virtual void SnapSelStart(wxMouseEvent& MouseEvent);
+    virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
 
-    virtual void SnapSelStop(wxMouseEvent& MouseEvent);
+    virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
 
     void DrawVerticalLine(wxDC& Dc, int XPosition) const;
 

Modified: trunk/jazz/src/PianoWindow.cpp
===================================================================
--- trunk/jazz/src/PianoWindow.cpp	2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/PianoWindow.cpp	2009-05-16 04:16:22 UTC (rev 719)
@@ -1827,7 +1827,7 @@
 //-----------------------------------------------------------------------------
 // Snapper
 //-----------------------------------------------------------------------------
-void JZPianoWindow::SnapSelStop(wxMouseEvent& MouseEvent)
+void JZPianoWindow::SnapSelectionStop(wxMouseEvent& MouseEvent)
 {
   if (mpSnapSel->IsSelected())
   {
@@ -1885,7 +1885,7 @@
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
-void JZPianoWindow::SnapSelStart(wxMouseEvent& MouseEvent)
+void JZPianoWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
 {
   mSnapCount = 0;
   int clk = SnapClock(mFromClock, false);
@@ -2020,7 +2020,7 @@
       if (MouseEvent.LeftDown())
       {
         {
-          SnapSelStart(MouseEvent);
+          SnapSelectionStart(MouseEvent);
 
 //          if (mpSnapSel->IsSelected())
 //          {
@@ -2044,7 +2044,7 @@
 
       if (mpMouseAction == mpSnapSel)
       {
-        SnapSelStop(MouseEvent);
+        SnapSelectionStop(MouseEvent);
 
         // inefficient, invalidate rect first instead.
         Refresh();

Modified: trunk/jazz/src/PianoWindow.h
===================================================================
--- trunk/jazz/src/PianoWindow.h	2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/PianoWindow.h	2009-05-16 04:16:22 UTC (rev 719)
@@ -113,10 +113,6 @@
 
     int SnapClock(int Clock, bool Up = false);
 
-    virtual void SnapSelStart(wxMouseEvent& MouseEvent);
-
-    virtual void SnapSelStop(wxMouseEvent& MouseEvent);
-
     int SnapClocks();
 
     void SetSnapDenom(int Value);
@@ -187,6 +183,12 @@
 
     void ActivateSequenceLengthDialog();
 
+  protected:
+
+    virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
+
+    virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
+
   private:
 
     JZPianoFrame* mpPianoFrame;

Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp	2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/TrackWindow.cpp	2009-05-16 04:16:22 UTC (rev 719)
@@ -282,7 +282,7 @@
       mEventsY,
       mEventsWidth,
       mEventsHeight);
-    SnapSelStop(MouseEvent);
+    SnapSelectionStop(MouseEvent);
   }
   else if (
     Point.x >= mEventsX && Point.x < mEventsX + mEventsWidth &&

Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h	2009-03-13 21:06:09 UTC (rev 718)
+++ trunk/jazz/src/TrackWindow.h	2009-05-16 04:16:22 UTC (rev 719)
@@ -85,10 +85,10 @@
 
   protected:
 
-    virtual void SnapSelStop(wxMouseEvent& MouseEvent)
-    {
-    }
+    virtual void SnapSelectionStart(wxMouseEvent& MouseEvent);
 
+    virtual void SnapSelectionStop(wxMouseEvent& MouseEvent);
+
   private:
 
     void OnSize(wxSizeEvent& Event);
@@ -146,10 +146,6 @@
 
     const char* GetNumberString() const;
 
-    void SnapSelectionStart(wxMouseEvent& MouseEvent);
-
-    void SnapSelectionStop(wxMouseEvent& MouseEvent);
-
     int x2xBar(int x);
 
     int x2wBar(int x);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.