Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-31 16:09:28 +02:00
Code Issues Releases Wiki Activity

Andrew Hallendorff's changes to make the vertical ruler follow the zoom level in both linear and dB modes.

Browse Source
This commit is contained in:
martynshaw99 2014-02-19 01:00:32 +00:00
parent b0c8a016d1
commit 3acbb825a0
3 changed files with 62 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/TrackArtist.cpp
View File

@ -668,6 +668,27 @@ void TrackArtist::UpdateVRuler(Track *t, wxRect & r)
float min, max;
wt->GetDisplayBounds(&min, &max);
if(wt->GetLastDisplay()==WaveTrack::WaveformDBDisplay)
{
// do a translation into the WaveTrack::WaveformDisplay space
wt->SetDisplay(WaveTrack::WaveformDisplay); // this makes the last display not WaveformDBDisplay
float sign = (min >= 0 ? 1 : -1);
if (min != 0.) {
min = pow(10., (fabs(min)*mdBrange - mdBrange)/20.0);
if (min < 0.0)
min = 0.0;
min *= sign;
}
sign = (max >= 0 ? 1 : -1);
if (max != 0.) {
max = pow(10., (fabs(max)*mdBrange - mdBrange)/20.0);
if (max < 0.0)
max = 0.0;
max *= sign;
}
wt->SetDisplayBounds(min, max);
}
vruler->SetBounds(r.x, r.y+1, r.x + r.width, r.y + r.height-1);
vruler->SetOrientation(wxVERTICAL);
@ -684,7 +705,29 @@ void TrackArtist::UpdateVRuler(Track *t, wxRect & r)
float min, max;
wt->GetDisplayBounds(&min, &max);
// This assumes that wt->GetDisplayBounds(&min, &max); is in dB, and it isn't, it's linear
if(wt->GetLastDisplay()==WaveTrack::WaveformDisplay)
{
// do a translation into the WaveTrack::WaveformDBDisplay space
wt->SetDisplay(WaveTrack::WaveformDBDisplay); // this makes the last display not WaveformDisplay
float sign = (min >= 0 ? 1 : -1);
if (min != 0.) {
min = (20.0 * log10(fabs(min)) + mdBrange) / mdBrange;
if (min < 0.0)
min = 0.0;
min *= sign;
}
sign = (max >= 0 ? 1 : -1);
if (max != 0.) {
max = (20.0 * log10(fabs(max)) + mdBrange) / mdBrange;
if (max < 0.0)
max = 0.0;
max *= sign;
}
wt->SetDisplayBounds(min, max);
}
if (max > 0) {
int top = 0;
float topval = 0;
@ -701,22 +744,22 @@ void TrackArtist::UpdateVRuler(Track *t, wxRect & r)
max = 1;
}
if (max < 1)
if (max < 1 && max > 0)
topval = -((1-max)*mdBrange);
if (min > 0) {
botval = -((1-min)*mdBrange);
}
if (topval > botval && bot > top+10) {
vruler->SetBounds(r.x, r.y+top+1, r.x + r.width, r.y + bot-1);
vruler->SetOrientation(wxVERTICAL);
vruler->SetRange(topval, botval);
vruler->SetFormat(Ruler::LinearDBFormat);
vruler->SetLabelEdges(true);
vruler->SetLog(false);
}
}
vruler->SetBounds(r.x, r.y+top+1, r.x + r.width, r.y + bot-1);
vruler->SetOrientation(wxVERTICAL);
vruler->SetRange(topval, botval);
}
else
vruler->SetBounds(0.0, 0.0, 0.0, 0.0); // A.C.H I couldn't find a way to just disable it?
vruler->SetFormat(Ruler::RealLogFormat);
vruler->SetLabelEdges(true);
vruler->SetLog(false);
}
else if (display == WaveTrack::SpectrumDisplay) {
// Spectrum

1
src/WaveTrack.cpp
View File

@ -104,6 +104,7 @@ WaveTrack::WaveTrack(WaveTrack &orig):
Track(orig)
{
gPrefs->Read(wxT("/GUI/DefaultViewMode"), &mDisplay, 0);
mLastDisplay=-1;
mLegacyProjectFileOffset = 0;

8
src/WaveTrack.h
View File

@ -396,8 +396,13 @@ class AUDACITY_DLL_API WaveTrack: public Track {
PitchDisplay
} WaveTrackDisplay;
void SetDisplay(int display) {mDisplay = display;}
void SetDisplay(int display) {
if(mDisplay<2)
mLastDisplay=mDisplay; // remember last display mode for wave and wavedb so they can remap
mDisplay = display;
}
int GetDisplay() {return mDisplay;}
int GetLastDisplay() {return mLastDisplay;}
void GetDisplayBounds(float *min, float *max);
void SetDisplayBounds(float min, float max);
@ -423,6 +428,7 @@ class AUDACITY_DLL_API WaveTrack: public Track {
float mDisplayMin;
float mDisplayMax;
int mDisplay; // type of display, from WaveTrackDisplay enum
int mLastDisplay; // last display mode
int mDisplayNumLocations;
int mDisplayNumLocationsAllocated;
Location* mDisplayLocations;