Fix bug #392 by improving empty list/map handling

[pulseview.git] / pv / popups / probes.cpp

diff --git a/pv/popups/probes.cpp b/pv/popups/probes.cpp
index 13380c2dfb9d6999bcb23e4fb040aed39a0cd127..fc069b8fd42761ef6ce5d6edda43d93e55d02dd8 100644 (file)
--- a/pv/popups/probes.cpp
+++ b/pv/popups/probes.cpp
@@ -20,8 +20,6 @@
 
 #include <map>
 
-#include <boost/foreach.hpp>
-
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
@@ -36,9 +34,9 @@
 
 using namespace Qt;
 
-using boost::shared_ptr;
 using std::map;
 using std::set;
+using std::shared_ptr;
 using std::vector;
 
 using pv::view::Signal;
@@ -63,29 +61,30 @@ Probes::Probes(SigSession &session, QWidget *parent) :
        assert(sdi);
 
        // Collect a set of signals
-       map<const sr_probe*, shared_ptr<Signal> > signal_map;
+       map<const sr_channel*, shared_ptr<Signal> > signal_map;
        const vector< shared_ptr<Signal> > sigs = _session.get_signals();
-       BOOST_FOREACH(const shared_ptr<Signal> &sig, sigs)
+       for (const shared_ptr<Signal> &sig : sigs)
                signal_map[sig->probe()] = sig;
 
-       // Populate probe groups
-       for (const GSList *g = sdi->probe_groups; g; g = g->next)
+       // Populate channel groups
+       for (const GSList *g = sdi->channel_groups; g; g = g->next)
        {
-               const sr_probe_group *const group =
-                       (const sr_probe_group*)g->data;
+               const sr_channel_group *const group =
+                       (const sr_channel_group*)g->data;
                assert(group);
 
                // Make a set of signals, and removed this signals from the
                // signal map.
                vector< shared_ptr<Signal> > group_sigs;
-               for (const GSList *p = group->probes; p; p = p->next)
+               for (const GSList *p = group->channels; p; p = p->next)
                {
-                       const sr_probe *const probe = (const sr_probe*)p->data;
+                       const sr_channel *const probe = (const sr_channel*)p->data;
                        assert(probe);
 
-                       const map<const sr_probe*, shared_ptr<Signal> >::
-                               iterator iter = signal_map.find(probe);
-                       assert(iter != signal_map.end());
+                       const auto iter = signal_map.find(probe);
+
+                       if (iter == signal_map.end())
+                               break;
 
                        group_sigs.push_back((*iter).second);
                        signal_map.erase(iter);
@@ -96,12 +95,12 @@ Probes::Probes(SigSession &session, QWidget *parent) :
 
        // Make a vector of the remaining probes
        vector< shared_ptr<Signal> > global_sigs;
-       for (const GSList *p = sdi->probes; p; p = p->next)
+       for (const GSList *p = sdi->channels; p; p = p->next)
        {
-               const sr_probe *const probe = (const sr_probe*)p->data;
+               const sr_channel *const probe = (const sr_channel*)p->data;
                assert(probe);
 
-               const map<const sr_probe*, shared_ptr<Signal> >::
+               const map<const sr_channel*, shared_ptr<Signal> >::
                        const_iterator iter = signal_map.find(probe);
                if (iter != signal_map.end())
                        global_sigs.push_back((*iter).second);
@@ -148,7 +147,7 @@ void Probes::set_all_probes(bool set)
        _updating_probes = false;
 }
 
-void Probes::populate_group(const sr_probe_group *group,
+void Probes::populate_group(const sr_channel_group *group,
        const vector< shared_ptr<pv::view::Signal> > sigs)
 {
        using pv::prop::binding::DeviceOptions;
@@ -167,12 +166,12 @@ void Probes::populate_group(const sr_probe_group *group,
                _layout.addRow(new QLabel(
                        QString("<h3>%1</h3>").arg(group->name)));
 
-       // Create the probe group grid
+       // Create the channel group grid
        QGridLayout *const probe_grid =
-               create_probe_group_grid(sigs);
+               create_channel_group_grid(sigs);
        _layout.addRow(probe_grid);
 
-       // Create the probe group options
+       // Create the channel group options
        if (binding)
        {
                binding->add_properties_to_form(&_layout, true);
@@ -180,13 +179,13 @@ void Probes::populate_group(const sr_probe_group *group,
        }
 }
 
-QGridLayout* Probes::create_probe_group_grid(
+QGridLayout* Probes::create_channel_group_grid(
        const vector< shared_ptr<pv::view::Signal> > sigs)
 {
        int row = 0, col = 0;
        QGridLayout *const grid = new QGridLayout();
 
-       BOOST_FOREACH(const shared_ptr<pv::view::Signal>& sig, sigs)
+       for (const shared_ptr<pv::view::Signal>& sig : sigs)
        {
                assert(sig);