Oversample edges to prevent gaps

[pulseview.git] / logicsignal.h

diff --git a/logicsignal.h b/logicsignal.h
index 28c8247a90c7cb3d43ed358e4c388c2f43116ab2..da9c3a42b749c2cf6473136623c1df9784b71e7c 100644 (file)
--- a/logicsignal.h
+++ b/logicsignal.h
@@ -26,21 +26,50 @@ class LogicData;
 
 class LogicSignal : public Signal
 {
+private:
+       static const float Margin;
+       static const float Oversampling;
+
+       static const QColor EdgeColour;
+       static const QColor HighColour;
+       static const QColor LowColour;
+
+       static const QColor LogicSignalColours[10];
+
 public:
-       LogicSignal(QString name, boost::shared_ptr<SignalData> data,
+       LogicSignal(QString name,
+               boost::shared_ptr<LogicData> data,
                int probe_index);
 
        /**
-        * Paints the signal into a QGLWidget.
-        * @param widget the QGLWidget to paint into.
+        * Paints the signal with a QPainter
+        * @param p the QPainter to paint into.
         * @param rect the rectangular area to draw the trace into.
-        * @param scale the scale in femtoseconds per pixel.
+        * @param scale the scale in seconds per pixel.
         * @param offset the time to show at the left hand edge of
-        *   the view in femtoseconds.
+        *   the view in seconds.
+        **/
+       void paint(QPainter &p, const QRect &rect, double scale, double offset);
+
+private:
+
+       int paint_caps(QPainter &p, QLineF *const lines,
+               std::vector< std::pair<int64_t, bool> > &edges,
+               bool level, double samples_per_pixel, double pixels_offset,
+               int x_offset, int y_offset);
+
+       /**
+        * Get the colour of the logic signal
+        */
+       QColor get_colour() const;
+
+       /**
+        * When painting into the rectangle, calculate the y
+        * offset of the zero point.
         **/
-       void paint(QGLWidget &widget, const QRect &rect, uint64_t scale,
-               int64_t offset);
+       int get_nominal_offset(const QRect &rect) const;
 
 private:
        int _probe_index;
+       boost::shared_ptr<LogicData> _data;
 };