projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Implement resolution selector in dialog
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index 07de4eb436541cbc281a22d3df85dbcf7e84fa4a..9c9c6db8aeffd04321799567935ecf3ba17417ec 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.hpp
@@
-25,6
+25,8
@@
#include <memory>
#include <memory>
+#include <QComboBox>
+
namespace pv {
namespace data {
namespace pv {
namespace data {
@@
-45,6
+47,7
@@
private:
static const float EnvelopeThreshold;
static const int MaximumVDivs;
static const float EnvelopeThreshold;
static const int MaximumVDivs;
+ static const int MaxScaleIndex, MinScaleIndex;
public:
AnalogSignal(pv::Session &session,
public:
AnalogSignal(pv::Session &session,
@@
-109,6
+112,8
@@
private:
/**
* Computes the scale factor from the scale index and vdiv settings.
*/
/**
* Computes the scale factor from the scale index and vdiv settings.
*/
+ float get_resolution(int scale_index);
+
void update_scale();
protected:
void update_scale();
protected:
@@
-117,9
+122,13
@@
protected:
private Q_SLOTS:
void on_vdivs_changed(int vdivs);
private Q_SLOTS:
void on_vdivs_changed(int vdivs);
+ void on_resolution_changed(int index);
+
private:
std::shared_ptr<pv::data::Analog> data_;
private:
std::shared_ptr<pv::data::Analog> data_;
+ QComboBox *resolution_cb_;
+
float scale_;
int scale_index_;
int scale_index_drag_offset_;
float scale_;
int scale_index_;
int scale_index_drag_offset_;