#include "logicsignal.hpp"
#include "view.hpp"
-#include <pv/sigsession.hpp>
+#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>
+#include <libsigrokcxx/libsigrokcxx.hpp>
using std::deque;
using std::max;
return data_;
}
+void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
+{
+ data_ = data;
+}
+
std::pair<int, int> LogicSignal::v_extents() const
{
return make_pair(-SignalHeight - SignalMargin, SignalMargin);
}
-void LogicSignal::paint_back(QPainter &p, int left, int right)
+void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &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 ViewItemPaintParams &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 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 end = start + samples_per_pixel * (right - left);
+ 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());
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 ViewItemPaintParams &pp)
{
- (void)left;
-
// Draw the trigger marker
if (!trigger_match_)
return;
if (!pixmap)
continue;
- const int pad = TriggerMarkerPadding;
+ const float pad = TriggerMarkerPadding - 0.5f;
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));
+ 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);
const vector<int32_t> LogicSignal::get_trigger_types() const
{
- try {
- const Glib::VariantContainerBase gvar =
- device_->config_list(ConfigKey::TRIGGER_MATCH);
- return Glib::VariantBase::cast_dynamic<
- Glib::Variant<vector<int32_t>>>(gvar).get();
- } catch (Error e) {
- return vector<int32_t>();
+ const auto keys = device_->config_keys(ConfigKey::DEVICE_OPTIONS);
+ const auto iter = keys.find(ConfigKey::TRIGGER_MATCH);
+ if (iter != keys.end() &&
+ (*iter).second.find(sigrok::LIST) != (*iter).second.end()) {
+ try {
+ const Glib::VariantContainerBase gvar =
+ device_->config_list(ConfigKey::TRIGGER_MATCH);
+ return Glib::VariantBase::cast_dynamic<
+ Glib::Variant<vector<int32_t>>>(gvar).get();
+ } catch (Error e) {
+ // Failed to enumerate triggers
+ (void)e;
+ }
}
+
+ return vector<int32_t>();
}
QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
{
Signal::populate_popup_form(parent, form);
- trigger_bar_ = new QToolBar(parent);
- init_trigger_actions(trigger_bar_);
- trigger_bar_->addAction(trigger_none_);
- trigger_none_->setChecked(!trigger_match_);
-
const vector<int32_t> trig_types = get_trigger_types();
- for (auto type_id : trig_types) {
- const TriggerMatchType *const type =
- TriggerMatchType::get(type_id);
- QAction *const action = action_from_trigger_type(type);
- trigger_bar_->addAction(action);
- action->setChecked(trigger_match_ == type);
- }
- form->addRow(tr("Trigger"), trigger_bar_);
+ if (!trig_types.empty()) {
+ trigger_bar_ = new QToolBar(parent);
+ init_trigger_actions(trigger_bar_);
+ trigger_bar_->addAction(trigger_none_);
+ trigger_none_->setChecked(!trigger_match_);
+
+ for (auto type_id : trig_types) {
+ const TriggerMatchType *const type =
+ TriggerMatchType::get(type_id);
+ QAction *const action = action_from_trigger_type(type);
+ trigger_bar_->addAction(action);
+ action->setChecked(trigger_match_ == type);
+ }
+ form->addRow(tr("Trigger"), trigger_bar_);
+ }
}
void LogicSignal::modify_trigger()
new_trigger->stages().empty() ? nullptr : new_trigger);
if (owner_)
- owner_->appearance_changed(false, true);
+ owner_->row_item_appearance_changed(false, true);
}
const QIcon* LogicSignal::get_icon(const char *path)
projects / pulseview.git / blobdiff