Skip to content

Commit b925635

Browse files
swhardenswharden
committed
refactor while working on QRSS Viewer
1 parent f9d822e commit b925635

22 files changed

Lines changed: 697 additions & 156 deletions

‎src/AudioMonitor/Form1.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ private void Timer1_Tick(object sender, EventArgs e)
111111
pictureBox1.BackgroundImage = spec.GetBitmap(
112112
intensity: (float)nudIntensity.Value,
113113
decibels: cbDecibels.Checked,
114-
frequencyMin: 0,
115-
frequencyMax: 4000,
116114
vertical: waterfall,
117115
colormap: colormap,
118116
showTicks: cbTicks.Checked

‎src/ConsoleDemo/Program.cs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ static void DemoMozart()
2323

2424
float[] values = Spectrogram.WavFile.Read("mozart.wav");
2525
spec.AddExtend(values);
26-
27-
Bitmap bmp = spec.GetBitmap(frequencyMax: 2500, intensity: 5);
26+
spec.SetDisplayRange(0, 2500);
27+
spec.SetBrightness(5);
28+
Bitmap bmp = spec.GetBitmap();
2829
spec.SaveBitmap(bmp, "mozart.jpg");
2930
}
3031
}
@@ -37,7 +38,8 @@ static void DemoQRSS()
3738

3839
float[] values = Spectrogram.WavFile.Read("qrss.wav");
3940
spec.AddExtend(values);
40-
Bitmap bmp = spec.GetBitmap(intensity: 2, frequencyMin: 1200, frequencyMax: 1500);
41+
spec.SetDisplayRange(1200, 1500);
42+
Bitmap bmp = spec.GetBitmap(intensity: 2);
4143
spec.SaveBitmap(bmp, "qrss.jpg");
4244
}
4345
}

‎src/QRSS-Viewer/App.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
55
</startup>
6-
</configuration>
6+
</configuration>

‎src/QRSS-Viewer/Form1.cs‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎src/QRSS-Viewer/FormConfig.Designer.cs‎

Lines changed: 226 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/QRSS-Viewer/FormConfig.cs‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel;
4+
using System.Data;
5+
using System.Drawing;
6+
using System.Linq;
7+
using System.Text;
8+
using System.Threading.Tasks;
9+
using System.Windows.Forms;
10+
11+
namespace QRSS_Viewer
12+
{
13+
public partial class FormConfig : Form
14+
{
15+
readonly Spectrogram.Settings.DisplaySettings displaySettings;
16+
17+
public FormConfig(Spectrogram.Settings.DisplaySettings displaySettings)
18+
{
19+
InitializeComponent();
20+
this.displaySettings = displaySettings;
21+
UpdateGuiFromSettings();
22+
}
23+
24+
private void FormBrightness_Load(object sender, EventArgs e)
25+
{
26+
27+
}
28+
29+
private void UpdateGuiFromSettings()
30+
{
31+
nudBrightness.Value = (decimal)displaySettings.brightness;
32+
trackBrightness.Value = (int)(displaySettings.brightness * 10);
33+
nudLower.Value = (decimal)displaySettings.freqLow;
34+
nudUpper.Value = (decimal)displaySettings.freqHigh;
35+
}
36+
37+
private void NudBrightness_ValueChanged(object sender, EventArgs e)
38+
{
39+
displaySettings.brightness = (float)nudBrightness.Value;
40+
displaySettings.renderNeeded = true;
41+
UpdateGuiFromSettings();
42+
}
43+
44+
private void TrackBrightness_Scroll(object sender, EventArgs e)
45+
{
46+
displaySettings.brightness = (float)trackBrightness.Value / 10;
47+
displaySettings.renderNeeded = true;
48+
UpdateGuiFromSettings();
49+
}
50+
51+
private void BtnAuto_Click(object sender, EventArgs e)
52+
{
53+
displaySettings.renderNeeded = true;
54+
}
55+
56+
private void NudLower_ValueChanged(object sender, EventArgs e)
57+
{
58+
displaySettings.freqLow = (double)nudLower.Value;
59+
displaySettings.renderNeeded = true;
60+
UpdateGuiFromSettings();
61+
}
62+
63+
private void NudUpper_ValueChanged(object sender, EventArgs e)
64+
{
65+
displaySettings.freqHigh = (double)nudUpper.Value;
66+
displaySettings.renderNeeded = true;
67+
UpdateGuiFromSettings();
68+
}
69+
}
70+
}

0 commit comments

Comments
 (0)