Keep the maximum displayed value for each analog channel at around 30.0
by dynamically adjusting scale_.
Cc: Joel Holdsworth <j...@airwebreathe.org.uk>
Signed-off-by: Bartosz Golaszewski <bgolaszew...@baylibre.com>
---
Hi Joel,
we spoke a few weeks ago about adding dynamic scaling for analog channels.
The idea was to implement a dynamic redraw of the whole plot when changing
the scale, but today I tested it and it already gets redrawn - no need to
implement anything. What do you think about the following patch then?
pv/view/analogsignal.cpp | 21 ++++++++++++++++++---
pv/view/analogsignal.hpp | 4 ++++
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index fe2979b..57dfd3a 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -51,6 +51,7 @@ const QColor AnalogSignal::SignalColours[4] = {
};
const float AnalogSignal::EnvelopeThreshold = 256.0f;
+const float AnalogSignal::MaxPlotY = 30.0f;
AnalogSignal::AnalogSignal(
pv::Session &session,
@@ -58,7 +59,8 @@ AnalogSignal::AnalogSignal(
shared_ptr<data::Analog> data) :
Signal(session, channel),
data_(data),
- scale_(1.0f)
+ scale_(1.0f),
+ curr_max_(0.0f)
{
colour_ = SignalColours[channel_->index() % countof(SignalColours)];
}
@@ -134,6 +136,17 @@ void AnalogSignal::paint_mid(QPainter &p, const
ViewItemPaintParams &pp)
pixels_offset, samples_per_pixel);
}
+void AnalogSignal::update_scale(float sample)
+{
+ float sample_abs = qAbs(sample);
+
+ if (sample_abs > curr_max_)
+ curr_max_ = sample_abs;
+
+ if (curr_max_ > 0.0f)
+ set_scale(MaxPlotY / curr_max_);
+}
+
void AnalogSignal::paint_trace(QPainter &p,
const shared_ptr<pv::data::AnalogSegment> &segment,
int y, int left, const int64_t start, const int64_t end,
@@ -152,8 +165,10 @@ void AnalogSignal::paint_trace(QPainter &p,
for (int64_t sample = start; sample != end; sample++) {
const float x = (sample / samples_per_pixel -
pixels_offset) + left;
- *point++ = QPointF(x,
- y - samples[sample - start] * scale_);
+ float s = samples[sample - start];
+
+ update_scale(s);
+ *point++ = QPointF(x, y - s * scale_);
}
p.drawPolyline(points, point - points);
diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 4f737aa..08ae128 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -41,6 +41,7 @@ private:
static const QColor SignalColours[4];
static const float EnvelopeThreshold;
+ static const float MaxPlotY;
public:
AnalogSignal(pv::Session &session,
@@ -76,6 +77,8 @@ public:
void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
private:
+ void update_scale(float sample);
+
void paint_trace(QPainter &p,
const std::shared_ptr<pv::data::AnalogSegment> &segment,
int y, int left, const int64_t start, const int64_t end,
@@ -89,6 +92,7 @@ private:
private:
std::shared_ptr<pv::data::Analog> data_;
float scale_;
+ float curr_max_;
};
} // namespace view
--
2.1.4
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
