AnalogSignal: Implement converted logic trace painting

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index ea8fd510d9401e98324f5e0daefcc15ffb8e1614..440a11903d4277f15d6dfeff6961630d20bfa868 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -46,6 +46,7 @@ using std::deque;
 using std::max;
 using std::make_pair;
 using std::min;
+using std::none_of;
 using std::pair;
 using std::shared_ptr;
 using std::vector;
@@ -136,7 +137,7 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
        return base_->logic_data();
 }
 
-std::pair<int, int> LogicSignal::v_extents() const
+pair<int, int> LogicSignal::v_extents() const
 {
        const int signal_margin =
                QFontMetrics(QApplication::font()).height() / 2;
@@ -234,7 +235,8 @@ void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
        GlobalSettings settings;
        const bool show_sampling_points =
                settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
-       if (!show_sampling_points)
+
+       if (!show_sampling_points || (samples_per_pixel >= 0.25))
                return;
 
        // Paint the sampling points
@@ -345,6 +347,10 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
+       // We may not be associated with a device
+       if (!device_)
+               return vector<int32_t>();
+
        const auto sr_dev = device_->device();
        if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
                const Glib::VariantContainerBase gvar =
@@ -445,7 +451,7 @@ void LogicSignal::modify_trigger()
        if (trigger) {
                for (auto stage : trigger->stages()) {
                        const auto &matches = stage->matches();
-                       if (std::none_of(matches.begin(), matches.end(),
+                       if (none_of(matches.begin(), matches.end(),
                            [&](shared_ptr<TriggerMatch> match) {
                                        return match->channel() != base_->channel(); }))
                                continue;