#include "samplingbar.h"
+#include <pv/devicemanager.h>
#include <pv/dialogs/deviceoptions.h>
+using namespace std;
+
namespace pv {
namespace toolbars {
_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()));
+ this, SLOT(on_configure()));
_sample_rate_value.setDecimals(0);
_sample_rate_value.setSuffix("Hz");
_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));
}
update_sample_rate_selector();
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);
gvar_list, &num_elements, sizeof(uint64_t));
_sample_rate_value.setRange(elements[0], elements[1]);
_sample_rate_value.setSingleStep(elements[2]);
- _sample_rate_value_action->setVisible(true);
g_variant_unref(gvar_list);
+
+ selector_action = _sample_rate_value_action;
}
else if ((gvar_list = g_variant_lookup_value(gvar_dict,
"samplerates", G_VARIANT_TYPE("at"))))
}
_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()
index).value<uint64_t>();
}
+ if (sample_rate == 0)
+ return;
+
// Set the samplerate
if (sr_config_set(sdi, SR_CONF_SAMPLERATE,
g_variant_new_uint64(sample_rate)) != SR_OK) {
void SamplingBar::on_device_selected()
{
update_sample_rate_selector();
+ device_selected();
}
void SamplingBar::on_sample_rate_changed()
commit_sample_rate();
}
-void SamplingBar::configure()
+void SamplingBar::on_configure()
{
commit_sample_rate();
update_sample_rate_selector_value();
}
+void SamplingBar::on_run_stop()
+{
+ commit_sample_rate();
+ run_stop();
+}
+
} // namespace toolbars
} // namespace pv