projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
org.sigrok.PulseView.appdata.xml: Add <mimetype> tag.
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index eef424d5bafb1f871381476998b2e1c02830d648..109cdd374782a906d34ed558403b8e0a9d00f94b 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.hpp
@@
-25,6
+25,7
@@
#include <memory>
#include <QComboBox>
#include <memory>
#include <QComboBox>
+#include <QSpinBox>
using std::pair;
using std::shared_ptr;
using std::pair;
using std::shared_ptr;
@@
-145,7
+146,7
@@
private:
void update_conversion_type();
void update_conversion_type();
- void perform_autoranging(bool
force_update = fals
e);
+ void perform_autoranging(bool
keep_divs, bool force_updat
e);
protected:
void populate_popup_form(QWidget *parent, QFormLayout *form);
protected:
void populate_popup_form(QWidget *parent, QFormLayout *form);
@@
-166,6
+167,7
@@
private Q_SLOTS:
private:
QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
private:
QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+ QSpinBox *pvdiv_sb_, *nvdiv_sb_;
float scale_;
int scale_index_;
float scale_;
int scale_index_;