#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"
-using namespace boost;
-using namespace std;
+#include <libsigrok/libsigrok.hpp>
+
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::deque;
+
+using sigrok::Channel;
namespace pv {
namespace view {
const float AnalogSignal::EnvelopeThreshold = 256.0f;
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
- int probe_index) :
- Signal(name),
+AnalogSignal::AnalogSignal(shared_ptr<Channel> channel,
+ shared_ptr<data::Analog> data) :
+ Signal(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;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+ return _data;
}
void AnalogSignal::set_scale(float scale)
_scale = scale;
}
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
- double offset)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+ if (_channel->enabled())
+ paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
{
- assert(scale > 0);
assert(_data);
assert(right >= left);
- paint_axis(p, y, left, right);
+ assert(_view);
+ const int y = _v_offset - _view->v_offset();
+
+ const double scale = _view->scale();
+ assert(scale > 0);
+
+ const double offset = _view->offset();
+
+ if (!_channel->enabled())
+ return;
const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
_data->get_snapshots();
snapshots.front();
const double pixels_offset = offset / scale;
- const double samplerate = _data->get_samplerate();
+ 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 int64_t start_sample = min(max((int64_t)floor(start),
(int64_t)0), last_sample);
- const int64_t end_sample = min(max((int64_t)ceil(end),
+ const int64_t end_sample = min(max((int64_t)ceil(end) + 1,
(int64_t)0), last_sample);
if (samples_per_pixel < EnvelopeThreshold)
y - samples[sample - start] * _scale);
}
- p.drawPoints(points, point - points);
+ p.drawPolyline(points, point - points);
delete[] samples;
delete[] points;
int y, int left, const int64_t start, const int64_t end,
const double pixels_offset, const double samples_per_pixel)
{
- using namespace Qt;
using pv::data::AnalogSnapshot;
AnalogSnapshot::EnvelopeSection e;
if (e.length < 2)
return;
- p.setPen(QPen(NoPen));
+ p.setPen(QPen(Qt::NoPen));
p.setBrush(_colour);
QRectF *const rects = new QRectF[e.length];