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

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

Revision: 978
          http://sourceforge.net/p/jazzplusplus/code/978
Author:   pstieber
Date:     2013-03-18 19:02:18 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Replaced the JZTrackWindow data members
  int mBarCount;
  int mBarX[eMaxBars];
with
  std::vector<int> mBarX;
This removed the 200 measure limit.

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

Modified: trunk/jazz/src/TrackWindow.cpp
===================================================================
--- trunk/jazz/src/TrackWindow.cpp	2013-03-18 19:00:06 UTC (rev 977)
+++ trunk/jazz/src/TrackWindow.cpp	2013-03-18 19:02:18 UTC (rev 978)
@@ -80,7 +80,7 @@
     mStateWidth(),
     mPatchX(0),
     mPatchWidth(0),
-    mBarCount(0),
+    mBarX(),
     mCounterMode(eCmProgram),
     mNumberMode(eNmMidiChannel),
     mpFixedFont(0),
@@ -637,7 +637,7 @@
 
     BarInfo.SetClock(mFromClock);
 
-    mBarCount = 0;
+    mBarX.clear();
     int Intro = gpProject->GetIntroLength();
     LocalDc.SetPen(*wxGREY_PEN);
     while (1)
@@ -682,12 +682,9 @@
         }
 
         // x-coordinate for MouseAction->Snap()
-        if (mBarCount < eMaxBars)
-        {
-          mBarX[mBarCount++] = x;
-//DEBUG          LocalDc.SetPen(*wxRED_PEN);
-//DEBUG          LocalDc.DrawLine(x, 0, x, mCanvasHeight);
-        }
+        mBarX.push_back(x);
+//DEBUG        LocalDc.SetPen(*wxRED_PEN);
+//DEBUG        LocalDc.DrawLine(x, 0, x, mCanvasHeight);
       }
       BarInfo.Next();
     }
@@ -1176,7 +1173,7 @@
 //-----------------------------------------------------------------------------
 //int JZTrackWindow::x2xBar(int x)
 //{
-//  for (int i = 1; i < mBarCount; ++i)
+//  for (int i = 1; i < mBarX.size(); ++i)
 //  {
 //    if (x < mBarX[i])
 //    {
@@ -1190,7 +1187,7 @@
 //-----------------------------------------------------------------------------
 //int JZTrackWindow::x2wBar(int x)
 //{
-//  for (int i = 1; i < mBarCount; ++i)
+//  for (int i = 1; i < mBarX.size(); ++i)
 //  {
 //    if (x < mBarX[i])
 //    {
@@ -1436,7 +1433,7 @@
 //-----------------------------------------------------------------------------
 void JZTrackWindow::SnapSelectionStart(wxMouseEvent& MouseEvent)
 {
-  mpSnapSel->SetXSnap(mBarCount, mBarX, mScrolledX);
+  mpSnapSel->SetXSnap(mBarX, mScrolledX);
   mpSnapSel->SetYSnap(
     TrackIndex2y(mFromLine),
     mEventsY + mEventsHeight + mScrolledY,

Modified: trunk/jazz/src/TrackWindow.h
===================================================================
--- trunk/jazz/src/TrackWindow.h	2013-03-18 19:00:06 UTC (rev 977)
+++ trunk/jazz/src/TrackWindow.h	2013-03-18 19:02:18 UTC (rev 978)
@@ -55,11 +55,6 @@
 {
   public:
 
-    enum TELimits
-    {
-      eMaxBars = 200
-    };
-
     JZTrackWindow(
       wxFrame* pParent,
       JZProject* pProject,
@@ -169,8 +164,7 @@
     int mStateX, mStateWidth;
     int mPatchX, mPatchWidth;
 
-    int mBarCount;
-    int mBarX[eMaxBars];
+    std::vector<int> mBarX;
 
     TECounterModes mCounterMode;
     TENumberModes mNumberMode;

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