For questions, answers and opinions
That's a nice descriptive name.brian-armstrong wrote:I believe these are often called Stem plots.
Do you have code for that?brian-armstrong wrote:Hm, I think that's a good improvement. I do like the stem version at one zoom level up from there, though.
I changed where the zoom engages, fixed a bug with the stems not going to proper zero, and I changed zooming to lock in to a multiple of the project's sample rate. This gets rid of that aliasing.steve wrote: Do you have code for that?
Code: Select all
diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 7d4385d..2c116ad 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -1308,6 +1308,7 @@ void TrackArtist::DrawMinMaxRMS(wxDC &dc, const wxRect & rect, const double env[
void TrackArtist::DrawIndividualSamples(wxDC &dc, int leftOffset, const wxRect &rect,
float zoomMin, float zoomMax,
+ int zeroLevelYCoordinate,
bool dB, float dBRange,
const WaveClip *clip,
const ZoomInfo &zoomInfo,
@@ -1363,12 +1364,13 @@ void TrackArtist::DrawIndividualSamples(wxDC &dc, int leftOffset, const wxRect &
}
// Draw lines
- for (decltype(slen) s = 0; s < slen - 1; s++) {
+ for (decltype(slen) s = 0; s < slen; s++) {
AColor::Line(dc,
rect.x + xpos[s], rect.y + ypos[s],
- rect.x + xpos[s + 1], rect.y + ypos[s + 1]);
+ rect.x + xpos[s], zeroLevelYCoordinate);
}
+
if (showPoints)
{
// Draw points where spacing is enough
@@ -1808,7 +1810,7 @@ void TrackArtist::DrawClipWaveform(const WaveTrack *track,
const unsigned nPortions = portions.size();
// Require at least 1/2 pixel per sample for drawing individual samples.
- const double threshold1 = 0.5 * rate;
+ const double threshold1 = 1.0 * rate;
// Require at least 3 pixels per sample for drawing the draggable points.
const double threshold2 = 3 * rate;
@@ -1917,6 +1919,7 @@ void TrackArtist::DrawClipWaveform(const WaveTrack *track,
}
else
DrawIndividualSamples(dc, leftOffset, rect, zoomMin, zoomMax,
+ track->ZeroLevelYCoordinate(mid),
dB, dBRange,
clip, zoomInfo,
bigPoints, showPoints, muted);
diff --git a/src/TrackArtist.h b/src/TrackArtist.h
index f5c76ae..aa1acb7 100644
--- a/src/TrackArtist.h
+++ b/src/TrackArtist.h
@@ -157,6 +157,7 @@ class AUDACITY_DLL_API TrackArtist {
);
void DrawIndividualSamples(wxDC & dc, int leftOffset, const wxRect & rect,
float zoomMin, float zoomMax,
+ int zeroLevelYCoordinate,
bool dB, float dBRange,
const WaveClip *clip,
const ZoomInfo &zoomInfo,
diff --git a/src/ViewInfo.cpp b/src/ViewInfo.cpp
index 089554e..6580374 100644
--- a/src/ViewInfo.cpp
+++ b/src/ViewInfo.cpp
@@ -90,6 +90,14 @@ bool ZoomInfo::ZoomOutAvailable() const
void ZoomInfo::SetZoom(double pixelsPerSecond)
{
zoom = std::max(gMinZoom, std::min(gMaxZoom, pixelsPerSecond));
+ AudacityProject * project = GetActiveProject();
+ if ( project ) {
+ double samplesPerSecond = project->GetRate();
+ double pixelsPerSample = pixelsPerSecond/samplesPerSecond;
+ if ( pixelsPerSample > 1 ) {
+ zoom = floor(pixelsPerSample) * samplesPerSecond;
+ }
+ }
#ifdef EXPERIMENTAL_DA
// Disable snapping if user zooms in a long way.
// Helps stop users be trapped in snap-to.
This is true, you can't reliably select based on time with this.steve wrote:Unfortunately you've broken something and created a bug. "Zoom to Fit" (Ctrl+E) no longer works reliably.
Example:
With default preferences, generate 10 second sine wave.
From the selection Toolbar, select from 0 to 437 samples.
Zoom to fit.
Depending on the window size, the selection probably does not fit the window.
To be clear, what we're snapping to with this patch is the number of pixels between each sample, not the samples themselves. To do some napkin math, if the track in your image were 800 pixels wide, it's filled by ~0.012 seconds, which comes out to approximately 70,000 pixels/second. At a sample rate of 44,100 samples/second, (pixels/second)/(samples/second) = 1.51 pixels/sample. Since this only considers integer pixels/sample, it'd either have to reduce to 1 pixel/sample spacing, which would leave a large gap like the one you've posted, or it could move up to 2 pixels/sample, which would push the selection past the end of the screen.steve wrote:Perhaps you're not seeing what I'm seeing. I don't just mean that it's not snapping to the sample boundary. I mean it's way off.
Here is the result of the described steps with un-patched Audacity 2.1.3 RC2 version. Note that the selection fits almost exactly in the available window area:
And here is the result with the patched version. Note that the selection does not fill the window:
Code: Select all
diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index 7d4385d..8fcaf9a 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -1308,6 +1308,7 @@ void TrackArtist::DrawMinMaxRMS(wxDC &dc, const wxRect & rect, const double env[
void TrackArtist::DrawIndividualSamples(wxDC &dc, int leftOffset, const wxRect &rect,
float zoomMin, float zoomMax,
+ int zeroLevelYCoordinate,
bool dB, float dBRange,
const WaveClip *clip,
const ZoomInfo &zoomInfo,
@@ -1363,12 +1364,13 @@ void TrackArtist::DrawIndividualSamples(wxDC &dc, int leftOffset, const wxRect &
}
// Draw lines
- for (decltype(slen) s = 0; s < slen - 1; s++) {
+ for (decltype(slen) s = 0; s < slen; s++) {
AColor::Line(dc,
rect.x + xpos[s], rect.y + ypos[s],
- rect.x + xpos[s + 1], rect.y + ypos[s + 1]);
+ rect.x + xpos[s], zeroLevelYCoordinate);
}
+
if (showPoints)
{
// Draw points where spacing is enough
@@ -1807,17 +1809,17 @@ void TrackArtist::DrawClipWaveform(const WaveTrack *track,
FindWavePortions(portions, rect, zoomInfo, params);
const unsigned nPortions = portions.size();
- // Require at least 1/2 pixel per sample for drawing individual samples.
- const double threshold1 = 0.5 * rate;
- // Require at least 3 pixels per sample for drawing the draggable points.
- const double threshold2 = 3 * rate;
+ // Require at least 4 pixels per sample for drawing individual samples.
+ const double threshold1 = 4 * rate;
+ // Require at least 4 pixels per sample for drawing the draggable points.
+ const double threshold2 = 4 * rate;
{
bool showIndividualSamples = false;
for (unsigned ii = 0; !showIndividualSamples && ii < nPortions; ++ii) {
const WavePortion &portion = portions[ii];
showIndividualSamples =
- !portion.inFisheye && portion.averageZoom > threshold1;
+ !portion.inFisheye && portion.averageZoom >= threshold1;
}
if (!showIndividualSamples) {
@@ -1839,8 +1841,8 @@ void TrackArtist::DrawClipWaveform(const WaveTrack *track,
for (unsigned ii = 0; ii < nPortions; ++ii) {
WavePortion &portion = portions[ii];
- const bool showIndividualSamples = portion.averageZoom > threshold1;
- const bool showPoints = portion.averageZoom > threshold2;
+ const bool showIndividualSamples = portion.averageZoom >= threshold1;
+ const bool showPoints = portion.averageZoom >= threshold2;
wxRect& rect = portion.rect;
rect.Intersect(mid);
wxASSERT(rect.width >= 0);
@@ -1917,6 +1919,7 @@ void TrackArtist::DrawClipWaveform(const WaveTrack *track,
}
else
DrawIndividualSamples(dc, leftOffset, rect, zoomMin, zoomMax,
+ track->ZeroLevelYCoordinate(mid),
dB, dBRange,
clip, zoomInfo,
bigPoints, showPoints, muted);
diff --git a/src/TrackArtist.h b/src/TrackArtist.h
index f5c76ae..aa1acb7 100644
--- a/src/TrackArtist.h
+++ b/src/TrackArtist.h
@@ -157,6 +157,7 @@ class AUDACITY_DLL_API TrackArtist {
);
void DrawIndividualSamples(wxDC & dc, int leftOffset, const wxRect & rect,
float zoomMin, float zoomMax,
+ int zeroLevelYCoordinate,
bool dB, float dBRange,
const WaveClip *clip,
const ZoomInfo &zoomInfo,
diff --git a/src/ViewInfo.cpp b/src/ViewInfo.cpp
index 089554e..fdc8485 100644
--- a/src/ViewInfo.cpp
+++ b/src/ViewInfo.cpp
@@ -90,6 +90,15 @@ bool ZoomInfo::ZoomOutAvailable() const
void ZoomInfo::SetZoom(double pixelsPerSecond)
{
zoom = std::max(gMinZoom, std::min(gMaxZoom, pixelsPerSecond));
+ AudacityProject * project = GetActiveProject();
+ if ( project ) {
+ double samplesPerSecond = project->GetRate();
+ double pixelsPerSample = pixelsPerSecond/samplesPerSecond;
+ if ( pixelsPerSample >= 4 ) {
+ zoom = floor(pixelsPerSample) * samplesPerSecond;
+ }
+ }
#ifdef EXPERIMENTAL_DA
// Disable snapping if user zooms in a long way.
// Helps stop users be trapped in snap-to."I" could do ...? Oh no no no.brian-armstrong wrote:You could probably mitigate this by ....
I wouldn't dream of interfering with your project. I'm just offering feedback. I've got plenty of my own work to do.OK, I can see what you are doing, but I think it highly unlikely that this would be accepted into the main code base with the "apparent" breakage of "Fit Selection".brian-armstrong wrote:Still, I'd argue that this could be correct behavior if the user wanted equally spaced samples.
).I'm not sure I understand this comment since the code I included has this change. Wasn't it clear I meant it in a general "you"?steve wrote:"I" could do ...? Oh no no no.brian-armstrong wrote:You could probably mitigate this by ....
Rendering the samples with uneven spacing is inherently misrepresentative of the underlying data. This is true for the existing lines plot but it's exacerbated by the stem plot. Isn't this something that could be gated behind a user option?steve wrote:OK, I can see what you are doing, but I think it highly unlikely that this would be accepted into the main code base with the "apparent" breakage of "Fit Selection".brian-armstrong wrote:Still, I'd argue that this could be correct behavior if the user wanted equally spaced samples.
On the other hand, I think that the basic idea of "stem plots" as an "option" for displaying wave data at sample level, could be accepted, if implemented in a way that is in keeping with Audacity as a whole. (though I'd add that it's not my decision
No offence intended or taken - just checking that we're both clear.brian-armstrong wrote:I'm not sure I understand this comment since the code I included has this change. Wasn't it clear I meant it in a general "you"?