Added analog envelope painting

[pulseview.git] / pv / view / analogsignal.h

diff --git a/pv/view/analogsignal.h b/pv/view/analogsignal.h
index b3cafd2f9310cdbeac34e665294c53e22631403d..ce1dff105041a77934355f302e5a80168f1cdbff 100644 (file)
--- a/pv/view/analogsignal.h
+++ b/pv/view/analogsignal.h
@@ -27,37 +27,53 @@
 
 namespace pv {
 
-class AnalogData;
+namespace data {
+class Analog;
+class AnalogSnapshot;
+}
 
 namespace view {
 
 class AnalogSignal : public Signal
 {
+private:
+       static const QColor SignalColours[4];
+
+       static const float EnvelopeThreshold;
+
 public:
        AnalogSignal(QString name,
-               boost::shared_ptr<pv::AnalogData> data);
+               boost::shared_ptr<pv::data::Analog> data, int probe_index);
+
+       void set_scale(float scale);
 
        /**
         * Paints the signal with a QPainter
         * @param p the QPainter to paint into.
-        * @param rect the rectangular area to draw the trace into.
+        * @param y the y-coordinate to draw the signal at.
+        * @param left the x-coordinate of the left edge of the signal.
+        * @param right the x-coordinate of the right edge of the signal.
         * @param scale the scale in seconds per pixel.
         * @param offset the time to show at the left hand edge of
         *   the view in seconds.
         **/
-       void paint(QPainter &p, const QRect &rect,
-               double scale, double offset);
+       void paint(QPainter &p, int y, int left, int right, double scale,
+               double offset);
 
 private:
+       void paint_trace(QPainter &p,
+               const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               int y, int left, const int64_t start, const int64_t end,
+               const double pixels_offset, const double samples_per_pixel);
 
-       /**
-        * When painting into the rectangle, calculate the y
-        * offset of the zero point.
-        **/
-       int get_nominal_offset(const QRect &rect) const;
+       void paint_envelope(QPainter &p,
+               const boost::shared_ptr<pv::data::AnalogSnapshot> &snapshot,
+               int y, int left, const int64_t start, const int64_t end,
+               const double pixels_offset, const double samples_per_pixel);
 
 private:
-       boost::shared_ptr<pv::AnalogData> _data;
+       boost::shared_ptr<pv::data::Analog> _data;
+       float _scale;
 };
 
 } // namespace view