#include <extdef.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
-#include "analogsignal.h"
-#include "pv/data/analog.h"
-#include "pv/data/analogsnapshot.h"
-#include "pv/view/view.h"
+#include "analogsignal.hpp"
+#include "pv/data/analog.hpp"
+#include "pv/data/analogsnapshot.hpp"
+#include "pv/view/view.hpp"
+
+#include <libsigrok/libsigrok.hpp>
-using boost::shared_ptr;
using std::max;
+using std::make_pair;
using std::min;
+using std::shared_ptr;
using std::deque;
+using sigrok::Channel;
+
namespace pv {
namespace view {
+const int AnalogSignal::NominalHeight = 80;
+
const QColor AnalogSignal::SignalColours[4] = {
QColor(0xC4, 0xA0, 0x00), // Yellow
QColor(0x87, 0x20, 0x7A), // Magenta
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(shared_ptr<pv::DevInst> dev_inst,
- const sr_probe *const probe, shared_ptr<data::Analog> data) :
- Signal(dev_inst, probe),
- _data(data),
- _scale(1.0f)
+AnalogSignal::AnalogSignal(
+ pv::Session &session,
+ shared_ptr<Channel> channel,
+ shared_ptr<data::Analog> data) :
+ Signal(session, channel),
+ data_(data),
+ scale_(1.0f)
{
- _colour = SignalColours[probe->index % countof(SignalColours)];
+ colour_ = SignalColours[channel_->index() % countof(SignalColours)];
}
AnalogSignal::~AnalogSignal()
shared_ptr<pv::data::SignalData> AnalogSignal::data() const
{
- return _data;
+ return data_;
}
shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
{
- return _data;
+ return data_;
}
void AnalogSignal::set_scale(float scale)
{
- _scale = scale;
+ scale_ = scale;
+}
+
+std::pair<int, int> AnalogSignal::v_extents() const
+{
+ return make_pair(-NominalHeight / 2, NominalHeight / 2);
}
void AnalogSignal::paint_back(QPainter &p, int left, int right)
{
- if (_probe->enabled)
- paint_axis(p, get_y(), left, right);
+ if (channel_->enabled())
+ paint_axis(p, get_visual_y(), left, right);
}
void AnalogSignal::paint_mid(QPainter &p, int left, int right)
{
- assert(_data);
+ assert(data_);
assert(right >= left);
+ assert(owner_);
+
+ const int y = get_visual_y();
- assert(_view);
- const int y = _v_offset - _view->v_offset();
+ const View *const view = owner_->view();
+ assert(view);
- const double scale = _view->scale();
+ const double scale = view->scale();
assert(scale > 0);
- const double offset = _view->offset();
+ const double offset = view->offset();
- if (!_probe->enabled)
+ if (!channel_->enabled())
return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
- _data->get_snapshots();
+ data_->get_snapshots();
if (snapshots.empty())
return;
snapshots.front();
const double pixels_offset = offset / scale;
- const double samplerate = _data->samplerate();
- const double start_time = _data->get_start_time();
+ const double samplerate = data_->samplerate();
+ const double start_time = data_->get_start_time();
const int64_t last_sample = snapshot->get_sample_count() - 1;
const double samples_per_pixel = samplerate * scale;
const double start = samplerate * (offset - start_time);
const float *const samples = snapshot->get_samples(start, end);
assert(samples);
- p.setPen(_colour);
+ p.setPen(colour_);
QPointF *points = new QPointF[sample_count];
QPointF *point = points;
const float x = (sample / samples_per_pixel -
pixels_offset) + left;
*point++ = QPointF(x,
- y - samples[sample - start] * _scale);
+ y - samples[sample - start] * scale_);
}
p.drawPolyline(points, point - points);
return;
p.setPen(QPen(Qt::NoPen));
- p.setBrush(_colour);
+ p.setBrush(colour_);
QRectF *const rects = new QRectF[e.length];
QRectF *rect = rects;
// We overlap this sample with the next so that vertical
// gaps do not appear during steep rising or falling edges
- const float b = y - max(s->max, (s+1)->min) * _scale;
- const float t = y - min(s->min, (s+1)->max) * _scale;
+ const float b = y - max(s->max, (s+1)->min) * scale_;
+ const float t = y - min(s->min, (s+1)->max) * scale_;
float h = b - t;
if(h >= 0.0f && h <= 1.0f)