Replaced NULL with nullptr

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 3bd885970413716f0989f9749d1f0e82e316efb0..49d1263642b9b97ee3bac15c95fbe8a897e2f724 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -33,6 +33,7 @@
 
 #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>
@@ -49,7 +50,6 @@ using std::vector;
 
 using sigrok::Channel;
 using sigrok::ConfigKey;
-using sigrok::Device;
 using sigrok::Error;
 using sigrok::Trigger;
 using sigrok::TriggerStage;
@@ -99,18 +99,18 @@ QCache<QString, const QPixmap> LogicSignal::pixmap_cache_;
 
 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),
        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;
 
@@ -140,6 +140,11 @@ shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
        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);
@@ -316,14 +321,23 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 
 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)
@@ -376,21 +390,23 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 {
        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()