projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
QWellArray: removed unused destructor
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 0754f001e9a1828b3cd2fa66e7d8d9ee497da330..778f7aa1cdf747a74d00995da7d051e5a1ba7deb 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-32,9
+32,10
@@
#include "samplingbar.h"
#include <pv/devicemanager.h>
#include "samplingbar.h"
#include <pv/devicemanager.h>
-#include <pv/dialogs/deviceoptions.h>
+#include <pv/popups/deviceoptions.h>
+#include <pv/popups/probes.h>
-using
namespace std
;
+using
std::string
;
namespace pv {
namespace toolbars {
namespace pv {
namespace toolbars {
@@
-64,12
+65,18
@@
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),
_configure_button(this),
+ _configure_button_action(NULL),
+ _probes_button(this),
_record_length_selector(this),
_record_length_selector(this),
+ _sample_rate_action(NULL),
_sample_rate_list(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)
_icon_green(":/icons/status-green.svg"),
_icon_grey(":/icons/status-grey.svg"),
_run_stop_button(this)
@@
-78,8
+85,6
@@
SamplingBar::SamplingBar(QWidget *parent) :
this, SLOT(on_run_stop()));
connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
this, SLOT(on_device_selected()));
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");
_sample_rate_value.setDecimals(0);
_sample_rate_value.setSuffix("Hz");
@@
-88,7
+93,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);
@@
-96,15
+101,19
@@
SamplingBar::SamplingBar(QWidget *parent) :
_record_length_selector.setCurrentIndex(i);
}
_record_length_selector.setCurrentIndex(i);
}
- set_
sampling(false
);
+ set_
capture_state(pv::SigSession::Stopped
);
_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")));
+
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
- addWidget(&_configure_button);
+ _configure_button_action = 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);
addWidget(&_record_length_selector);
_sample_rate_list_action = addWidget(&_sample_rate_list);
_sample_rate_value_action = addWidget(&_sample_rate_value);
@@
-119,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) {
@@
-127,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
@@
-158,10
+171,12
@@
uint64_t SamplingBar::get_record_length() const
return _record_length_selector.itemData(index).value<uint64_t>();
}
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()
}
void SamplingBar::update_sample_rate_selector()
@@
-170,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);
@@
-178,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);
@@
-193,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"))))
@@
-205,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);
}
@@
-213,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);
@@
-221,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()
@@
-233,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;
@@
-245,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(
@@
-266,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)
@@
-280,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;
@@
-289,26
+303,30
@@
void SamplingBar::commit_sample_rate()
void SamplingBar::on_device_selected()
{
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();
sr_dev_inst *const sdi = get_selected_device();
-
assert
(sdi);
+
_session.set_device
(sdi);
- pv::dialogs::DeviceOptions dlg(this, sdi);
- dlg.exec();
+ // Update the configure popup
+ DeviceOptions *const opts = new DeviceOptions(sdi, this);
+ _configure_button_action->setVisible(
+ !opts->binding().properties().empty());
+ _configure_button.set_popup(opts);
- update_sample_rate_selector_value();
+ // Update the probes popup
+ Probes *const probes = new Probes(_session, this);
+ _probes_button.set_popup(probes);
+}
+
+void SamplingBar::on_sample_rate_changed()
+{
+ commit_sample_rate();
}
void SamplingBar::on_run_stop()
}
void SamplingBar::on_run_stop()