projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing default to switch/case block.
[pulseview.git]
/
pv
/
popups
/
probes.cpp
diff --git
a/pv/popups/probes.cpp
b/pv/popups/probes.cpp
index daad812b76ef48a27a4ab8ad6531088833d94579..a20dfccafb4f345c51d76147f69a2f4852245bde 100644
(file)
--- a/
pv/popups/probes.cpp
+++ b/
pv/popups/probes.cpp
@@
-20,8
+20,6
@@
#include <map>
#include <map>
-#include <boost/foreach.hpp>
-
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
@@
-29,15
+27,16
@@
#include "probes.h"
#include "probes.h"
+#include <pv/device/devinst.h>
#include <pv/prop/binding/deviceoptions.h>
#include <pv/sigsession.h>
#include <pv/view/signal.h>
using namespace Qt;
#include <pv/prop/binding/deviceoptions.h>
#include <pv/sigsession.h>
#include <pv/view/signal.h>
using namespace Qt;
-using boost::shared_ptr;
using std::map;
using std::set;
using std::map;
using std::set;
+using std::shared_ptr;
using std::vector;
using pv::view::Signal;
using std::vector;
using pv::view::Signal;
@@
-56,33
+55,37
@@
Probes::Probes(SigSession &session, QWidget *parent) :
// Create the layout
setLayout(&_layout);
// Create the layout
setLayout(&_layout);
- sr_dev_inst *const sdi = _session.get_device();
+ shared_ptr<device::DevInst> dev_inst = _session.get_device();
+ assert(dev_inst);
+ const sr_dev_inst *const sdi = dev_inst->dev_inst();
assert(sdi);
// Collect a set of signals
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();
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;
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);
assert(group);
- // Make a set of signals
, and removed this
signals from the
+ // Make a set of signals
and remove these
signals from the
// signal map.
vector< shared_ptr<Signal> > group_sigs;
// signal map.
vector< shared_ptr<Signal> > group_sigs;
- for (const GSList *p = group->
probe
s; p; p = p->next)
+ for (const GSList *p = group->
channel
s; 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);
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);
group_sigs.push_back((*iter).second);
signal_map.erase(iter);
@@
-93,12
+96,12
@@
Probes::Probes(SigSession &session, QWidget *parent) :
// Make a vector of the remaining probes
vector< shared_ptr<Signal> > global_sigs;
// Make a vector of the remaining probes
vector< shared_ptr<Signal> > global_sigs;
- for (const GSList *p = sdi->
probe
s; p; p = p->next)
+ for (const GSList *p = sdi->
channel
s; 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);
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);
const_iterator iter = signal_map.find(probe);
if (iter != signal_map.end())
global_sigs.push_back((*iter).second);
@@
-145,7
+148,7
@@
void Probes::set_all_probes(bool set)
_updating_probes = false;
}
_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;
const vector< shared_ptr<pv::view::Signal> > sigs)
{
using pv::prop::binding::DeviceOptions;
@@
-164,12
+167,12
@@
void Probes::populate_group(const sr_probe_group *group,
_layout.addRow(new QLabel(
QString("<h3>%1</h3>").arg(group->name)));
_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 =
QGridLayout *const probe_grid =
- create_
probe
_group_grid(sigs);
+ create_
channel
_group_grid(sigs);
_layout.addRow(probe_grid);
_layout.addRow(probe_grid);
- // Create the
probe
group options
+ // Create the
channel
group options
if (binding)
{
binding->add_properties_to_form(&_layout, true);
if (binding)
{
binding->add_properties_to_form(&_layout, true);
@@
-177,13
+180,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();
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);
{
assert(sig);