projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: Add signal handler for SIGINT
[pulseview.git]
/
pv
/
samplingbar.cpp
diff --git
a/pv/samplingbar.cpp
b/pv/samplingbar.cpp
index 08cb0f34e015121af17b0ef9777bdc563051d1b7..6195d8999179ec5c18d6ac83ea42ec977283e773 100644
(file)
--- a/
pv/samplingbar.cpp
+++ b/
pv/samplingbar.cpp
@@
-30,7
+30,7
@@
extern "C" {
#include "samplingbar.h"
#include "samplingbar.h"
-#include <pv/dialogs/
hwcap
.h>
+#include <pv/dialogs/
deviceoptions
.h>
namespace pv {
namespace pv {
@@
-45,7
+45,7
@@
const uint64_t SamplingBar::RecordLengths[11] = {
250000000,
500000000,
1000000000,
250000000,
500000000,
1000000000,
- 10000000000
+ 10000000000
ULL,
};
SamplingBar::SamplingBar(QWidget *parent) :
};
SamplingBar::SamplingBar(QWidget *parent) :
@@
-54,6
+54,8
@@
SamplingBar::SamplingBar(QWidget *parent) :
_configure_button(this),
_record_length_selector(this),
_sample_rate_list(this),
_configure_button(this),
_record_length_selector(this),
_sample_rate_list(this),
+ _icon_green(":/icons/status-green.svg"),
+ _icon_grey(":/icons/status-grey.svg"),
_run_stop_button(this)
{
connect(&_run_stop_button, SIGNAL(clicked()),
_run_stop_button(this)
{
connect(&_run_stop_button, SIGNAL(clicked()),
@@
-79,6
+81,8
@@
SamplingBar::SamplingBar(QWidget *parent) :
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
+ _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
addWidget(&_device_selector);
addWidget(&_configure_button);
addWidget(&_record_length_selector);
addWidget(&_device_selector);
addWidget(&_configure_button);
addWidget(&_record_length_selector);
@@
-130,6
+134,7
@@
uint64_t SamplingBar::get_sample_rate() const
void SamplingBar::set_sampling(bool sampling)
{
void SamplingBar::set_sampling(bool sampling)
{
+ _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
_run_stop_button.setText(sampling ? "Stop" : "Run");
}
_run_stop_button.setText(sampling ? "Stop" : "Run");
}
@@
-172,7
+177,7
@@
void SamplingBar::update_sample_rate_selector()
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
- if (sr_
info_get(sdi->driver, SR_DI_SAMPLERATES
,
+ if (sr_
config_list(sdi->driver, SR_CONF_SAMPLERATE
,
(const void **)&samplerates, sdi) != SR_OK)
return;
(const void **)&samplerates, sdi) != SR_OK)
return;
@@
-209,7
+214,7
@@
void SamplingBar::configure()
sr_dev_inst *const sdi = get_selected_device();
assert(sdi);
sr_dev_inst *const sdi = get_selected_device();
assert(sdi);
- pv::dialogs::
HwCap
dlg(this, sdi);
+ pv::dialogs::
DeviceOptions
dlg(this, sdi);
dlg.exec();
}
dlg.exec();
}