improve roll options

swharden · swharden · commit 44ad333a2b9b · 2020-06-11T18:48:51.000-04:00
diff --git a/src/Spectrogram/Spectrogram.cs b/src/Spectrogram/Spectrogram.cs
@@ -16,6 +16,9 @@ public class Spectrogram
         public int FftSize { get { return settings.FftSize; } }
         public double HzPerPx { get { return settings.HzPerPixel; } }
         public double SecPerPx { get { return settings.StepLengthSec; } }
+        public int FftsToProcess { get { return (newAudio.Count - settings.FftSize) / settings.StepSize; } }
+        public int FftsProcessed { get; private set; }
+        public int NextColumnIndex { get { return (FftsProcessed + rollOffset) % Width; } }
 
         private readonly Settings settings;
         public readonly List<double[]> ffts = new List<double[]>(); // TODO: private
@@ -74,8 +77,11 @@ public void Add(double[] audio, bool process = true)
                 Process();
         }
 
-        public int FftsToProcess { get { return (newAudio.Count - settings.FftSize) / settings.StepSize; } }
-        public int FftsProcessed { get; private set; }
+        private int rollOffset = 0;
+        public void RollReset()
+        {
+            rollOffset = -FftsProcessed;
+        }
 
         public double[][] Process()
         {
@@ -110,7 +116,7 @@ public double[][] Process()
         }
 
         public Bitmap GetBitmap(double intensity = 1, bool dB = false, bool roll = false) =>
-            _GetBitmap(ffts, cmap, intensity, dB, roll, FftsProcessed);
+            _GetBitmap(ffts, cmap, intensity, dB, roll, NextColumnIndex);
 
         public void SaveImage(string fileName, double intensity = 1, bool dB = false, bool roll = false)
         {
@@ -128,7 +134,7 @@ public void SaveImage(string fileName, double intensity = 1, bool dB = false, bo
             else
                 throw new ArgumentException("unknown file extension");
 
-            _GetBitmap(ffts, cmap, intensity, dB, roll, FftsProcessed).Save(fileName, fmt);
+            _GetBitmap(ffts, cmap, intensity, dB, roll, NextColumnIndex).Save(fileName, fmt);
         }
 
         public Bitmap GetBitmapMax(double intensity = 1, bool dB = false, bool roll = false, int reduction = 4)
@@ -143,10 +149,10 @@ public Bitmap GetBitmapMax(double intensity = 1, bool dB = false, bool roll = fa
                         d2[j] = Math.Max(d2[j], d1[j * reduction + k]);
                 ffts2.Add(d2);
             }
-            return _GetBitmap(ffts2, cmap, intensity, dB, roll, FftsProcessed);
+            return _GetBitmap(ffts2, cmap, intensity, dB, roll, NextColumnIndex);
         }
 
-        private static Bitmap _GetBitmap(List<double[]> ffts, Colormap cmap, double intensity = 1, bool dB = false, bool roll = false, int FftsProcessed = 0)
+        private static Bitmap _GetBitmap(List<double[]> ffts, Colormap cmap, double intensity = 1, bool dB = false, bool roll = false, int rollOffset = 0)
         {
             int Width = ffts.Count;
             int Height = ffts[0].Length;
@@ -164,7 +170,7 @@ private static Bitmap _GetBitmap(List<double[]> ffts, Colormap cmap, double inte
                 int sourceCol = col;
                 if (roll)
                 {
-                    sourceCol += Width - FftsProcessed % Width;
+                    sourceCol += Width - rollOffset % Width;
                     if (sourceCol >= Width)
                         sourceCol -= Width;
                 }

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@ public class Spectrogram`
`16`	`16`	`public int FftSize { get { return settings.FftSize; } }`
`17`	`17`	`public double HzPerPx { get { return settings.HzPerPixel; } }`
`18`	`18`	`public double SecPerPx { get { return settings.StepLengthSec; } }`
	`19`	`+ public int FftsToProcess { get { return (newAudio.Count - settings.FftSize) / settings.StepSize; } }`
	`20`	`+ public int FftsProcessed { get; private set; }`
	`21`	`+ public int NextColumnIndex { get { return (FftsProcessed + rollOffset) % Width; } }`
`19`	`22`
`20`	`23`	`private readonly Settings settings;`
`21`	`24`	`public readonly List<double[]> ffts = new List<double[]>(); // TODO: private`
`@@ -74,8 +77,11 @@ public void Add(double[] audio, bool process = true)`
`74`	`77`	`Process();`
`75`	`78`	`}`
`76`	`79`
`77`		`- public int FftsToProcess { get { return (newAudio.Count - settings.FftSize) / settings.StepSize; } }`
`78`		`- public int FftsProcessed { get; private set; }`
	`80`	`+ private int rollOffset = 0;`
	`81`	`+ public void RollReset()`
	`82`	`+ {`
	`83`	`+ rollOffset = -FftsProcessed;`
	`84`	`+ }`
`79`	`85`
`80`	`86`	`public double[][] Process()`
`81`	`87`	`{`
`@@ -110,7 +116,7 @@ public double[][] Process()`
`110`	`116`	`}`
`111`	`117`
`112`	`118`	`public Bitmap GetBitmap(double intensity = 1, bool dB = false, bool roll = false) =>`
`113`		`- _GetBitmap(ffts, cmap, intensity, dB, roll, FftsProcessed);`
	`119`	`+ _GetBitmap(ffts, cmap, intensity, dB, roll, NextColumnIndex);`
`114`	`120`
`115`	`121`	`public void SaveImage(string fileName, double intensity = 1, bool dB = false, bool roll = false)`
`116`	`122`	`{`
`@@ -128,7 +134,7 @@ public void SaveImage(string fileName, double intensity = 1, bool dB = false, bo`
`128`	`134`	`else`
`129`	`135`	`throw new ArgumentException("unknown file extension");`
`130`	`136`
`131`		`- _GetBitmap(ffts, cmap, intensity, dB, roll, FftsProcessed).Save(fileName, fmt);`
	`137`	`+ _GetBitmap(ffts, cmap, intensity, dB, roll, NextColumnIndex).Save(fileName, fmt);`
`132`	`138`	`}`
`133`	`139`
`134`	`140`	`public Bitmap GetBitmapMax(double intensity = 1, bool dB = false, bool roll = false, int reduction = 4)`
`@@ -143,10 +149,10 @@ public Bitmap GetBitmapMax(double intensity = 1, bool dB = false, bool roll = fa`
`143`	`149`	`d2[j] = Math.Max(d2[j], d1[j * reduction + k]);`
`144`	`150`	`ffts2.Add(d2);`
`145`	`151`	`}`
`146`		`- return _GetBitmap(ffts2, cmap, intensity, dB, roll, FftsProcessed);`
	`152`	`+ return _GetBitmap(ffts2, cmap, intensity, dB, roll, NextColumnIndex);`
`147`	`153`	`}`
`148`	`154`
`149`		`- private static Bitmap _GetBitmap(List<double[]> ffts, Colormap cmap, double intensity = 1, bool dB = false, bool roll = false, int FftsProcessed = 0)`
	`155`	`+ private static Bitmap _GetBitmap(List<double[]> ffts, Colormap cmap, double intensity = 1, bool dB = false, bool roll = false, int rollOffset = 0)`
`150`	`156`	`{`
`151`	`157`	`int Width = ffts.Count;`
`152`	`158`	`int Height = ffts[0].Length;`
`@@ -164,7 +170,7 @@ private static Bitmap _GetBitmap(List<double[]> ffts, Colormap cmap, double inte`
`164`	`170`	`int sourceCol = col;`
`165`	`171`	`if (roll)`
`166`	`172`	`{`
`167`		`- sourceCol += Width - FftsProcessed % Width;`
	`173`	`+ sourceCol += Width - rollOffset % Width;`
`168`	`174`	`if (sourceCol >= Width)`
`169`	`175`	`sourceCol -= Width;`
`170`	`176`	`}`