Added large data set tests for append_payload_to_mipmap

[pulseview.git] / logicsignal.cpp

diff --git a/logicsignal.cpp b/logicsignal.cpp
index 486c002d7a1ed1179e9979377a4195d15f816c76..69d58cb1cbc70abf9f540911ab8aefe202ba72e1 100644 (file)
--- a/logicsignal.cpp
+++ b/logicsignal.cpp
@@ -33,8 +33,6 @@
 using namespace boost;
 using namespace std;
 
-const float Log2 = logf(2.0f);
-
 const float LogicSignal::Margin = 10.0f;
 
 const float LogicSignal::EdgeColour[3] =       {0.50f, 0.50f, 0.50f};
@@ -86,17 +84,15 @@ void LogicSignal::paint(QGLWidget &widget, const QRect &rect,
        const double pixels_offset = offset / scale;
        const double samplerate = _data->get_samplerate();
        const double start_time = _data->get_start_time();
-       const int64_t last_sample = (int64_t)snapshot->get_sample_count() - 1;
+       const int64_t last_sample = snapshot->get_sample_count() - 1;
        const double samples_per_pixel = samplerate * scale;
-       const int64_t start = min(max((int64_t)(samplerate * (offset - start_time)),
-               (int64_t)0), last_sample);
-       const int64_t end = min((int64_t)(start + samples_per_pixel * rect.width()),
-               last_sample);
-       const int64_t quantization_length = 1LL << (int64_t)floorf(
-               max(logf(samples_per_pixel / Log2), 0.0f));
-
-       snapshot->get_subsampled_edges(edges, start, end,
-               quantization_length, _probe_index);
+       const double start = samplerate * (offset - start_time);
+       const double end = start + samples_per_pixel * rect.width();
+
+       snapshot->get_subsampled_edges(edges,
+               min(max((int64_t)floor(start), (int64_t)0), last_sample),
+               min(max((int64_t)ceil(end), (int64_t)0), last_sample),
+               samples_per_pixel, _probe_index);
 
        // Paint the edges
        const unsigned int edge_point_count = (edges.size() - 2) * 2;