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/groupsignal.cpp | |
| parent | 3de7dbb24c71c0d894dbd734ddf9258683d9e2e1 (diff) | |
Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Diffstat (limited to 'DSLogic-gui/pv/view/groupsignal.cpp')
| -rw-r--r-- | DSLogic-gui/pv/view/groupsignal.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/DSLogic-gui/pv/view/groupsignal.cpp b/DSLogic-gui/pv/view/groupsignal.cpp index 391779c..5330c06 100644 --- a/DSLogic-gui/pv/view/groupsignal.cpp +++ b/DSLogic-gui/pv/view/groupsignal.cpp @@ -58,10 +58,12 @@ GroupSignal::~GroupSignal() } void GroupSignal::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)_logic_data; + (void)_dso_data; (void)_analog_data; assert(_group_data); @@ -75,7 +77,7 @@ void GroupSignal::set_scale(float scale) } void GroupSignal::paint(QPainter &p, int y, int left, int right, double scale, - double offset) + double offset) { assert(scale > 0); assert(_data); @@ -84,12 +86,12 @@ void GroupSignal::paint(QPainter &p, int y, int left, int right, double scale, _scale = _signalHeight * 1.0f / pow(2, _index_list.size()); paint_axis(p, y, left, right); - const deque< shared_ptr<pv::data::GroupSnapshot> > &snapshots = + const deque< boost::shared_ptr<pv::data::GroupSnapshot> > &snapshots = _data->get_snapshots(); if (snapshots.empty()) return; - const shared_ptr<pv::data::GroupSnapshot> &snapshot = + const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot = snapshots.at(_sec_index); const double pixels_offset = offset / scale; @@ -116,7 +118,7 @@ void GroupSignal::paint(QPainter &p, int y, int left, int right, double scale, } void GroupSignal::paint_trace(QPainter &p, - const shared_ptr<pv::data::GroupSnapshot> &snapshot, + const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { @@ -144,7 +146,7 @@ void GroupSignal::paint_trace(QPainter &p, } void GroupSignal::paint_envelope(QPainter &p, - const shared_ptr<pv::data::GroupSnapshot> &snapshot, + const boost::shared_ptr<pv::data::GroupSnapshot> &snapshot, int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel) { |