projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set PopupToolButton::_popup to NULL at construction
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index e55bbda8316cb4482dd9f9ec2ef4b57a46773d12..dce7aa38417753c7927f3eefa0c23cd0369b7ae4 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-30,7
+30,7
@@
#include "samplingbar.h"
#include <pv/devicemanager.h>
#include "samplingbar.h"
#include <pv/devicemanager.h>
-#include <pv/devinst.h>
+#include <pv/devi
ce/devi
nst.h>
#include <pv/popups/deviceoptions.h>
#include <pv/popups/probes.h>
#include <pv/popups/deviceoptions.h>
#include <pv/popups/probes.h>
@@
-96,14
+96,14
@@
SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
}
void SamplingBar::set_device_list(
}
void SamplingBar::set_device_list(
- const std::list< shared_ptr<pv::DevInst> > &devices)
+ const std::list< shared_ptr<pv::
device::
DevInst> > &devices)
{
_updating_device_selector = true;
_device_selector.clear();
_device_selector_map.clear();
{
_updating_device_selector = true;
_device_selector.clear();
_device_selector_map.clear();
- BOOST_FOREACH (shared_ptr<pv::DevInst> dev_inst, devices) {
+ BOOST_FOREACH (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();
@@
-115,36
+115,36
@@
void SamplingBar::set_device_list(
}
_updating_device_selector = false;
}
_updating_device_selector = false;
-
- on_device_selected();
}
}
-shared_ptr<pv::DevInst> SamplingBar::get_selected_device() const
+shared_ptr<pv::
device::
DevInst> SamplingBar::get_selected_device() const
{
const int index = _device_selector.currentIndex();
if (index < 0)
{
const int index = _device_selector.currentIndex();
if (index < 0)
- return shared_ptr<pv::DevInst>();
+ return shared_ptr<pv::
device::
DevInst>();
const sr_dev_inst *const sdi =
(const sr_dev_inst*)_device_selector.itemData(
index).value<void*>();
assert(sdi);
const sr_dev_inst *const sdi =
(const sr_dev_inst*)_device_selector.itemData(
index).value<void*>();
assert(sdi);
- map<const sr_dev_inst*, boost::weak_ptr<DevInst> >::
+ map<const sr_dev_inst*, boost::weak_ptr<
device::
DevInst> >::
const_iterator iter = _device_selector_map.find(sdi);
if (iter == _device_selector_map.end())
const_iterator iter = _device_selector_map.find(sdi);
if (iter == _device_selector_map.end())
- return shared_ptr<pv::DevInst>();
+ return shared_ptr<pv::
device::
DevInst>();
- return shared_ptr<pv::DevInst>((*iter).second);
+ return shared_ptr<pv::
device::
DevInst>((*iter).second);
}
}
-void SamplingBar::set_selected_device(
boost::shared_ptr<pv
::DevInst> dev_inst)
+void SamplingBar::set_selected_device(
shared_ptr<pv::device
::DevInst> dev_inst)
{
assert(dev_inst);
for (int i = 0; i < _device_selector.count(); i++)
if (dev_inst->dev_inst() ==
_device_selector.itemData(i).value<void*>()) {
{
assert(dev_inst);
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;
}
@@
-167,7
+167,7
@@
void SamplingBar::update_sample_rate_selector()
if (_updating_sample_rate)
return;
if (_updating_sample_rate)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<
device::
DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
if (!dev_inst)
return;
@@
-231,7
+231,7
@@
void SamplingBar::update_sample_rate_selector_value()
if (_updating_sample_rate)
return;
if (_updating_sample_rate)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<
device::
DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
if (!dev_inst)
return;
@@
-255,7
+255,7
@@
void SamplingBar::update_sample_count_selector()
if (_updating_sample_count)
return;
if (_updating_sample_count)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<
device::
DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
if (!dev_inst)
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)",
@@
-307,7
+310,7
@@
void SamplingBar::commit_sample_count()
if (_updating_sample_count)
return;
if (_updating_sample_count)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<
device::
DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
if (!dev_inst)
return;
@@
-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;
@@
-331,7
+335,7
@@
void SamplingBar::commit_sample_rate()
if (_updating_sample_rate)
return;
if (_updating_sample_rate)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<
device::
DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
if (!dev_inst)
return;
@@
-359,7
+363,7
@@
void SamplingBar::on_device_selected()
if (_updating_device_selector)
return;
if (_updating_device_selector)
return;
- const shared_ptr<DevInst> dev_inst = get_selected_device();
+ const shared_ptr<
device::
DevInst> dev_inst = get_selected_device();
if (!dev_inst)
return;
if (!dev_inst)
return;
@@
-398,6
+402,11
@@
void SamplingBar::on_device_selected()
}
}
}
}
+ // Add notification of reconfigure events
+ disconnect(this, SLOT(on_config_changed()));
+ connect(dev_inst.get(), SIGNAL(config_changed()),
+ this, SLOT(on_config_changed()));
+
// Update sweep timing widgets.
update_sample_count_selector();
update_sample_rate_selector();
// Update sweep timing widgets.
update_sample_count_selector();
update_sample_rate_selector();
@@
-420,5
+429,13
@@
void SamplingBar::on_run_stop()
run_stop();
}
run_stop();
}
+void SamplingBar::on_config_changed()
+{
+ commit_sample_count();
+ update_sample_count_selector();
+ commit_sample_rate();
+ update_sample_rate_selector();
+}
+
} // namespace toolbars
} // namespace pv
} // namespace toolbars
} // namespace pv