Commit `efea754`

Nick committed on Mar 27, 2020

Implement wave hex box

commit efea75403867dec2e3fd216989b6053d2c0850a6 parent 8c0850b

2 changed files +68−13

Modifiedtracker.lfm +26−10

 object frmTracker: TfrmTracker
-  Left = 1888
+  Left = 1860
   Height = 726
-  Top = 59
+  Top = 69
   Width = 1180
   Caption = 'hUGETracker'
   ClientHeight = 706
       Height = 480
       Top = 0
       Width = 982
-      ActivePage = GeneralTabSheet
+      ActivePage = WavesTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 0
+      TabIndex = 3
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
       end
       object WavesTabSheet: TTabSheet
         Caption = 'Waves'
-        ClientHeight = 414
+        ClientHeight = 452
-        ClientWidth = 960
+        ClientWidth = 974
         ParentFont = False
         object WaveEditPaintBox: TPaintBox
           AnchorSideTop.Control = WaveEditGroupBox
           AnchorSideTop.Side = asrBottom
           Left = 0
-          Height = 254
+          Height = 292
           Top = 160
-          Width = 960
+          Width = 974
           Align = alBottom
           Anchors = [akTop, akLeft, akRight, akBottom]
           BorderSpacing.Top = 13
           Left = 8
           Height = 139
           Top = 8
-          Width = 173
+          Width = 568
           Caption = 'Wave Editor'
           ClientHeight = 119
-          ClientWidth = 169
+          ClientWidth = 564
           ParentFont = False
           TabOrder = 0
           object Label20: TLabel
             ParentFont = False
             TabOrder = 2
           end
+          object HexWaveEdit: TEdit
+            Left = 288
+            Height = 23
+            Top = 8
+            Width = 264
+            OnEditingDone = HexWaveEditEditingDone
+            TabOrder = 3
+          end
+          object Label13: TLabel
+            Left = 176
+            Height = 15
+            Top = 16
+            Width = 100
+            Caption = 'Hex representation'
+            ParentColor = False
+          end
         end
       end
       object CommentsTabSheet: TTabSheet

Modifiedtracker.pas +42−3

   FileUtil, math, Instruments, Waves, Song, EmulationThread, Utils, Constants,
   sound, vars, machine, about_hugetracker, TrackerGrid, lclintf, lmessages,
   Buttons, Grids, DBCtrls, HugeDatatypes, LCLType, RackCtls, Codegen, SymParser,
-  options, IniFiles, bgrabitmap, effecteditor, RenderToWave, modimport, Types;
+  options, IniFiles, bgrabitmap, effecteditor, RenderToWave, modimport,
+  strutils, Types;
 type
   { TfrmTracker }
     Button1: TButton;
     Duty1Visualizer: TPaintBox;
     Duty2Visualizer: TPaintBox;
+    HexWaveEdit: TEdit;
     InstrumentExportButton: TButton;
     InstrumentImportButton: TButton;
     InstrumentComboBox: TComboBox;
     CutAction: TAction;
     ImageList2: TImageList;
     GBSaveDialog: TSaveDialog;
+    Label13: TLabel;
     Label25: TLabel;
     MenuItem10: TMenuItem;
     MenuItem16: TMenuItem;
     procedure EditDelete1Execute(Sender: TObject);
     procedure FileSaveAs1BeforeExecute(Sender: TObject);
     procedure FormCloseQuery(Sender: TObject; var CanClose: boolean);
+    procedure HexWaveEditEditingDone(Sender: TObject);
     procedure MenuItem46Click(Sender: TObject);
     procedure ScrollBox1MouseWheelDown(Sender: TObject; Shift: TShiftState;
       MousePos: TPoint; var Handled: Boolean);
     procedure RecreateTrackerGrid;
     procedure UpdateUIAfterLoad;
+    procedure UpdateHexWaveTextbox;
     function CheckUnsavedChanges: Boolean;
     procedure DrawWaveform(PB: TPaintBox; Wave: TWave);
   PageControl1.ActivePageIndex := 0;
 end;
+procedure TfrmTracker.UpdateHexWaveTextbox;
+var
+  I: Integer;
+  S: String;
+begin
+  S := '';
+  for I := Low(CurrentWave^) to High(CurrentWave^) do
+    S += hexStr(CurrentWave^[I], 1);
+  HexWaveEdit.Text := S;
+end;
 function TfrmTracker.CheckUnsavedChanges: Boolean;
 begin
   Result := True;
     Pen.Color := clTeal;
     Pen.Width := 2;
     MoveTo(0, H);
-    for I := 0 to 32 do
+    for I := Low(Wave) to High(Wave) do
       LineTo(I*Interval, Trunc((Wave[I]/$F)*H));
     LineTo(W, Trunc((Wave[0]/$F)*H));
   end;
 begin
   CurrentWave := @Song.Waves[Wave];
   WaveEditPaintBox.Invalidate;
+  UpdateHexWaveTextbox;
 end;
 procedure TfrmTracker.LoadSong(Filename: String);
   CanClose := CheckUnsavedChanges;
 end;
+procedure TfrmTracker.HexWaveEditEditingDone(Sender: TObject);
+var
+  S: String;
+  I: Integer;
+begin
+  S := DelSpace(HexWaveEdit.Text);
+  if S.Length < High(TWave) then Exit;
+  try
+    for I := Low(TWave) to High(TWave) do begin
+      writeln(Hex2Dec(S.Substring(I,1)));
+      CurrentWave^[I] := Hex2Dec(S.Substring(I,1));
+    end;
+    HexWaveEdit.Text := S;
+    WaveEditPaintBox.Invalidate;
+  except
+    on EConvertError do Exit;
+  end;
+end;
 procedure TfrmTracker.MenuItem46Click(Sender: TObject);
 begin
   Idx: Integer;
 begin
   if DrawingWave then begin
-    Idx := Trunc((X / WaveEditPaintBox.Width)*32);
+    Idx := EnsureRange(Trunc((X / WaveEditPaintBox.Width)*High(TWave)), Low(TWave), High(TWave));
     CurrentWave^[Idx] := EnsureRange(Trunc((Y / WaveEditPaintBox.Height)*$F), 0, $F);
+    UpdateHexWaveTextbox;
     WaveEditPaintBox.Invalidate;
   end;
 end;

Commit efea754

Commit `efea754`