#include <algorithm>
+#include <QApplication>
#include <QFormLayout>
#include <QToolBar>
#include <pv/session.hpp>
#include <pv/devicemanager.hpp>
+#include <pv/devices/device.hpp>
#include <pv/data/logic.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;
using sigrok::Channel;
using sigrok::ConfigKey;
-using sigrok::Device;
using sigrok::Error;
using sigrok::Trigger;
using sigrok::TriggerStage;
namespace pv {
namespace view {
-const int LogicSignal::SignalHeight = 30;
-const int LogicSignal::SignalMargin = 10;
-
const float LogicSignal::Oversampling = 2.0f;
const QColor LogicSignal::EdgeColour(0x80, 0x80, 0x80);
LogicSignal::LogicSignal(
pv::Session &session,
- shared_ptr<Device> device,
+ shared_ptr<devices::Device> device,
shared_ptr<Channel> channel,
shared_ptr<data::Logic> data) :
Signal(session, channel),
+ signal_height_(QFontMetrics(QApplication::font()).height() * 2),
device_(device),
data_(data),
- trigger_none_(NULL),
- trigger_rising_(NULL),
- trigger_high_(NULL),
- trigger_falling_(NULL),
- trigger_low_(NULL),
- trigger_change_(NULL)
+ trigger_none_(nullptr),
+ trigger_rising_(nullptr),
+ trigger_high_(nullptr),
+ trigger_falling_(nullptr),
+ trigger_low_(nullptr),
+ trigger_change_(nullptr)
{
shared_ptr<Trigger> trigger;
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);
+ const int signal_margin =
+ QFontMetrics(QApplication::font()).height() / 2;
+ return make_pair(-signal_height_ - signal_margin, signal_margin);
+}
+
+int LogicSignal::scale_handle_offset() const
+{
+ return -signal_height_;
+}
+
+void LogicSignal::scale_handle_dragged(int offset)
+{
+ const int font_height = QFontMetrics(QApplication::font()).height();
+ const int units = (-offset / font_height);
+ signal_height_ = ((units < 1) ? 1 : units) * font_height;
}
void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
if (!channel_->enabled())
return;
- const float high_offset = y - SignalHeight + 0.5f;
+ const float high_offset = y - signal_height_ + 0.5f;
const float low_offset = y + 0.5f;
const deque< shared_ptr<pv::data::LogicSegment> > &segments =
samplerate = 1.0;
const double pixels_offset = pp.pixels_offset();
- const double start_time = segment->start_time();
+ const pv::util::Timestamp& 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();
+ const pv::util::Timestamp start = samplerate * (pp.offset() - start_time);
+ const pv::util::Timestamp end = start + samples_per_pixel * pp.width();
+
+ const int64_t start_sample = min(max(floor(start).convert_to<int64_t>(),
+ (int64_t)0), last_sample);
+ const uint64_t end_sample = min(max(ceil(end).convert_to<int64_t>(),
+ (int64_t)0), last_sample);
- 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),
+ segment->get_subsampled_edges(edges, start_sample, end_sample,
samples_per_pixel / Oversampling, channel_->index());
assert(edges.size() >= 2);
void LogicSignal::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
{
// Draw the trigger marker
- if (!trigger_match_)
+ if (!trigger_match_ || !channel_->enabled())
return;
const int y = get_visual_y();
const QSize size = pixmap->size();
const QPoint point(
pp.right() - size.width() - pad * 2,
- y - (SignalHeight + size.height()) / 2);
+ y - (signal_height_ + size.height()) / 2);
p.setPen(QPen(TriggerMarkerBackgroundColour.darker()));
p.setBrush(TriggerMarkerBackgroundColour);
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 sr_dev = device_->device();
+ const auto keys = sr_dev->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 =
+ sr_dev->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()
if (trigger) {
for (auto stage : trigger->stages()) {
const auto &matches = stage->matches();
- if (std::none_of(begin(matches), end(matches),
+ if (std::none_of(matches.begin(), matches.end(),
[&](shared_ptr<TriggerMatch> match) {
return match->channel() != channel_; }))
continue;
}
}
- if (trigger_match_)
- new_trigger->add_stage()->add_match(channel_, trigger_match_);
+ if (trigger_match_) {
+ // Until we can let the user decide how to group trigger matches
+ // into stages, put all of the matches into a single stage --
+ // most devices only support a single trigger stage.
+ if (new_trigger->stages().empty())
+ new_trigger->add_stage();
+
+ new_trigger->stages().back()->add_match(channel_, trigger_match_);
+ }
session_.session()->set_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