add options to displaySettings

swharden · swharden · commit d26703d1aef5 · 2019-08-26T20:40:56.000-04:00
diff --git a/src/Spectrogram/Annotations.cs b/src/Spectrogram/Annotations.cs
@@ -6,10 +6,13 @@ namespace Spectrogram
 {
     public class Annotations
     {
-        public static void drawTicks(Bitmap bmp, FftSettings fftSettings, DisplaySettings displaySettings, double tickSpacingHz, double tickSpacingSec)
+        public static void drawTicks(Bitmap bmp, FftSettings fftSettings, DisplaySettings displaySettings)
         {
             Graphics gfx = Graphics.FromImage(bmp);
 
+            double tickSpacingSec = displaySettings.tickSpacingSec;
+            double tickSpacingHz = displaySettings.tickSpacingHz;
+
             double horizontalTickSpacing = tickSpacingSec * fftSettings.sampleRate / fftSettings.step;
 
             double firstFreqTick = fftSettings.FrequencyFromIndex(displaySettings.pixelLower) + tickSpacingHz;
diff --git a/src/Spectrogram/Settings/DisplaySettings.cs b/src/Spectrogram/Settings/DisplaySettings.cs
@@ -24,8 +24,11 @@ public class DisplaySettings
 
         public float brightness = 1;
         public bool decibels;
-        public Colormap colormap;
+        public Colormap colormap = Colormap.viridis;
         public int? highlightColumn = null;
+        public bool showTicks = false;
+        public double tickSpacingSec = 1;
+        public double tickSpacingHz = 100;
 
         public bool renderNeeded;
 
diff --git a/src/Spectrogram/Spectrogram.cs b/src/Spectrogram/Spectrogram.cs
@@ -117,10 +117,10 @@ public Bitmap GetBitmap(
             double? intensity = null,
             bool decibels = false,
             bool vertical = false,
-            Colormap colormap = Colormap.viridis,
-            bool showTicks = false,
-            double tickSpacingHz = 500,
-            double tickSpacingSec = 1,
+            Colormap? colormap = null,
+            bool? showTicks = null,
+            double? tickSpacingHz = null,
+            double? tickSpacingSec = null,
             double? freqLow = null, 
             double? freqHigh = null,
             bool highlightLatestColumn = false
@@ -135,11 +135,13 @@ public Bitmap GetBitmap(
             if (intensity != null)
                 displaySettings.brightness = (float)intensity;
 
-            
             displaySettings.decibels = decibels;
-            displaySettings.colormap = colormap;
+            displaySettings.colormap = (colormap == null) ? displaySettings.colormap : (Colormap)colormap;
             displaySettings.freqLow = (freqLow == null) ? 0 : (double)freqLow;
             displaySettings.freqHigh = (freqHigh == null) ? fftSettings.maxFreq : (double)freqHigh;
+            displaySettings.showTicks = (showTicks == null) ? displaySettings.showTicks : (bool)showTicks;
+            displaySettings.tickSpacingHz = (tickSpacingHz == null) ? displaySettings.tickSpacingHz : (double)tickSpacingHz;
+            displaySettings.tickSpacingSec = (tickSpacingSec == null) ? displaySettings.tickSpacingSec : (double)tickSpacingSec;
 
             if (highlightLatestColumn)
                 displaySettings.highlightColumn = nextIndex;
@@ -159,8 +161,8 @@ public Bitmap GetBitmap(
             }
 
             // TODO: put spacing in displaySettings
-            if (showTicks)
-                Annotations.drawTicks(bmpRgb, fftSettings, displaySettings, tickSpacingHz, tickSpacingSec);
+            if (displaySettings.showTicks)
+                Annotations.drawTicks(bmpRgb, fftSettings, displaySettings);
 
             return bmpRgb;
         }

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,13 @@ namespace Spectrogram`
`6`	`6`	`{`
`7`	`7`	`public class Annotations`
`8`	`8`	`{`
`9`		`- public static void drawTicks(Bitmap bmp, FftSettings fftSettings, DisplaySettings displaySettings, double tickSpacingHz, double tickSpacingSec)`
	`9`	`+ public static void drawTicks(Bitmap bmp, FftSettings fftSettings, DisplaySettings displaySettings)`
`10`	`10`	`{`
`11`	`11`	`Graphics gfx = Graphics.FromImage(bmp);`
`12`	`12`
	`13`	`+ double tickSpacingSec = displaySettings.tickSpacingSec;`
	`14`	`+ double tickSpacingHz = displaySettings.tickSpacingHz;`
	`15`	`+`
`13`	`16`	`double horizontalTickSpacing = tickSpacingSec * fftSettings.sampleRate / fftSettings.step;`
`14`	`17`
`15`	`18`	`double firstFreqTick = fftSettings.FrequencyFromIndex(displaySettings.pixelLower) + tickSpacingHz;`