#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(pv::SigSession &session, sr_probe *const probe,
+AnalogSignal::AnalogSignal(
+ pv::SigSession &session,
+ shared_ptr<Channel> channel,
shared_ptr<data::Analog> data) :
- Signal(session, probe),
+ Signal(session, channel),
_data(data),
_scale(1.0f)
{
- _colour = SignalColours[probe->index % countof(SignalColours)];
+ _colour = SignalColours[_channel->index() % countof(SignalColours)];
}
AnalogSignal::~AnalogSignal()
{
}
-boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+ return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
{
return _data;
}
void AnalogSignal::paint_back(QPainter &p, int left, int right)
{
- if (_probe->enabled)
+ if (_channel->enabled())
paint_axis(p, get_y(), left, right);
}
{
assert(_data);
assert(right >= left);
+ assert(_owner);
+
+ const int y = get_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 =
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;
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];