#include "samplingbar.h"
#include <pv/devicemanager.h>
-#include <pv/dialogs/deviceoptions.h>
+#include <pv/popups/deviceoptions.h>
using namespace std;
const uint64_t SamplingBar::DefaultRecordLength = 1000000;
-SamplingBar::SamplingBar(QWidget *parent) :
+SamplingBar::SamplingBar(SigSession &session, QWidget *parent) :
QToolBar("Sampling Bar", parent),
+ _session(session),
_device_selector(this),
+ _updating_device_selector(false),
_configure_button(this),
+ _probes_button(this),
+ _probes_popup(_session, this),
_record_length_selector(this),
_sample_rate_list(this),
_icon_red(":/icons/status-red.svg"),
this, SLOT(on_run_stop()));
connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
this, SLOT(on_device_selected()));
- connect(&_configure_button, SIGNAL(clicked()),
- this, SLOT(on_configure()));
_sample_rate_value.setDecimals(0);
_sample_rate_value.setSuffix("Hz");
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
+ _probes_button.setIcon(QIcon::fromTheme("probes",
+ QIcon(":/icons/probes.svg")));
+ _probes_button.set_popup(&_probes_popup);
+
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
addWidget(&_configure_button);
+ addWidget(&_probes_button);
addWidget(&_record_length_selector);
_sample_rate_list_action = addWidget(&_sample_rate_list);
_sample_rate_value_action = addWidget(&_sample_rate_value);
void SamplingBar::set_device_list(
const std::list<struct sr_dev_inst*> &devices)
{
+ _updating_device_selector = true;
+
_device_selector.clear();
BOOST_FOREACH (sr_dev_inst *sdi, devices) {
qVariantFromValue((void*)sdi));
}
- update_sample_rate_selector();
+ _updating_device_selector = false;
+
+ on_device_selected();
}
struct sr_dev_inst* SamplingBar::get_selected_device() const
if (!sdi)
return;
- if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
- &gvar_dict, sdi) != SR_OK)
+ if (sr_config_list(sdi->driver, sdi, NULL,
+ SR_CONF_SAMPLERATE, &gvar_dict) != SR_OK)
return;
_sample_rate_list_action->setVisible(false);
assert(sdi);
- if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
- &gvar, sdi) != SR_OK) {
+ if (sr_config_get(sdi->driver, sdi, NULL,
+ SR_CONF_SAMPLERATE, &gvar) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of sample rate";
return;
return;
// Set the samplerate
- if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
+ if (sr_config_set(sdi, NULL, SR_CONF_SAMPLERATE,
g_variant_new_uint64(sample_rate)) != SR_OK) {
qDebug() << "Failed to configure samplerate.";
return;
void SamplingBar::on_device_selected()
{
- update_sample_rate_selector();
- device_selected();
-}
+ using namespace pv::popups;
-void SamplingBar::on_sample_rate_changed()
-{
- commit_sample_rate();
-}
+ if (_updating_device_selector)
+ return;
-void SamplingBar::on_configure()
-{
- commit_sample_rate();
+ update_sample_rate_selector();
sr_dev_inst *const sdi = get_selected_device();
- assert(sdi);
+ _session.set_device(sdi);
- pv::dialogs::DeviceOptions dlg(this, sdi);
- dlg.exec();
+ _configure_button.set_popup(new DeviceOptions(sdi, this));
+}
- update_sample_rate_selector_value();
+void SamplingBar::on_sample_rate_changed()
+{
+ commit_sample_rate();
}
void SamplingBar::on_run_stop()