1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 15:23:48 +01:00

Bug1169 again: correct shuttling of spectrogram scale values with dialog on Apply

This commit is contained in:
Paul Licameli
2015-09-08 13:11:42 -04:00
parent a44ff801a6
commit 1083c4a049

View File

@@ -41,6 +41,10 @@ SpectrumPrefs::SpectrumPrefs(wxWindow * parent, WaveTrack *wt)
SpectrogramSettings &settings = wt->GetSpectrogramSettings(); SpectrogramSettings &settings = wt->GetSpectrogramSettings();
mDefaulted = (&SpectrogramSettings::defaults() == &settings); mDefaulted = (&SpectrogramSettings::defaults() == &settings);
mTempSettings = settings; mTempSettings = settings;
float minFreq, maxFreq;
wt->GetSpectrumBounds(&minFreq, &maxFreq);
mTempSettings.maxFreq = maxFreq;
mTempSettings.minFreq = minFreq;
} }
else { else {
mTempSettings = SpectrogramSettings::defaults(); mTempSettings = SpectrogramSettings::defaults();
@@ -389,9 +393,11 @@ bool SpectrumPrefs::Apply()
else { else {
SpectrogramSettings *pSettings = SpectrogramSettings *pSettings =
&mWt->GetIndependentSpectrogramSettings(); &mWt->GetIndependentSpectrogramSettings();
mWt->SetSpectrumBounds(mTempSettings.minFreq, mTempSettings.maxFreq);
*pSettings = mTempSettings; *pSettings = mTempSettings;
if (partner) { if (partner) {
pSettings = &partner->GetIndependentSpectrogramSettings(); pSettings = &partner->GetIndependentSpectrogramSettings();
partner->SetSpectrumBounds(mTempSettings.minFreq, mTempSettings.maxFreq);
*pSettings = mTempSettings; *pSettings = mTempSettings;
} }
} }