#include <pv/devicemanager.h>
#include <pv/popups/deviceoptions.h>
-using namespace std;
+using std::string;
namespace pv {
namespace toolbars {
_probes_button(this),
_probes_popup(_session, this),
_record_length_selector(this),
+ _sample_rate_action(NULL),
_sample_rate_list(this),
_icon_red(":/icons/status-red.svg"),
_icon_green(":/icons/status-green.svg"),
{
const uint64_t &l = RecordLengths[i];
char *const text = sr_si_string_u64(l, " samples");
- _record_length_selector.addItem(QString(text),
+ _record_length_selector.addItem(QString::fromUtf8(text),
qVariantFromValue(l));
g_free(text);
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);
_sample_rate_value.setSingleStep(elements[2]);
g_variant_unref(gvar_list);
- selector_action = _sample_rate_value_action;
+ _sample_rate_action = _sample_rate_value_action;
}
else if ((gvar_list = g_variant_lookup_value(gvar_dict,
"samplerates", G_VARIANT_TYPE("at"))))
for (unsigned int i = 0; i < num_elements; i++)
{
char *const s = sr_samplerate_string(elements[i]);
- _sample_rate_list.addItem(QString(s),
+ _sample_rate_list.addItem(QString::fromUtf8(s),
qVariantFromValue(elements[i]));
g_free(s);
}
_sample_rate_list.show();
g_variant_unref(gvar_list);
- selector_action = _sample_rate_list_action;
+ _sample_rate_action = _sample_rate_list_action;
}
g_variant_unref(gvar_dict);
// We delay showing the action, so that value change events
// are ignored.
- if (selector_action)
- selector_action->setVisible(true);
+ if (_sample_rate_action)
+ _sample_rate_action->setVisible(true);
}
void SamplingBar::update_sample_rate_selector_value()
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
- if (_sample_rate_value_action->isVisible())
+ if (_sample_rate_action == _sample_rate_value_action)
_sample_rate_value.setValue(samplerate);
- else if (_sample_rate_list_action->isVisible())
+ else if (_sample_rate_action == _sample_rate_list_action)
{
for (int i = 0; i < _sample_rate_list.count(); i++)
if (samplerate == _sample_rate_list.itemData(
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
- if (_sample_rate_value_action->isVisible())
+ if (_sample_rate_action == _sample_rate_value_action)
sample_rate = (uint64_t)_sample_rate_value.value();
- else if (_sample_rate_list_action->isVisible())
+ else if (_sample_rate_action == _sample_rate_list_action)
{
const int index = _sample_rate_list.currentIndex();
if (index >= 0)
void SamplingBar::on_device_selected()
{
- using namespace pv::popups;
+ using pv::popups::DeviceOptions;
if (_updating_device_selector)
return;