projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show samplerate as 1Hz when its value is unknown
[pulseview.git]
/
pv
/
samplingbar.cpp
diff --git
a/pv/samplingbar.cpp
b/pv/samplingbar.cpp
index 5f9e4371bd691fa98acb52ffb2ac88aa915a0c5d..b406790988e86bd3106d3a4b55ac582e8a34d1e8 100644
(file)
--- a/
pv/samplingbar.cpp
+++ b/
pv/samplingbar.cpp
@@
-18,21
+18,30
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <
assert
.h>
+#include <
extdef
.h>
-#include <
boost/foreach.hpp
>
+#include <
assert.h
>
-extern "C" {
#include <libsigrok/libsigrok.h>
#include <libsigrok/libsigrok.h>
-}
#include <QAction>
#include "samplingbar.h"
#include <QAction>
#include "samplingbar.h"
+#include <pv/dialogs/deviceoptions.h>
+
namespace pv {
namespace pv {
-const uint64_t SamplingBar::RecordLengths[11] = {
+const uint64_t SamplingBar::RecordLengths[20] = {
+ 1000,
+ 2500,
+ 5000,
+ 10000,
+ 25000,
+ 50000,
+ 100000,
+ 250000,
+ 500000,
1000000,
2000000,
5000000,
1000000,
2000000,
5000000,
@@
-43,34
+52,52
@@
const uint64_t SamplingBar::RecordLengths[11] = {
250000000,
500000000,
1000000000,
250000000,
500000000,
1000000000,
- 10000000000
+ 10000000000
ULL,
};
};
+const uint64_t SamplingBar::DefaultRecordLength = 1000000;
+
SamplingBar::SamplingBar(QWidget *parent) :
QToolBar("Sampling Bar", parent),
_device_selector(this),
SamplingBar::SamplingBar(QWidget *parent) :
QToolBar("Sampling Bar", parent),
_device_selector(this),
+ _configure_button(this),
_record_length_selector(this),
_sample_rate_list(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)
{
_run_stop_button(this)
{
- connect(&_run_stop_button, SIGNAL(clicked()), this, SIGNAL(run_stop()));
+ connect(&_run_stop_button, SIGNAL(clicked()),
+ this, SIGNAL(run_stop()));
connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
this, SLOT(on_device_selected()));
connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
this, SLOT(on_device_selected()));
+ connect(&_configure_button, SIGNAL(clicked()),
+ this, SLOT(configure()));
_sample_rate_value.setDecimals(0);
_sample_rate_value.setSuffix("Hz");
_sample_rate_value.setDecimals(0);
_sample_rate_value.setSuffix("Hz");
-
BOOST_FOREACH(uint64_t l, RecordLengths
)
+
for(size_t i = 0; i < countof(RecordLengths); i++
)
{
{
+ const uint64_t &l = RecordLengths[i];
char *const text = sr_si_string_u64(l, " samples");
_record_length_selector.addItem(QString(text),
qVariantFromValue(l));
g_free(text);
char *const text = sr_si_string_u64(l, " samples");
_record_length_selector.addItem(QString(text),
qVariantFromValue(l));
g_free(text);
+
+ if(l == DefaultRecordLength)
+ _record_length_selector.setCurrentIndex(i);
}
set_sampling(false);
}
set_sampling(false);
+ _configure_button.setIcon(QIcon::fromTheme("configure",
+ QIcon(":/icons/configure.png")));
+
+ _run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
addWidget(&_device_selector);
addWidget(&_device_selector);
+ addWidget(&_configure_button);
addWidget(&_record_length_selector);
_sample_rate_list_action = addWidget(&_sample_rate_list);
_sample_rate_value_action = addWidget(&_sample_rate_value);
addWidget(&_record_length_selector);
_sample_rate_list_action = addWidget(&_sample_rate_list);
_sample_rate_value_action = addWidget(&_sample_rate_value);
@@
-120,6
+147,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");
}
@@
-162,7
+190,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;
@@
-194,4
+222,13
@@
void SamplingBar::on_device_selected()
update_sample_rate_selector();
}
update_sample_rate_selector();
}
+void SamplingBar::configure()
+{
+ sr_dev_inst *const sdi = get_selected_device();
+ assert(sdi);
+
+ pv::dialogs::DeviceOptions dlg(this, sdi);
+ dlg.exec();
+}
+
} // namespace pv
} // namespace pv