Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix shifting of sample waveform during zoom #7222

Merged
merged 4 commits into from
May 2, 2024
Merged

Fix shifting of sample waveform during zoom #7222

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9888b4d
Fix shifting of sample waveform during zoom
khoidauminh Apr 24, 2024
0f013b9
Revert type declaration changes and remove redundant casting
khoidauminh Apr 24, 2024
fb58364
Make all primitive type declarations explicit
khoidauminh Apr 25, 2024
3662564
Change a for loop to a while loop
khoidauminh Apr 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 34 additions & 23 deletions src/gui/SampleWaveform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,55 +28,66 @@ namespace lmms::gui {

void SampleWaveform::visualize(Parameters parameters, QPainter& painter, const QRect& rect)
{
const auto x = rect.x();
const auto height = rect.height();
const auto width = rect.width();
const auto centerY = rect.center().y();
const int x = rect.x();
const int height = rect.height();
const int width = rect.width();
const int centerY = rect.center().y();

const auto halfHeight = height / 2;
const int halfHeight = height / 2;
khoidauminh marked this conversation as resolved.
Show resolved Hide resolved

const auto color = painter.pen().color();
const auto rmsColor = color.lighter(123);

const auto framesPerPixel = std::max<size_t>(1, parameters.size / width);
const float framesPerPixel = std::max(1.0f, static_cast<float>(parameters.size) / width);

constexpr auto maxFramesPerPixel = 512;
const auto resolution = std::max<size_t>(1, framesPerPixel / maxFramesPerPixel);
const auto framesPerResolution = framesPerPixel / resolution;
constexpr float maxFramesPerPixel = 512.0f;
const float resolution = std::max(1.0f, framesPerPixel / maxFramesPerPixel);
const float framesPerResolution = framesPerPixel / resolution;

const auto numPixels = std::min<size_t>(parameters.size, width);
const size_t numPixels = std::min<size_t>(parameters.size, width);
auto min = std::vector<float>(numPixels, 1);
auto max = std::vector<float>(numPixels, -1);
auto squared = std::vector<float>(numPixels);
auto squared = std::vector<float>(numPixels, 0);

const size_t maxFrames = numPixels * static_cast<size_t>(framesPerPixel);

int pixelIndex = 0;

const auto maxFrames = numPixels * framesPerPixel;
for (int i = 0; i < maxFrames; i += resolution)
{
const auto pixelIndex = i / framesPerPixel;
const auto frameIndex = !parameters.reversed ? i : maxFrames - i;
pixelIndex = i / framesPerPixel;
const int frameIndex = !parameters.reversed ? i : maxFrames - i;

const auto& frame = parameters.buffer[frameIndex];
const auto value = std::accumulate(frame.begin(), frame.end(), 0.0f) / frame.size();
const float value = std::accumulate(frame.begin(), frame.end(), 0.0f) / frame.size();

if (value > max[pixelIndex]) { max[pixelIndex] = value; }
if (value < min[pixelIndex]) { min[pixelIndex] = value; }

squared[pixelIndex] += value * value;
}

while (pixelIndex < numPixels)
{
max[pixelIndex] = 0.0;
min[pixelIndex] = 0.0;

pixelIndex++;
}

for (int i = 0; i < numPixels; i++)
{
const auto lineY1 = centerY - max[i] * halfHeight * parameters.amplification;
const auto lineY2 = centerY - min[i] * halfHeight * parameters.amplification;
const auto lineX = i + x;
const int lineY1 = centerY - max[i] * halfHeight * parameters.amplification;
const int lineY2 = centerY - min[i] * halfHeight * parameters.amplification;
const int lineX = i + x;
painter.drawLine(lineX, lineY1, lineX, lineY2);

const auto rms = std::sqrt(squared[i] / framesPerResolution);
const auto maxRMS = std::clamp(rms, min[i], max[i]);
const auto minRMS = std::clamp(-rms, min[i], max[i]);
const float rms = std::sqrt(squared[i] / framesPerResolution);
const float maxRMS = std::clamp(rms, min[i], max[i]);
const float minRMS = std::clamp(-rms, min[i], max[i]);

const auto rmsLineY1 = centerY - maxRMS * halfHeight * parameters.amplification;
const auto rmsLineY2 = centerY - minRMS * halfHeight * parameters.amplification;
const int rmsLineY1 = centerY - maxRMS * halfHeight * parameters.amplification;
const int rmsLineY2 = centerY - minRMS * halfHeight * parameters.amplification;

painter.setPen(rmsColor);
painter.drawLine(lineX, rmsLineY1, lineX, rmsLineY2);
Expand Down
Loading