projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
AnalogSignal: Add conversion type and display type
[pulseview.git]
/
pv
/
view
/
analogsignal.hpp
diff --git
a/pv/view/analogsignal.hpp
b/pv/view/analogsignal.hpp
index a27f669681659f61c84cb7a7c737d00a5b17752a..5283a2c5e569d949ad9112da048432eeb7c87120 100644
(file)
--- a/
pv/view/analogsignal.hpp
+++ b/
pv/view/analogsignal.hpp
@@
-55,6
+55,12
@@
private:
static const int MaxScaleIndex, MinScaleIndex;
static const int InfoTextMarginRight, InfoTextMarginBottom;
static const int MaxScaleIndex, MinScaleIndex;
static const int InfoTextMarginRight, InfoTextMarginBottom;
+ enum DisplayType {
+ DisplayAnalog = 0,
+ DisplayConverted = 1,
+ DisplayBoth = 2
+ };
+
public:
AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
public:
AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
@@
-144,8
+150,10
@@
private Q_SLOTS:
void on_autoranging_changed(int state);
void on_autoranging_changed(int state);
+ void on_conversion_changed(int index);
+
private:
private:
- QComboBox *resolution_cb_;
+ QComboBox *resolution_cb_
, *conversion_cb_, *display_type_cb_
;
float scale_;
int scale_index_;
float scale_;
int scale_index_;
@@
-155,6
+163,8
@@
private:
int pos_vdivs_, neg_vdivs_; // divs per positive/negative side
float resolution_; // e.g. 10 for 10 V/div
int pos_vdivs_, neg_vdivs_; // divs per positive/negative side
float resolution_; // e.g. 10 for 10 V/div
+ data::SignalBase::ConversionType conversion_type_;
+ DisplayType display_type_;
bool autoranging_;
};
bool autoranging_;
};