projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use getter for the conversion type instead of a local copy
[pulseview.git]
/
pv
/
views
/
trace
/
analogsignal.hpp
diff --git
a/pv/views/trace/analogsignal.hpp
b/pv/views/trace/analogsignal.hpp
index a67c4ff37185d1ee63bebf8c6b8c32516a1f9a3c..07b667119b6a7e78a9633971aa2afaa1da9a9075 100644
(file)
--- a/
pv/views/trace/analogsignal.hpp
+++ b/
pv/views/trace/analogsignal.hpp
@@
-144,8
+144,6
@@
private:
void update_scale();
void update_scale();
- void update_conversion_type();
-
void perform_autoranging(bool keep_divs, bool force_update);
protected:
void perform_autoranging(bool keep_divs, bool force_update);
protected:
@@
-178,7
+176,6
@@
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_;
};
DisplayType display_type_;
bool autoranging_;
};