Fix segfault in connect device dialog

[pulseview.git] / pv / toolbars / samplingbar.h

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 3502e25b8fa6655d3a1f8dff83a12a29f7422ac8..806a79a6c57547626d6175a9ec6c8ab0ba5fcecb 100644 (file)
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -30,10 +30,17 @@
 #include <QToolBar>
 #include <QToolButton>
 
 #include <QToolBar>
 #include <QToolButton>
 

+#include <pv/sigsession.h>
+#include <pv/popups/probes.h>
+#include <pv/widgets/popuptoolbutton.h>
+

 struct st_dev_inst;
 class QAction;
 
 namespace pv {
 struct st_dev_inst;
 class QAction;
 
 namespace pv {

+
+class SigSession;
+

 namespace toolbars {
 
 class SamplingBar : public QToolBar
 namespace toolbars {
 
 class SamplingBar : public QToolBar


@@ -45,7 +52,7 @@ private:
        static const uint64_t DefaultRecordLength;
 
 public:
        static const uint64_t DefaultRecordLength;
 
 public:

-       SamplingBar(QWidget *parent);
+       SamplingBar(SigSession &session, QWidget *parent);

 
        void set_device_list(const std::list<struct sr_dev_inst*> &devices);
 
 
        void set_device_list(const std::list<struct sr_dev_inst*> &devices);
 


@@ -54,7 +61,7 @@ public:
 
        uint64_t get_record_length() const;
 
 
        uint64_t get_record_length() const;
 

-       void set_sampling(bool sampling);
+       void set_capture_state(pv::SigSession::capture_state state);

 
 signals:
        void run_stop();
 
 signals:
        void run_stop();


@@ -67,11 +74,16 @@ private:
 private slots:
        void on_device_selected();
        void on_sample_rate_changed();
 private slots:
        void on_device_selected();
        void on_sample_rate_changed();

-       void configure();
+       void on_run_stop();

 
 private:
 
 private:

+       SigSession &_session;
+

        QComboBox _device_selector;
        QComboBox _device_selector;

-       QToolButton _configure_button;
+       bool _updating_device_selector;
+
+       pv::widgets::PopupToolButton _configure_button;
+       pv::widgets::PopupToolButton _probes_button;

 
        QComboBox _record_length_selector;
 
 
        QComboBox _record_length_selector;
 


@@ -80,6 +92,7 @@ private:
        QDoubleSpinBox _sample_rate_value;
        QAction *_sample_rate_value_action;
 
        QDoubleSpinBox _sample_rate_value;
        QAction *_sample_rate_value_action;
 

+       QIcon _icon_red;

        QIcon _icon_green;
        QIcon _icon_grey;
        QToolButton _run_stop_button;
        QIcon _icon_green;
        QIcon _icon_grey;
        QToolButton _run_stop_button;