projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index cf425775aeb83bbb01bca1413b8c4eb718bb2c22..2397e2aa5c20b6821b4e2159f20bd9598a5346fd 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-24,6
+24,7
@@
#include <stdint.h>
#include <list>
#include <stdint.h>
#include <list>
+#include <memory>
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QDoubleSpinBox>
@@
-34,7
+35,12
@@
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/sweeptimingwidget.h>
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/sweeptimingwidget.h>
-struct st_dev_inst;
+namespace sigrok {
+ class Device;
+}
+
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
+
class QAction;
namespace pv {
class QAction;
namespace pv {
@@
-48,56
+54,65
@@
class SamplingBar : public QToolBar
Q_OBJECT
private:
Q_OBJECT
private:
- static const uint64_t DefaultRecordLength;
+ static const uint64_t MinSampleCount;
+ static const uint64_t MaxSampleCount;
+ static const uint64_t DefaultSampleCount;
public:
SamplingBar(SigSession &session, QWidget *parent);
public:
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);
+ void set_device_list(
+ const std::list< std::pair<std::shared_ptr<sigrok::Device>, std::string> > &devices,
+ std::shared_ptr<sigrok::Device> selected);
-
uint64_t get_record_length
() const;
+
std::shared_ptr<sigrok::Device> get_selected_device
() const;
void set_capture_state(pv::SigSession::capture_state state);
void set_capture_state(pv::SigSession::capture_state state);
-
signals
:
+
Q_SIGNALS
:
void run_stop();
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
void update_sample_count_selector();
void run_stop();
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
void update_sample_count_selector();
+ void update_device_config_widgets();
void commit_sample_rate();
void commit_sample_count();
void commit_sample_rate();
void commit_sample_count();
-private
slots
:
+private
Q_SLOTS
:
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_run_stop();
void on_device_selected();
void on_sample_count_changed();
void on_sample_rate_changed();
void on_run_stop();
+ void on_config_changed();
+
+protected:
+ bool eventFilter(QObject *watched, QEvent *event);
+
private:
private:
- SigSession &_session;
+ SigSession &session_;
+
+ QComboBox device_selector_;
+ bool updating_device_selector_;
-
QComboBox _device_selector
;
-
bool _updating_device_selector
;
+
pv::widgets::PopupToolButton configure_button_
;
+
QAction *configure_button_action_
;
- pv::widgets::PopupToolButton _configure_button;
- QAction *_configure_button_action;
+ pv::widgets::PopupToolButton channels_button_;
- pv::widgets::PopupToolButton _probes_button;
+ pv::widgets::SweepTimingWidget sample_count_;
+ pv::widgets::SweepTimingWidget sample_rate_;
+ bool updating_sample_rate_;
+ bool updating_sample_count_;
- pv::widgets::SweepTimingWidget _sample_count;
- pv::widgets::SweepTimingWidget _sample_rate;
- bool _updating_sample_rate;
- bool _updating_sample_count;
+ bool sample_count_supported_;
- QIcon
_icon_red
;
- QIcon
_icon_green
;
- QIcon
_icon_grey
;
- QToolButton
_run_stop_button
;
+ QIcon
icon_red_
;
+ QIcon
icon_green_
;
+ QIcon
icon_grey_
;
+ QToolButton
run_stop_button_
;
};
} // namespace toolbars
};
} // namespace toolbars