diff options
| author | Sven Wegener <sven.wegener@stealer.net> | 2014-06-30 09:38:31 +0200 |
|---|---|---|
| committer | Sven Wegener <sven.wegener@stealer.net> | 2014-06-30 09:38:31 +0200 |
| commit | 79de83205964ee0182940ef7cec86b46896ed0e6 (patch) | |
| tree | ccf532205a550ac926e52069649a1cc41aa555a6 /DSLogic-gui/pv/view/analogsignal.cpp | |
| parent | 3de7dbb24c71c0d894dbd734ddf9258683d9e2e1 (diff) | |
Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Diffstat (limited to 'DSLogic-gui/pv/view/analogsignal.cpp')
| -rw-r--r-- | DSLogic-gui/pv/view/analogsignal.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/DSLogic-gui/pv/view/analogsignal.cpp b/DSLogic-gui/pv/view/analogsignal.cpp index 1d86310..2e62bfa 100644 --- a/DSLogic-gui/pv/view/analogsignal.cpp +++ b/DSLogic-gui/pv/view/analogsignal.cpp @@ -50,7 +50,7 @@ const QColor AnalogSignal::SignalColours[4] = { const float AnalogSignal::EnvelopeThreshold = 256.0f; -AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data, +AnalogSignal::AnalogSignal(QString name, boost::shared_ptr<data::Analog> data, int probe_index, int order) : Signal(name, probe_index, DS_ANALOG, order), _data(data) @@ -64,9 +64,11 @@ AnalogSignal::~AnalogSignal() } void AnalogSignal::set_data(boost::shared_ptr<data::Logic> _logic_data, + boost::shared_ptr<data::Dso> _dso_data, boost::shared_ptr<pv::data::Analog> _analog_data, boost::shared_ptr<data::Group> _group_data) { + (void)_dso_data; (void)_logic_data; (void)_group_data; @@ -89,13 +91,13 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale, //paint_axis(p, y, left, right); - const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots = + const deque< boost::shared_ptr<pv::data::AnalogSnapshot> > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; _scale = _signalHeight * 1.0f / 65536; - const shared_ptr<pv::data::AnalogSnapshot> &snapshot = + const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot = snapshots.front(); if (get_index() >= (int)snapshot->get_channel_num()) @@ -125,7 +127,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale, } void AnalogSignal::paint_trace(QPainter &p, - const shared_ptr<pv::data::AnalogSnapshot> &snapshot, + const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { @@ -157,7 +159,7 @@ void AnalogSignal::paint_trace(QPainter &p, } void AnalogSignal::paint_envelope(QPainter &p, - const shared_ptr<pv::data::AnalogSnapshot> &snapshot, + const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { |