No longer need to set sample limit on session start.

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

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index a61a949eabc0ef8538d9c2ac0fa5343f81cfccf7..41630bcab92703d7a7ff44a1ae02c47192c912db 100644 (file)
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -30,10 +30,17 @@
 #include <QToolBar>
 #include <QToolButton>
 
+#include <pv/sigsession.h>
+#include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
+
 struct st_dev_inst;
 class QAction;
 
 namespace pv {
+
+class SigSession;
+
 namespace toolbars {
 
 class SamplingBar : public QToolBar
@@ -41,20 +48,17 @@ class SamplingBar : public QToolBar
        Q_OBJECT
 
 private:
-       static const uint64_t RecordLengths[20];
        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);
 
        struct sr_dev_inst* get_selected_device() const;
        void set_selected_device(struct sr_dev_inst *const sdi);
 
-       uint64_t get_record_length() const;
-
-       void set_sampling(bool sampling);
+       void set_capture_state(pv::SigSession::capture_state state);
 
 signals:
        void run_stop();
@@ -62,25 +66,33 @@ signals:
 private:
        void update_sample_rate_selector();
        void update_sample_rate_selector_value();
+       void update_sample_count_selector();
        void commit_sample_rate();
+       void commit_sample_count();
 
 private slots:
        void on_device_selected();
+       void on_sample_count_changed();
        void on_sample_rate_changed();
-       void on_configure();
        void on_run_stop();
 
 private:
+       SigSession &_session;
+
        QComboBox _device_selector;
-       QToolButton _configure_button;
+       bool _updating_device_selector;
+
+       pv::widgets::PopupToolButton _configure_button;
+       QAction *_configure_button_action;
 
-       QComboBox _record_length_selector;
+       pv::widgets::PopupToolButton _probes_button;
 
-       QComboBox _sample_rate_list;
-       QAction *_sample_rate_list_action;
-       QDoubleSpinBox _sample_rate_value;
-       QAction *_sample_rate_value_action;
+       pv::widgets::SweepTimingWidget _sample_count;
+       pv::widgets::SweepTimingWidget _sample_rate;
+       bool _updating_sample_rate;
+       bool _updating_sample_count;
 
+       QIcon _icon_red;
        QIcon _icon_green;
        QIcon _icon_grey;
        QToolButton _run_stop_button;