#include "samplingbar.h"
-#include <pv/dialogs/deviceoptions.h>
+#include <pv/devicemanager.h>
+#include <pv/popups/deviceoptions.h>
+
+using namespace std;
namespace pv {
namespace toolbars {
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),
_record_length_selector(this),
_sample_rate_list(this),
+ _icon_red(":/icons/status-red.svg"),
_icon_green(":/icons/status-green.svg"),
_icon_grey(":/icons/status-grey.svg"),
_run_stop_button(this)
{
connect(&_run_stop_button, SIGNAL(clicked()),
- this, SIGNAL(run_stop()));
+ this, SLOT(on_run_stop()));
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");
_record_length_selector.setCurrentIndex(i);
}
- set_sampling(false);
+ set_capture_state(pv::SigSession::Stopped);
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
+ _probes_button.setIcon(QIcon::fromTheme("probes",
+ QIcon(":/icons/probes.svg")));
_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) {
- QString title;
- if (sdi->vendor && sdi->vendor[0])
- title += sdi->vendor + QString(" ");
- if (sdi->model && sdi->model[0])
- title += sdi->model + QString(" ");
- if (sdi->version && sdi->version[0])
- title += sdi->version + QString(" ");
-
- _device_selector.addItem(title, qVariantFromValue(
- (void*)sdi));
+ const string title = DeviceManager::format_device_title(sdi);
+ _device_selector.addItem(title.c_str(),
+ qVariantFromValue((void*)sdi));
}
+ _updating_device_selector = false;
+
update_sample_rate_selector();
}
return _record_length_selector.itemData(index).value<uint64_t>();
}
-void SamplingBar::set_sampling(bool sampling)
+void SamplingBar::set_capture_state(pv::SigSession::capture_state state)
{
- _run_stop_button.setIcon(sampling ? _icon_green : _icon_grey);
- _run_stop_button.setText(sampling ? "Stop" : "Run");
+ const QIcon *icons[] = {&_icon_grey, &_icon_red, &_icon_green};
+ _run_stop_button.setIcon(*icons[state]);
+ _run_stop_button.setText((state == pv::SigSession::Stopped) ?
+ tr("Run") : tr("Stop"));
}
void SamplingBar::update_sample_rate_selector()
{
const sr_dev_inst *const sdi = get_selected_device();
- const struct sr_samplerates *samplerates;
+ GVariant *gvar_dict, *gvar_list;
+ const uint64_t *elements = NULL;
+ gsize num_elements;
+ QAction *selector_action = NULL;
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
return;
if (sr_config_list(sdi->driver, SR_CONF_SAMPLERATE,
- (const void **)&samplerates, sdi) != SR_OK)
+ &gvar_dict, sdi) != SR_OK)
return;
_sample_rate_list_action->setVisible(false);
_sample_rate_value_action->setVisible(false);
- if (samplerates->step)
- {
- _sample_rate_value.setRange(
- samplerates->low, samplerates->high);
- _sample_rate_value.setSingleStep(samplerates->step);
- _sample_rate_value_action->setVisible(true);
+ if ((gvar_list = g_variant_lookup_value(gvar_dict,
+ "samplerate-steps", G_VARIANT_TYPE("at")))) {
+ elements = (const uint64_t *)g_variant_get_fixed_array(
+ gvar_list, &num_elements, sizeof(uint64_t));
+ _sample_rate_value.setRange(elements[0], elements[1]);
+ _sample_rate_value.setSingleStep(elements[2]);
+ g_variant_unref(gvar_list);
+
+ selector_action = _sample_rate_value_action;
}
- else
+ else if ((gvar_list = g_variant_lookup_value(gvar_dict,
+ "samplerates", G_VARIANT_TYPE("at"))))
{
+ elements = (const uint64_t *)g_variant_get_fixed_array(
+ gvar_list, &num_elements, sizeof(uint64_t));
_sample_rate_list.clear();
- for (const uint64_t *rate = samplerates->list;
- *rate; rate++)
- _sample_rate_list.addItem(
- sr_samplerate_string(*rate),
- qVariantFromValue(*rate));
+
+ for (unsigned int i = 0; i < num_elements; i++)
+ {
+ char *const s = sr_samplerate_string(elements[i]);
+ _sample_rate_list.addItem(QString(s),
+ qVariantFromValue(elements[i]));
+ g_free(s);
+ }
+
_sample_rate_list.show();
- _sample_rate_list_action->setVisible(true);
+ g_variant_unref(gvar_list);
+
+ selector_action = _sample_rate_list_action;
}
+ g_variant_unref(gvar_dict);
update_sample_rate_selector_value();
+
+ // We delay showing the action, so that value change events
+ // are ignored.
+ if (selector_action)
+ selector_action->setVisible(true);
}
void SamplingBar::update_sample_rate_selector_value()
{
sr_dev_inst *const sdi = get_selected_device();
+ GVariant *gvar;
+ uint64_t samplerate;
+
assert(sdi);
- uint64_t *samplerate = NULL;
if (sr_config_get(sdi->driver, SR_CONF_SAMPLERATE,
- (const void**)&samplerate, sdi) != SR_OK) {
+ &gvar, sdi) != SR_OK) {
qDebug() <<
"WARNING: Failed to get value of sample rate";
return;
}
+ samplerate = g_variant_get_uint64(gvar);
+ g_variant_unref(gvar);
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
if (_sample_rate_value_action->isVisible())
- _sample_rate_value.setValue(*samplerate);
+ _sample_rate_value.setValue(samplerate);
else if (_sample_rate_list_action->isVisible())
{
for (int i = 0; i < _sample_rate_list.count(); i++)
- if (*samplerate == _sample_rate_list.itemData(
+ if (samplerate == _sample_rate_list.itemData(
i).value<uint64_t>())
_sample_rate_list.setCurrentIndex(i);
}
index).value<uint64_t>();
}
+ if (sample_rate == 0)
+ return;
+
// Set the samplerate
if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
- &sample_rate) != SR_OK) {
+ g_variant_new_uint64(sample_rate)) != SR_OK) {
qDebug() << "Failed to configure samplerate.";
return;
}
void SamplingBar::on_device_selected()
{
+ using namespace pv::popups;
+
+ if (_updating_device_selector)
+ return;
+
update_sample_rate_selector();
+
+ sr_dev_inst *const sdi = get_selected_device();
+ _session.set_device(sdi);
+
+ _configure_button.set_popup(new DeviceOptions(sdi, this));
+ _probes_button.set_popup(new Probes(_session, this));
}
void SamplingBar::on_sample_rate_changed()
commit_sample_rate();
}
-void SamplingBar::configure()
+void SamplingBar::on_run_stop()
{
- commit_sample_rate();
-
- sr_dev_inst *const sdi = get_selected_device();
- assert(sdi);
-
- pv::dialogs::DeviceOptions dlg(this, sdi);
- dlg.exec();
-
- update_sample_rate_selector_value();
+ commit_sample_rate();
+ run_stop();
}
} // namespace toolbars
projects / pulseview.git / blobdiff