Commit `dfbd736`

Nick committed on Jun 27, 2020

Implement row numbering in tracker

commit dfbd736f292f68421a892f9ee8346a2157fa3698 parent 8371520

9 changed files +52−22

ModifiedSound/sound.pas +1−1

`@@ -266,7 +266,7 @@ begin`
266	`SDL_UnlockAudioDevice(PlayStream);`	266	`SDL_UnlockAudioDevice(PlayStream);`
267	`end;`	267	`end;`
268		268
269	`procedure AudioCallback(userdata: Pointer; stream: PUInt8; len: Integer)cdecl;`	269	`procedure AudioCallback(userdata: Pointer; stream: PUInt8; len: Integer) cdecl;`
270	`begin`	270	`begin`
271	`sndBuffer := PSingle(Stream);`	271	`sndBuffer := PSingle(Stream);`
272	`sndBytesWritten := 0;`	272	`sndBytesWritten := 0;`

Modifiedtracker.lfm +26−6

 object frmTracker: TfrmTracker
-  Left = 411
+  Left = 247
   Height = 806
-  Top = 117
+  Top = 197
   Width = 1270
   AllowDropFiles = True
   Caption = 'hUGETracker'
             DragReorder = False
             Images = ImageList2
             Sections = <
+              item
+                Alignment = taLeftJustify
+                Width = 32
+                Visible = True
+              end
               item
                 Alignment = taCenter
                 ImageIndex = 1
             Height = 614
             Top = 31
             Width = 838
-            HorzScrollBar.Increment = 1
+            HorzScrollBar.Increment = 3
-            HorzScrollBar.Page = 1
+            HorzScrollBar.Page = 32
             HorzScrollBar.Smooth = True
             HorzScrollBar.Tracking = True
-            VertScrollBar.Increment = 1
+            VertScrollBar.Increment = 5
-            VertScrollBar.Page = 1
+            VertScrollBar.Page = 50
             VertScrollBar.Smooth = True
             VertScrollBar.Tracking = True
             Align = alClient
             BorderStyle = bsNone
+            ClientHeight = 614
+            ClientWidth = 838
             ParentFont = False
             TabOrder = 1
             OnMouseWheelDown = ScrollBox1MouseWheelDown
             OnMouseWheelUp = ScrollBox1MouseWheelUp
+            object RowNumberStringGrid: TStringGrid
+              Left = 0
+              Height = 614
+              Top = 0
+              Width = 32
+              Align = alLeft
+              BorderStyle = bsNone
+              ColCount = 1
+              DefaultColWidth = 32
+              RowCount = 64
+              ScrollBars = ssNone
+              TabOrder = 0
+            end
           end
         end
         object OrderEditStringGrid: TStringGrid

Modifiedtracker.pas +25−15

     MenuItem53: TMenuItem;
     NoiseVisualizer: TPaintBox;
     MODOpenDialog: TOpenDialog;
+    RowNumberStringGrid: TStringGrid;
     WaveEditPopup: TPopupMenu;
     SynAnySyn1: TSynAnySyn;
     WavSaveDialog: TSaveDialog;
 procedure TfrmTracker.OnTrackerGridResize(Sender: TObject);
 var
-  Section: TCollectionItem;
+  I: Integer;
 begin
   // Fix the size of the channel headers
-  for Section in HeaderControl1.Sections do
+  for I := 1 to HeaderControl1.Sections.Count-1 do
-    (Section as THeaderSection).Width := TrackerGrid.ColumnWidth;
+    HeaderControl1.Sections.Items[I].Width := TrackerGrid.ColumnWidth;
 end;
 procedure TfrmTracker.OnTrackerGridCursorOutOfBounds;
     LockPlayback;
     GetROMReady('hUGEDriver/preview.gb');
     PokeSymbol(SYM_TICKS_PER_ROW, Song.TicksPerRow);
-    for I := 0 to 3 do
+    for I := 1 to 4 do
-      snd[I+1].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;
+      snd[I].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;
     Result := True;
   end
 procedure TfrmTracker.RecreateTrackerGrid;
 var
-  Section: TCollectionItem;
+  I: Integer;
 begin
   if Assigned(TrackerGrid) then TrackerGrid.Free;
   TrackerGrid := TTrackerGrid.Create(Self, ScrollBox1, Song.Patterns);
   TrackerGrid.OnResize:=@OnTrackerGridResize;
   TrackerGrid.OnCursorOutOfBounds:=@OnTrackerGridCursorOutOfBounds;
+  TrackerGrid.Left := RowNumberStringGrid.Left + RowNumberStringGrid.Width;
+  RowNumberStringGrid.DefaultRowHeight := TrackerGrid.RowHeight;
   TrackerGrid.FontSize := OptionsFile.ReadInteger('hUGETracker', 'fontsize', 12);
   ScopesOn := OptionsFile.ReadBool('hUGETracker', 'ScopesOn', True);
   // Fix the size of the channel headers
-  for Section in HeaderControl1.Sections do
+  for I := 1 to HeaderControl1.Sections.Count-1 do
-    (Section as THeaderSection).Width := TrackerGrid.ColumnWidth;
+    HeaderControl1.Sections.Items[I].Width := TrackerGrid.ColumnWidth;
   TrackerGrid.PopupMenu := TrackerGridPopup;
 end;
   SampleSongs: TStringList;
   S: String;
   MenuItem: TMenuItem;
+  I: Integer;
 begin
   {if Screen.Fonts.IndexOf('PixeliteTTF') = -1 then
     MessageDlg('Warning', 'You don''t have the Pixelite font installed. '+
   // Switch to general tab sheet
   PageControl1.ActivePageIndex := 0;
+  // Add the row numbers to the string grid
+  for I := 0 to RowNumberStringGrid.RowCount-1 do
+    RowNumberStringGrid.Cells[0, I] := IntToStr(I);
   {$ifdef DEVELOPMENT}
   DebugShiteButton.Visible := True;
   DebugPlayNoteButton.Visible := True;
     SelectedSection := HeaderControl1.Sections[HeaderControl1.GetSectionAt(P)];
     SelectedSection.ImageIndex := 1;
-    for I := 0 to 3 do
+    for I := 1 to 4 do
-      snd[I+1].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;
+      snd[I].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;
   end;
 end;
 procedure TfrmTracker.HeaderControl1SectionClick(
   HeaderControl: TCustomHeaderControl; Section: THeaderSection);
 begin
+  if Section.OriginalIndex = 0 then Exit;
   Section.ImageIndex := (Section.ImageIndex + 1) mod 2;
-  snd[Section.OriginalIndex+1].ChannelOFF := Section.ImageIndex = 0;
+  snd[Section.OriginalIndex].ChannelOFF := Section.ImageIndex = 0;
 end;
 procedure TfrmTracker.HeaderControl1SectionResize(
 var
   Section: THeaderSection;
 begin
-  if Sender = Duty1Visualizer then Section := HeaderControl1.Sections.Items[0]
+  if Sender = Duty1Visualizer then Section := HeaderControl1.Sections.Items[1]
-  else if Sender = Duty2Visualizer then Section := HeaderControl1.Sections.Items[1]
+  else if Sender = Duty2Visualizer then Section := HeaderControl1.Sections.Items[2]
-  else if Sender = WaveVisualizer then Section := HeaderControl1.Sections.Items[2]
+  else if Sender = WaveVisualizer then Section := HeaderControl1.Sections.Items[3]
-  else {if Sender = NoiseVisualizer then} Section := HeaderControl1.Sections.Items[3];
+  else {if Sender = NoiseVisualizer then} Section := HeaderControl1.Sections.Items[4];
   Section.ImageIndex := (Section.ImageIndex + 1) mod 2;
   snd[Section.OriginalIndex+1].ChannelOFF := Section.ImageIndex = 0;

Commit dfbd736

Commit `dfbd736`