#include <extdef.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
#include <QFormLayout>
#include <QToolBar>
#include <pv/data/logicsnapshot.h>
#include <pv/view/view.h>
-using boost::shared_ptr;
using std::deque;
using std::max;
using std::min;
using std::pair;
+using std::shared_ptr;
using std::vector;
namespace pv {
};
LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
- const sr_probe *const probe, shared_ptr<data::Logic> data) :
+ const sr_channel *const probe, shared_ptr<data::Logic> data) :
Signal(dev_inst, probe),
_data(data),
_trigger_none(NULL),
QLineF *const edge_lines = new QLineF[edge_count];
line = edge_lines;
- for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
- edges.begin() + 1;
- i != edges.end() - 1; i++) {
+ for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) {
const float x = ((*i).first / samples_per_pixel -
pixels_offset) + left;
*line++ = QLineF(x, high_offset, x, low_offset);
{
QLineF *line = lines;
- for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
- edges.begin(); i != (edges.end() - 1); i++)
+ for (auto i = edges.begin(); i != (edges.end() - 1); i++)
if ((*i).second == level) {
*line++ = QLineF(
((*i).first / samples_per_pixel -
const sr_dev_inst *const sdi = _dev_inst->dev_inst();
assert(sdi);
- const int probe_count = g_slist_length(sdi->probes);
+ const int probe_count = g_slist_length(sdi->channels);
assert(probe_count > 0);
assert(_probe && _probe->index < probe_count);