return make_pair(-SignalHeight - SignalMargin, SignalMargin);
}
-void LogicSignal::paint_back(QPainter &p, int left, int right)
+void LogicSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
{
if (channel_->enabled())
- paint_axis(p, get_visual_y(), left, right);
+ paint_axis(p, pp, get_visual_y());
}
-void LogicSignal::paint_mid(QPainter &p, int left, int right)
+void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
{
- using pv::view::View;
-
QLineF *line;
vector< pair<int64_t, bool> > edges;
assert(channel_);
assert(data_);
- assert(right >= left);
assert(owner_);
const int y = get_visual_y();
- const View *const view = owner_->view();
- assert(view);
-
- const double scale = view->scale();
- assert(scale > 0);
-
- const double offset = view->offset();
-
if (!channel_->enabled())
return;
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
- data_->get_snapshots();
+ data_->logic_snapshots();
if (snapshots.empty())
return;
if (samplerate == 0.0)
samplerate = 1.0;
- const double pixels_offset = offset / scale;
+ const double pixels_offset = pp.pixels_offset();
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 double start = samplerate * (offset - start_time);
- const double end = start + samples_per_pixel * (right - left);
+ const double samples_per_pixel = samplerate * pp.scale();
+ const double start = samplerate * (pp.offset() - start_time);
+ const double end = start + samples_per_pixel * pp.width();
snapshot->get_subsampled_edges(edges,
min(max((int64_t)floor(start), (int64_t)0), last_sample),
for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) {
const float x = ((*i).first / samples_per_pixel -
- pixels_offset) + left;
+ pixels_offset) + pp.left();
*line++ = QLineF(x, high_offset, x, low_offset);
}
p.setPen(HighColour);
paint_caps(p, cap_lines, edges, true, samples_per_pixel,
- pixels_offset, left, high_offset);
+ pixels_offset, pp.left(), high_offset);
p.setPen(LowColour);
paint_caps(p, cap_lines, edges, false, samples_per_pixel,
- pixels_offset, left, low_offset);
+ pixels_offset, pp.left(), low_offset);
delete[] cap_lines;
}
-void LogicSignal::paint_fore(QPainter &p, int left, int right)
+void LogicSignal::paint_fore(QPainter &p, const RowItemPaintParams &pp)
{
- (void)left;
-
// Draw the trigger marker
if (!trigger_match_)
return;
const int pad = TriggerMarkerPadding;
const QSize size = pixmap->size();
const QPoint point(
- right - size.width() - pad * 2,
+ pp.right() - size.width() - pad * 2,
y - (SignalHeight + size.height()) / 2);
p.setPen(QPen(Qt::NoPen));