Fix #777 by using a workaround for assumed glibmm bug

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 63d15314cdcf23470261f72a82dafedde51619e3..6eb68db381357835fe8fc3feb1d0ff2fb95697a3 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -51,6 +51,7 @@ using std::vector;
 
 using sigrok::Channel;
 using sigrok::ConfigKey;
+using sigrok::Capability;
 using sigrok::Error;
 using sigrok::Trigger;
 using sigrok::TriggerStage;
@@ -113,7 +114,7 @@ LogicSignal::LogicSignal(
 {
        shared_ptr<Trigger> trigger;
 
-       colour_ = SignalColours[channel->index() % countof(SignalColours)];
+       set_colour(SignalColours[channel->index() % countof(SignalColours)]);
 
        /* Populate this channel's trigger setting with whatever we
         * find in the current session trigger, if anything. */
@@ -125,10 +126,6 @@ LogicSignal::LogicSignal(
                                        trigger_match_ = match->type();
 }
 
-LogicSignal::~LogicSignal()
-{
-}
-
 shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
        return data_;
@@ -163,12 +160,6 @@ void LogicSignal::scale_handle_dragged(int offset)
        signal_height_ = ((units < 1) ? 1 : units) * font_height;
 }
 
-void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
-{
-       if (channel_->enabled())
-               paint_axis(p, pp, get_visual_y());
-}
-
 void LogicSignal::paint_mid(QPainter &p, const ViewItemPaintParams &pp)
 {
        QLineF *line;
@@ -338,22 +329,26 @@ void LogicSignal::init_trigger_actions(QWidget *parent)
 const vector<int32_t> LogicSignal::get_trigger_types() const
 {
        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;
+       if (sr_dev->config_check(ConfigKey::TRIGGER_MATCH, Capability::LIST)) {
+               const Glib::VariantContainerBase gvar =
+                       sr_dev->config_list(ConfigKey::TRIGGER_MATCH);
+
+               vector<int32_t> ttypes;
+
+               for (unsigned int i = 0; i < gvar.get_n_children(); i++) {
+                       Glib::VariantBase tmp_vb;
+                       gvar.get_child(tmp_vb, i);
+
+                       Glib::Variant<int32_t> tmp_v =
+                               Glib::VariantBase::cast_dynamic< Glib::Variant<int32_t> >(tmp_vb);
+
+                       ttypes.push_back(tmp_v.get());
                }
-       }
 
-       return vector<int32_t>();
+               return ttypes;
+       } else {
+               return vector<int32_t>();
+       }
 }
 
 QAction* LogicSignal::action_from_trigger_type(const TriggerMatchType *type)
@@ -466,24 +461,22 @@ void LogicSignal::modify_trigger()
 
 const QIcon* LogicSignal::get_icon(const char *path)
 {
-       const QIcon *icon = icon_cache_.take(path);
-       if (!icon) {
-               icon = new QIcon(path);
+       if (!icon_cache_.contains(path)) {
+               const QIcon *icon = new QIcon(path);
                icon_cache_.insert(path, icon);
        }
 
-       return icon;
+       return icon_cache_.take(path);
 }
 
 const QPixmap* LogicSignal::get_pixmap(const char *path)
 {
-       const QPixmap *pixmap = pixmap_cache_.take(path);
-       if (!pixmap) {
-               pixmap = new QPixmap(path);
+       if (!pixmap_cache_.contains(path)) {
+               const QPixmap *pixmap = new QPixmap(path);
                pixmap_cache_.insert(path, pixmap);
        }
 
-       return pixmap;
+       return pixmap_cache_.take(path);
 }
 
 void LogicSignal::on_trigger()