#include "pv/data/analogsegment.hpp"
#include "pv/data/signalbase.hpp"
#include "pv/view/view.hpp"
+#include "pv/globalsettings.hpp"
#include <libsigrokcxx/libsigrokcxx.hpp>
+using std::deque;
+using std::div;
+using std::div_t;
using std::max;
using std::make_pair;
using std::min;
+using std::numeric_limits;
+using std::pair;
using std::shared_ptr;
-using std::deque;
namespace pv {
namespace views {
const QColor AnalogSignal::GridMajorColor = QColor(0, 0, 0, 40*256/100);
const QColor AnalogSignal::GridMinorColor = QColor(0, 0, 0, 20*256/100);
+const QColor AnalogSignal::SamplingPointColour(0x77, 0x77, 0x77);
+
const float AnalogSignal::EnvelopeThreshold = 256.0f;
const int AnalogSignal::MaximumVDivs = 10;
autoranging_ = settings.value("autoranging").toBool();
}
-std::pair<int, int> AnalogSignal::v_extents() const
+pair<int, int> AnalogSignal::v_extents() const
{
const int ph = pos_vdivs_ * div_height_;
const int nh = neg_vdivs_ * div_height_;
QPointF *points = new QPointF[points_count];
QPointF *point = points;
+ QRectF *const sampling_points = new QRectF[points_count];
+ QRectF *sampling_point = sampling_points;
+
pv::data::SegmentAnalogDataIterator* it =
segment->begin_sample_iteration(start);
+ const int w = 2;
for (int64_t sample = start; sample != end; sample++) {
const float x = (sample / samples_per_pixel -
pixels_offset) + left;
*point++ = QPointF(x, y - *((float*)it->value) * scale_);
+ *sampling_point++ = QRectF(x - (w / 2), y - *((float*)it->value) * scale_ - (w / 2), w, w);
+
segment->continue_sample_iteration(it, 1);
}
segment->end_sample_iteration(it);
p.drawPolyline(points, points_count);
+ // Paint the sampling points if enabled
+ GlobalSettings settings;
+ const bool show_sampling_points =
+ settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+
+ if (show_sampling_points && (samples_per_pixel < 0.25)) {
+ p.setPen(SamplingPointColour);
+ p.drawRects(sampling_points, points_count);
+ }
+
delete[] points;
+ delete[] sampling_points;
}
void AnalogSignal::paint_envelope(QPainter &p,
{
const float seq[] = {1.0f, 2.0f, 5.0f};
- const int offset = std::numeric_limits<int>::max() / (2 * countof(seq));
- const std::div_t d = std::div(
- (int)(scale_index + countof(seq) * offset),
+ const int offset = numeric_limits<int>::max() / (2 * countof(seq));
+ const div_t d = div((int)(scale_index + countof(seq) * offset),
countof(seq));
return powf(10.0f, d.quot - offset) * seq[d.rem];
double min = 0, max = 0;
for (shared_ptr<pv::data::AnalogSegment> segment : segments) {
- std::pair<double, double> mm = segment->get_min_max();
+ pair<double, double> mm = segment->get_min_max();
min = std::min(min, mm.first);
max = std::max(max, mm.second);
}