#include <pv/session.hpp>
#include <pv/devicemanager.hpp>
#include <pv/data/logic.hpp>
-#include <pv/data/logicsnapshot.hpp>
+#include <pv/data/logicsegment.hpp>
#include <pv/view/view.hpp>
#include <libsigrok/libsigrok.hpp>
void LogicSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
{
- using pv::view::View;
-
QLineF *line;
vector< pair<int64_t, bool> > edges;
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 high_offset = y - SignalHeight + 0.5f;
const float low_offset = y + 0.5f;
- const deque< shared_ptr<pv::data::LogicSnapshot> > &snapshots =
- data_->get_snapshots();
- if (snapshots.empty())
+ const deque< shared_ptr<pv::data::LogicSegment> > &segments =
+ data_->logic_segments();
+ if (segments.empty())
return;
- const shared_ptr<pv::data::LogicSnapshot> &snapshot =
- snapshots.front();
+ const shared_ptr<pv::data::LogicSegment> &segment =
+ segments.front();
- double samplerate = data_->samplerate();
+ double samplerate = segment->samplerate();
// Show sample rate as 1Hz when it is unknown
if (samplerate == 0.0)
samplerate = 1.0;
- const double pixels_offset = offset / scale;
- 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 pixels_offset = pp.pixels_offset();
+ const double start_time = segment->start_time();
+ const int64_t last_sample = segment->get_sample_count() - 1;
+ 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,
+ segment->get_subsampled_edges(edges,
min(max((int64_t)floor(start), (int64_t)0), last_sample),
min(max((int64_t)ceil(end), (int64_t)0), last_sample),
samples_per_pixel / Oversampling, channel_->index());
if (!pixmap)
continue;
- const int pad = TriggerMarkerPadding;
+ const float pad = TriggerMarkerPadding - 0.5f;
const QSize size = pixmap->size();
const QPoint point(
pp.right() - size.width() - pad * 2,
y - (SignalHeight + size.height()) / 2);
- p.setPen(QPen(Qt::NoPen));
+ p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
p.setBrush(TriggerMarkerBackgroundColour);
- p.drawRoundedRect(QRect(point, size).adjusted(
+ p.drawRoundedRect(QRectF(point, size).adjusted(
-pad, -pad, pad, pad), pad, pad);
p.drawPixmap(point, *pixmap);