projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement A2L presets and custom threshold handling
[pulseview.git]
/
pv
/
views
/
trace
/
analogsignal.hpp
diff --git
a/pv/views/trace/analogsignal.hpp
b/pv/views/trace/analogsignal.hpp
index 07b667119b6a7e78a9633971aa2afaa1da9a9075..7dc1e0d9de9917135c7e1dbb60747e1fbdfca11f 100644
(file)
--- a/
pv/views/trace/analogsignal.hpp
+++ b/
pv/views/trace/analogsignal.hpp
@@
-26,6
+26,7
@@
#include <QComboBox>
#include <QSpinBox>
#include <QComboBox>
#include <QSpinBox>
+#include <QTimer>
using std::pair;
using std::shared_ptr;
using std::pair;
using std::shared_ptr;
@@
-144,6
+145,8
@@
private:
void update_scale();
void update_scale();
+ void update_conversion_widgets();
+
void perform_autoranging(bool keep_divs, bool force_update);
protected:
void perform_autoranging(bool keep_divs, bool force_update);
protected:
@@
-161,13
+164,18
@@
private Q_SLOTS:
void on_autoranging_changed(int state);
void on_conversion_changed(int index);
void on_autoranging_changed(int state);
void on_conversion_changed(int index);
+ void on_conv_threshold_changed(int index=-1);
+ void on_delayed_conversion_starter();
void on_display_type_changed(int index);
private:
void on_display_type_changed(int index);
private:
- QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+ QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
+ *display_type_cb_;
QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
+ QTimer delayed_conversion_starter_;
+
float scale_;
int scale_index_;
int scale_index_drag_offset_;
float scale_;
int scale_index_;
int scale_index_drag_offset_;