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 367b9b2e6fe4b12ac2d9481af81a7eaa8fc09eef..550fc8482d1c7891a586adc8734dac3d684ac352 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-32,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 {
@@
-55,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),
@@
-82,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);
@@
-322,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;