AnalogSignal: Implement info text for V/div display

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

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 7fdddf2d16880678f222c845fd306b2ee4ce4e31..47a9980c0ff9dc8272aad16b391f96a8e361799d 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,8 @@
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
@@ -36,12 +38,18 @@ namespace view {
 
 class AnalogSignal : public Signal
 {
+       Q_OBJECT
+
 private:
        static const QColor SignalColours[4];
        static const QColor GridMajorColor, GridMinorColor;
 
        static const float EnvelopeThreshold;
 
+       static const int MaximumVDivs;
+       static const int MaxScaleIndex, MinScaleIndex;
+       static const int InfoTextMarginRight, InfoTextMarginBottom;
+
 public:
        AnalogSignal(pv::Session &session,
                std::shared_ptr<sigrok::Channel> channel,
@@ -89,6 +97,13 @@ public:
         */
        void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
 
+       /**
+        * Paints the foreground layer of the item with a QPainter
+        * @param p the QPainter to paint into.
+        * @param pp the painting parameters object to paint with.
+        */
+       void paint_fore(QPainter &p, const ViewItemPaintParams &pp);
+
 private:
        void paint_grid(QPainter &p, int y, int left, int right);
 
@@ -105,11 +120,23 @@ private:
        /**
         * Computes the scale factor from the scale index and vdiv settings.
         */
+       float get_resolution(int scale_index);
+
        void update_scale();
 
+protected:
+       void populate_popup_form(QWidget *parent, QFormLayout *form);
+
+private Q_SLOTS:
+       void on_vdivs_changed(int vdivs);
+
+       void on_resolution_changed(int index);
+
 private:
        std::shared_ptr<pv::data::Analog> data_;
 
+       QComboBox *resolution_cb_;
+
        float scale_;
        int scale_index_;
        int scale_index_drag_offset_;