projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix segfault in connect device dialog
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.cpp
diff --git
a/pv/toolbars/samplingbar.cpp
b/pv/toolbars/samplingbar.cpp
index 7d94594c1509765bce99f158d516d86f7ccfdb5d..bafb9cd406bf05f9c76b54f2d91156e34d593e93 100644
(file)
--- a/
pv/toolbars/samplingbar.cpp
+++ b/
pv/toolbars/samplingbar.cpp
@@
-32,7
+32,7
@@
#include "samplingbar.h"
#include <pv/devicemanager.h>
#include "samplingbar.h"
#include <pv/devicemanager.h>
-#include <pv/
dialog
s/deviceoptions.h>
+#include <pv/
popup
s/deviceoptions.h>
using namespace std;
using namespace std;
@@
-64,10
+64,13
@@
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),
+ _probes_button(this),
_record_length_selector(this),
_sample_rate_list(this),
_icon_red(":/icons/status-red.svg"),
_record_length_selector(this),
_sample_rate_list(this),
_icon_red(":/icons/status-red.svg"),
@@
-79,8
+82,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");
@@
-101,11
+102,14
@@
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")));
_run_stop_button.setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
addWidget(&_device_selector);
addWidget(&_configure_button);
_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);
addWidget(&_record_length_selector);
_sample_rate_list_action = addWidget(&_sample_rate_list);
_sample_rate_value_action = addWidget(&_sample_rate_value);
@@
-120,6
+124,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) {
@@
-128,6
+134,8
@@
void SamplingBar::set_device_list(
qVariantFromValue((void*)sdi));
}
qVariantFromValue((void*)sdi));
}
+ _updating_device_selector = false;
+
update_sample_rate_selector();
}
update_sample_rate_selector();
}
@@
-292,26
+300,23
@@
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();
+ _configure_button.set_popup(new DeviceOptions(sdi, this));
+ _probes_button.set_popup(new Probes(_session, this));
+}
- update_sample_rate_selector_value();
+void SamplingBar::on_sample_rate_changed()
+{
+ commit_sample_rate();
}
void SamplingBar::on_run_stop()
}
void SamplingBar::on_run_stop()