projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced using namespace with using class directives
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index ae4f298b6f2eae30f744ce4636e344459b87b5c6..ca0450b43c2f751aff4b9f93383819ef1dfe2a2e 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-34,7
+34,7
@@
#include <pv/devicemanager.h>
#include <pv/popups/deviceoptions.h>
#include <pv/devicemanager.h>
#include <pv/popups/deviceoptions.h>
-using
namespace std
;
+using
std::string
;
namespace pv {
namespace toolbars {
namespace pv {
namespace toolbars {
@@
-64,12
+64,16
@@
const uint64_t SamplingBar::RecordLengths[20] = {
const uint64_t SamplingBar::DefaultRecordLength = 1000000;
const uint64_t SamplingBar::DefaultRecordLength = 1000000;
-SamplingBar::SamplingBar(QWidget *parent) :
+SamplingBar::SamplingBar(
SigSession &session,
QWidget *parent) :
QToolBar("Sampling Bar", parent),
QToolBar("Sampling Bar", parent),
+ _session(session),
_device_selector(this),
_device_selector(this),
+ _updating_device_selector(false),
_configure_button(this),
_probes_button(this),
_configure_button(this),
_probes_button(this),
+ _probes_popup(_session, this),
_record_length_selector(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"),
_sample_rate_list(this),
_icon_red(":/icons/status-red.svg"),
_icon_green(":/icons/status-green.svg"),
@@
-88,7
+92,7
@@
SamplingBar::SamplingBar(QWidget *parent) :
{
const uint64_t &l = RecordLengths[i];
char *const text = sr_si_string_u64(l, " samples");
{
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);
qVariantFromValue(l));
g_free(text);
@@
-100,8
+104,10
@@
SamplingBar::SamplingBar(QWidget *parent) :
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
_configure_button.setIcon(QIcon::fromTheme("configure",
QIcon(":/icons/configure.png")));
+
_probes_button.setIcon(QIcon::fromTheme("probes",
QIcon(":/icons/probes.svg")));
_probes_button.setIcon(QIcon::fromTheme("probes",
QIcon(":/icons/probes.svg")));
+ _probes_button.set_popup(&_probes_popup);
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
@@
-122,6
+128,8
@@
SamplingBar::SamplingBar(QWidget *parent) :
void SamplingBar::set_device_list(
const std::list<struct sr_dev_inst*> &devices)
{
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) {
_device_selector.clear();
BOOST_FOREACH (sr_dev_inst *sdi, devices) {
@@
-130,7
+138,9
@@
void SamplingBar::set_device_list(
qVariantFromValue((void*)sdi));
}
qVariantFromValue((void*)sdi));
}
- update_sample_rate_selector();
+ _updating_device_selector = false;
+
+ on_device_selected();
}
struct sr_dev_inst* SamplingBar::get_selected_device() const
}
struct sr_dev_inst* SamplingBar::get_selected_device() const
@@
-175,7
+185,6
@@
void SamplingBar::update_sample_rate_selector()
GVariant *gvar_dict, *gvar_list;
const uint64_t *elements = NULL;
gsize num_elements;
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);
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
@@
-183,8
+192,8
@@
void SamplingBar::update_sample_rate_selector()
if (!sdi)
return;
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);
return;
_sample_rate_list_action->setVisible(false);
@@
-198,7
+207,7
@@
void SamplingBar::update_sample_rate_selector()
_sample_rate_value.setSingleStep(elements[2]);
g_variant_unref(gvar_list);
_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"))))
}
else if ((gvar_list = g_variant_lookup_value(gvar_dict,
"samplerates", G_VARIANT_TYPE("at"))))
@@
-210,7
+219,7
@@
void SamplingBar::update_sample_rate_selector()
for (unsigned int i = 0; i < num_elements; i++)
{
char *const s = sr_samplerate_string(elements[i]);
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);
}
qVariantFromValue(elements[i]));
g_free(s);
}
@@
-218,7
+227,7
@@
void SamplingBar::update_sample_rate_selector()
_sample_rate_list.show();
g_variant_unref(gvar_list);
_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);
}
g_variant_unref(gvar_dict);
@@
-226,8
+235,8
@@
void SamplingBar::update_sample_rate_selector()
// We delay showing the action, so that value change events
// are ignored.
// 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()
}
void SamplingBar::update_sample_rate_selector_value()
@@
-238,8
+247,8
@@
void SamplingBar::update_sample_rate_selector_value()
assert(sdi);
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;
qDebug() <<
"WARNING: Failed to get value of sample rate";
return;
@@
-250,9
+259,9
@@
void SamplingBar::update_sample_rate_selector_value()
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
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);
_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(
{
for (int i = 0; i < _sample_rate_list.count(); i++)
if (samplerate == _sample_rate_list.itemData(
@@
-271,9
+280,9
@@
void SamplingBar::commit_sample_rate()
assert(_sample_rate_value_action);
assert(_sample_rate_list_action);
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();
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)
{
const int index = _sample_rate_list.currentIndex();
if (index >= 0)
@@
-285,7
+294,7
@@
void SamplingBar::commit_sample_rate()
return;
// Set the samplerate
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;
g_variant_new_uint64(sample_rate)) != SR_OK) {
qDebug() << "Failed to configure samplerate.";
return;
@@
-294,16
+303,17
@@
void SamplingBar::commit_sample_rate()
void SamplingBar::on_device_selected()
{
void SamplingBar::on_device_selected()
{
- using namespace pv::popups;
+ using pv::popups::DeviceOptions;
+
+ if (_updating_device_selector)
+ return;
update_sample_rate_selector();
sr_dev_inst *const sdi = get_selected_device();
update_sample_rate_selector();
sr_dev_inst *const sdi = get_selected_device();
+ _session.set_device(sdi);
_configure_button.set_popup(new DeviceOptions(sdi, this));
_configure_button.set_popup(new DeviceOptions(sdi, this));
- _probes_button.set_popup(new Probes(sdi, this));
-
- device_selected();
}
void SamplingBar::on_sample_rate_changed()
}
void SamplingBar::on_sample_rate_changed()