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

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

Revision: 979
          http://sourceforge.net/p/jazzplusplus/code/979
Author:   pstieber
Date:     2013-03-18 19:05:00 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
1. Updated to use wxDC& instead of 2xDC*.
2. Changed C-style comments to C++ inline comments.
3. Replaced mpPianoWindow->mpSnapSel->IsSelected() with
mpPianoWindow->AreEventsSelected().  This allowed a change
in the scope of mpSnapSel from public to protected.

Modified Paths:
--------------
    trunk/jazz/src/ControlEdit.cpp
    trunk/jazz/src/ControlEdit.h

Modified: trunk/jazz/src/ControlEdit.cpp
===================================================================
--- trunk/jazz/src/ControlEdit.cpp	2013-03-18 19:02:18 UTC (rev 978)
+++ trunk/jazz/src/ControlEdit.cpp	2013-03-18 19:05:00 UTC (rev 979)
@@ -248,12 +248,11 @@
 }
 
 
-/*void JZCtrlEditBase::Revert(wxButton &but, wxCommandEvent& event)
-{
-  JZControlPanel *panel = (JZControlPanel *)but.GetParent();
-  panel->edit->OnRevert();
-}
-*/
+//void JZCtrlEditBase::Revert(wxButton &but, wxCommandEvent& event)
+//{
+//  JZControlPanel *panel = (JZControlPanel *)but.GetParent();
+//  panel->edit->OnRevert();
+//}
 
 
 void JZCtrlEditBase::OnApply()
@@ -381,7 +380,7 @@
 
 // SN++ Has 3 Modes (bars_state)  0: no Bars, 1,2: draw Bars
 // av: called by JZArrayEdit::OnPaint
-void JZCtrlEditBase::DrawBars(wxDC* dc)
+void JZCtrlEditBase::DrawBars(wxDC& Dc)
 {
   JZBarInfo BarInfo(*mpPianoWindow->GetProject());
   BarInfo.SetClock(from_clock);
@@ -394,14 +393,14 @@
     {
       gclk = BarInfo.GetClock();
       x = mpPianoWindow->Clock2x(gclk-from_clock);
-      edit->DrawBarLine(dc, x - x_off);
+      edit->DrawBarLine(Dc, x - x_off);
       if (bars_state == 2)
       {
         for (ii = 0; ii < BarInfo.GetCountsPerBar(); ++ii)
         {
           gclk += BarInfo.GetTicksPerBar() / BarInfo.GetCountsPerBar();
           x = mpPianoWindow->Clock2x(gclk-from_clock);
-          edit->DrawBarLine(dc, x - x_off);
+          edit->DrawBarLine(Dc, x - x_off);
         }
       }
       BarInfo.Next();
@@ -514,7 +513,7 @@
 {
   // SN++ Falls im PianoWin Events selektiert sind, werden nur diese
   //      Events geaendert
-  if (!mpPianoWindow->mpSnapSel->IsSelected())
+  if (!mpPianoWindow->AreEventsSelected())
   {
     return (pEvent->IsKeyOn() != 0);
   }
@@ -545,7 +544,7 @@
 
   JZEventIterator iter(track);
 
-  if (mpPianoWindow->mpSnapSel->IsSelected())
+  if (mpPianoWindow->AreEventsSelected())
   {
     from_clk = mpPianoWindow->GetFilter()->GetFromClock();
     to_clk   = mpPianoWindow->GetFilter()->GetToClock();
@@ -563,7 +562,7 @@
     // SN++ Falls im PianoWin Events selektiert sind, werden nur diese
     //      Events geaendert
     if (
-      !mpPianoWindow->mpSnapSel->IsSelected() ||
+      !mpPianoWindow->AreEventsSelected() ||
       mpPianoWindow->GetFilter()->IsSelected(pEvent))
     {
 
@@ -615,7 +614,7 @@
   // SN++ Falls im PianoWin Events selektiert sind, werden nur diese
   //      Events geaendert
 
-  if (!mpPianoWindow->mpSnapSel->IsSelected())
+  if (!mpPianoWindow->AreEventsSelected())
   {
     return pEvent->IsKeyPressure() != 0;
   }
@@ -649,7 +648,7 @@
   JZEvent* pEvent;
 
   // SN++ Apply works only if some events are selected !!
-  if (!mpPianoWindow->mpSnapSel->IsSelected())
+  if (!mpPianoWindow->AreEventsSelected())
   {
     OnRevert();
     return;
@@ -660,7 +659,7 @@
 
   JZEventIterator iter(track);
 
-  if (mpPianoWindow->mpSnapSel->IsSelected())
+  if (mpPianoWindow->AreEventsSelected())
   {
     from_clk = mpPianoWindow->GetFilter()->GetFromClock();
     to_clk   = mpPianoWindow->GetFilter()->GetToClock();
@@ -681,7 +680,7 @@
     while (pEvent)
     {
       if (
-        !mpPianoWindow->mpSnapSel->IsSelected() ||
+        !mpPianoWindow->AreEventsSelected() ||
         mpPianoWindow->GetFilter()->IsSelected(pEvent))
       {
         JZKeyPressureEvent* pKeyPressure = pEvent->IsKeyPressure();
@@ -701,7 +700,7 @@
     while (pEvent)
     {
       if (
-        !mpPianoWindow->mpSnapSel->IsSelected() ||
+        !mpPianoWindow->AreEventsSelected() ||
         mpPianoWindow->GetFilter()->IsSelected(pEvent))
       {
         pKeyOn = pEvent->IsKeyOn();
@@ -749,7 +748,7 @@
     while (pEvent)
     {
       if (
-        !mpPianoWindow->mpSnapSel->IsSelected() ||
+        !mpPianoWindow->AreEventsSelected() ||
         mpPianoWindow->GetFilter()->IsSelected(pEvent))
       {
         if (pEvent->IsKeyPressure())

Modified: trunk/jazz/src/ControlEdit.h
===================================================================
--- trunk/jazz/src/ControlEdit.h	2013-03-18 19:02:18 UTC (rev 978)
+++ trunk/jazz/src/ControlEdit.h	2013-03-18 19:05:00 UTC (rev 979)
@@ -140,7 +140,7 @@
 // SN++
     static void Edit(wxButton &but, wxCommandEvent& event);
     static void Bars(wxButton &but, wxCommandEvent& event);
-    void DrawBars(wxDC* dc);
+    void DrawBars(wxDC& Dc);
 };
 
 class JZPitchEdit : public JZCtrlEditBase

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