Fix #940 by updating the div spin boxes when needed

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

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 5283a2c5e569d949ad9112da048432eeb7c87120..109cdd374782a906d34ed558403b8e0a9d00f94b 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,7 @@
 #include <memory>
 
 #include <QComboBox>
+#include <QSpinBox>
 
 using std::pair;
 using std::shared_ptr;
@@ -49,6 +50,7 @@ private:
        static const QColor GridMajorColor, GridMinorColor;
        static const QColor SamplingPointColour;
 
+       static const int64_t TracePaintBlockSize;
        static const float EnvelopeThreshold;
 
        static const int MaximumVDivs;
@@ -99,21 +101,21 @@ public:
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with..
         */
-       void paint_back(QPainter &p, const ViewItemPaintParams &pp);
+       void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
        /**
         * Paints the mid-layer of the signal with a QPainter
         * @param p the QPainter to paint into.
         * @param pp the painting parameters object to paint with..
         */
-       void paint_mid(QPainter &p, const ViewItemPaintParams &pp);
+       void paint_mid(QPainter &p, 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);
+       void paint_fore(QPainter &p, ViewItemPaintParams &pp);
 
 private:
        void paint_grid(QPainter &p, int y, int left, int right);
@@ -128,6 +130,13 @@ private:
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
+       void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp);
+
+       void paint_logic_caps(QPainter &p, QLineF *const lines,
+               vector< pair<int64_t, bool> > &edges,
+               bool level, double samples_per_pixel, double pixels_offset,
+               float x_offset, float y_offset);
+
        /**
         * Computes the scale factor from the scale index and vdiv settings.
         */
@@ -135,7 +144,9 @@ private:
 
        void update_scale();
 
-       void perform_autoranging(bool force_update = false);
+       void update_conversion_type();
+
+       void perform_autoranging(bool keep_divs, bool force_update);
 
 protected:
        void populate_popup_form(QWidget *parent, QFormLayout *form);
@@ -152,8 +163,11 @@ private Q_SLOTS:
 
        void on_conversion_changed(int index);
 
+       void on_display_type_changed(int index);
+
 private:
        QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+       QSpinBox *pvdiv_sb_, *nvdiv_sb_;
 
        float scale_;
        int scale_index_;