projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename 'probe' to 'channel' everywhere.
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 6d419f74dbef319905f31815956fda229d3398ee..550fc8482d1c7891a586adc8734dac3d684ac352 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-22,8
+22,6
@@
#include <assert.h>
#include <assert.h>
-#include <boost/foreach.hpp>
-
#include <QAction>
#include <QDebug>
#include <QHelpEvent>
#include <QAction>
#include <QDebug>
#include <QHelpEvent>
@@
-34,13
+32,13
@@
#include <pv/devicemanager.h>
#include <pv/device/devinst.h>
#include <pv/popups/deviceoptions.h>
#include <pv/devicemanager.h>
#include <pv/device/devinst.h>
#include <pv/popups/deviceoptions.h>
-#include <pv/popups/
probe
s.h>
+#include <pv/popups/
channel
s.h>
#include <pv/util.h>
#include <pv/util.h>
-using boost::shared_ptr;
using std::map;
using std::max;
using std::min;
using std::map;
using std::max;
using std::min;
+using std::shared_ptr;
using std::string;
namespace pv {
using std::string;
namespace pv {
@@
-57,7
+55,7
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
_updating_device_selector(false),
_configure_button(this),
_configure_button_action(NULL),
_updating_device_selector(false),
_configure_button(this),
_configure_button_action(NULL),
- _
probe
s_button(this),
+ _
channel
s_button(this),
_sample_count(" samples", this),
_sample_rate("Hz", this),
_updating_sample_rate(false),
_sample_count(" samples", this),
_sample_rate("Hz", this),
_updating_sample_rate(false),
@@
-84,14
+82,14
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
- _
probes_button.setIcon(QIcon::fromTheme("probe
s",
- QIcon(":/icons/
probe
s.svg")));
+ _
channels_button.setIcon(QIcon::fromTheme("channel
s",
+ QIcon(":/icons/
channel
s.svg")));
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
_configure_button_action = addWidget(&_configure_button);
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
_configure_button_action = addWidget(&_configure_button);
- addWidget(&_
probe
s_button);
+ addWidget(&_
channel
s_button);
addWidget(&_sample_count);
addWidget(&_sample_rate);
addWidget(&_sample_count);
addWidget(&_sample_rate);
@@
-114,7
+112,7
@@
void SamplingBar::set_device_list(
_device_selector.clear();
_device_selector_map.clear();
_device_selector.clear();
_device_selector_map.clear();
-
BOOST_FOREACH (shared_ptr<pv::device::DevInst> dev_inst,
devices) {
+
for (shared_ptr<pv::device::DevInst> dev_inst :
devices) {
assert(dev_inst);
const string title = dev_inst->format_device_title();
const sr_dev_inst *sdi = dev_inst->dev_inst();
assert(dev_inst);
const string title = dev_inst->format_device_title();
const sr_dev_inst *sdi = dev_inst->dev_inst();
@@
-324,9
+322,9
@@
void SamplingBar::update_device_config_widgets()
!opts->binding().properties().empty());
_configure_button.set_popup(opts);
!opts->binding().properties().empty());
_configure_button.set_popup(opts);
- // Update the
probe
s popup
-
Probes *const probes = new Probe
s(_session, this);
- _
probes_button.set_popup(probe
s);
+ // Update the
channel
s popup
+
Channels *const channels = new Channel
s(_session, this);
+ _
channels_button.set_popup(channel
s);
// Update supported options.
_sample_count_supported = false;
// Update supported options.
_sample_count_supported = false;