projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable decode support by default
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index f58f4fc38fd60c2ecedce0aefae3bd8468fa6ffa..dce7aa38417753c7927f3eefa0c23cd0369b7ae4 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-115,8
+115,6
@@
void SamplingBar::set_device_list(
}
_updating_device_selector = false;
}
_updating_device_selector = false;
-
- on_device_selected();
}
shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
}
shared_ptr<pv::device::DevInst> SamplingBar::get_selected_device() const
@@
-145,6
+143,8
@@
void SamplingBar::set_selected_device(shared_ptr<pv::device::DevInst> dev_inst)
for (int i = 0; i < _device_selector.count(); i++)
if (dev_inst->dev_inst() ==
_device_selector.itemData(i).value<void*>()) {
for (int i = 0; i < _device_selector.count(); i++)
if (dev_inst->dev_inst() ==
_device_selector.itemData(i).value<void*>()) {
+ // Calling this leads to on_device_selected being
+ // invoked, which updates the sampling bar widgets.
_device_selector.setCurrentIndex(i);
return;
}
_device_selector.setCurrentIndex(i);
return;
}
@@
-264,10
+264,13
@@
void SamplingBar::update_sample_count_selector()
if (_sample_count_supported)
{
if (_sample_count_supported)
{
- uint64_t sample_count =
DefaultSampleCount
;
+ uint64_t sample_count =
_sample_count.value()
;
uint64_t min_sample_count = 0;
uint64_t max_sample_count = MaxSampleCount;
uint64_t min_sample_count = 0;
uint64_t max_sample_count = MaxSampleCount;
+ if (sample_count == 0)
+ sample_count = DefaultSampleCount;
+
if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES)))
{
g_variant_get(gvar, "(tt)",
if ((gvar = dev_inst->list_config(NULL, SR_CONF_LIMIT_SAMPLES)))
{
g_variant_get(gvar, "(tt)",
@@
-316,7
+319,8
@@
void SamplingBar::commit_sample_count()
// Set the sample count
assert(!_updating_sample_count);
_updating_sample_count = true;
// Set the sample count
assert(!_updating_sample_count);
_updating_sample_count = true;
- if (!dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES,
+ if (_sample_count_supported &&
+ !dev_inst->set_config(NULL, SR_CONF_LIMIT_SAMPLES,
g_variant_new_uint64(sample_count))) {
qDebug() << "Failed to configure sample count.";
return;
g_variant_new_uint64(sample_count))) {
qDebug() << "Failed to configure sample count.";
return;