projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use <cstdlib> for std::abs() on integer datatypes.
[pulseview.git]
/
pv
/
toolbars
/
samplingbar.h
diff --git
a/pv/toolbars/samplingbar.h
b/pv/toolbars/samplingbar.h
index e4aa40d48a869e59c557ebd187fef13a0dab8df8..7c0ec9af2d75a2d29577e7d5126f1b2c78c717ee 100644
(file)
--- a/
pv/toolbars/samplingbar.h
+++ b/
pv/toolbars/samplingbar.h
@@
-23,7
+23,8
@@
#include <stdint.h>
#include <stdint.h>
-#include <list>
+#include <map>
+#include <memory>
#include <QComboBox>
#include <QDoubleSpinBox>
#include <QComboBox>
#include <QDoubleSpinBox>
@@
-31,10
+32,15
@@
#include <QToolButton>
#include <pv/sigsession.h>
#include <QToolButton>
#include <pv/sigsession.h>
-#include <pv/popups/probes.h>
#include <pv/widgets/popuptoolbutton.h>
#include <pv/widgets/popuptoolbutton.h>
+#include <pv/widgets/sweeptimingwidget.h>
+
+namespace sigrok {
+ class Device;
+}
+
+Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
-struct st_dev_inst;
class QAction;
namespace pv {
class QAction;
namespace pv {
@@
-48,34
+54,44
@@
class SamplingBar : public QToolBar
Q_OBJECT
private:
Q_OBJECT
private:
- static const uint64_t RecordLengths[20];
- 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::map< std::shared_ptr<sigrok::Device>, std::string >
+ &device_names,
+
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 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_rate();
+ void commit_sample_count();
-private
slots
:
+private
Q_SLOTS
:
void on_device_selected();
void on_device_selected();
+ void on_sample_count_changed();
void on_sample_rate_changed();
void on_run_stop();
void on_sample_rate_changed();
void on_run_stop();
+ void on_config_changed();
+
+protected:
+ bool eventFilter(QObject *watched, QEvent *event);
+
private:
SigSession &_session;
private:
SigSession &_session;
@@
-83,16
+99,16
@@
private:
bool _updating_device_selector;
pv::widgets::PopupToolButton _configure_button;
bool _updating_device_selector;
pv::widgets::PopupToolButton _configure_button;
+ QAction *_configure_button_action;
- pv::widgets::PopupToolButton _probes_button;
- pv::popups::Probes _probes_popup;
+ pv::widgets::PopupToolButton _channels_button;
- QComboBox _record_length_selector;
+ pv::widgets::SweepTimingWidget _sample_count;
+ pv::widgets::SweepTimingWidget _sample_rate;
+ bool _updating_sample_rate;
+ bool _updating_sample_count;
- QComboBox _sample_rate_list;
- QAction *_sample_rate_list_action;
- QDoubleSpinBox _sample_rate_value;
- QAction *_sample_rate_value_action;
+ bool _sample_count_supported;
QIcon _icon_red;
QIcon _icon_green;
QIcon _icon_red;
QIcon _icon_green;