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 5223338ce5c579d08ebb608fae389ec88b1bb777..109cdd374782a906d34ed558403b8e0a9d00f94b 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -25,6 +25,10 @@
 #include <memory>
 
 #include <QComboBox>
+#include <QSpinBox>
+
+using std::pair;
+using std::shared_ptr;
 
 namespace pv {
 
@@ -44,20 +48,27 @@ class AnalogSignal : public Signal
 private:
        static const QColor SignalColours[4];
        static const QColor GridMajorColor, GridMinorColor;
+       static const QColor SamplingPointColour;
 
+       static const int64_t TracePaintBlockSize;
        static const float EnvelopeThreshold;
 
        static const int MaximumVDivs;
        static const int MaxScaleIndex, MinScaleIndex;
        static const int InfoTextMarginRight, InfoTextMarginBottom;
 
+       enum DisplayType {
+               DisplayAnalog = 0,
+               DisplayConverted = 1,
+               DisplayBoth = 2
+       };
+
 public:
-       AnalogSignal(pv::Session &session,
-               std::shared_ptr<data::SignalBase> base);
+       AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
        virtual ~AnalogSignal() = default;
 
-       std::shared_ptr<pv::data::SignalData> data() const;
+       shared_ptr<pv::data::SignalData> data() const;
 
        virtual void save_settings(QSettings &settings) const;
 
@@ -67,7 +78,7 @@ public:
         * Computes the vertical extents of the contents of this row item.
         * @return A pair containing the minimum and maximum y-values.
         */
-       std::pair<int, int> v_extents() const;
+       pair<int, int> v_extents() const;
 
        /**
         * Returns the offset to show the drag handle.
@@ -90,35 +101,42 @@ 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);
 
        void paint_trace(QPainter &p,
-               const std::shared_ptr<pv::data::AnalogSegment> &segment,
+               const shared_ptr<pv::data::AnalogSegment> &segment,
                int y, int left, const int64_t start, const int64_t end,
                const double pixels_offset, const double samples_per_pixel);
 
        void paint_envelope(QPainter &p,
-               const std::shared_ptr<pv::data::AnalogSegment> &segment,
+               const shared_ptr<pv::data::AnalogSegment> &segment,
                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.
         */
@@ -126,12 +144,16 @@ 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);
 
 private Q_SLOTS:
+       void on_samples_added();
+
        void on_pos_vdivs_changed(int vdivs);
        void on_neg_vdivs_changed(int vdivs);
 
@@ -139,8 +161,13 @@ private Q_SLOTS:
 
        void on_autoranging_changed(int state);
 
+       void on_conversion_changed(int index);
+
+       void on_display_type_changed(int index);
+
 private:
-       QComboBox *resolution_cb_;
+       QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+       QSpinBox *pvdiv_sb_, *nvdiv_sb_;
 
        float scale_;
        int scale_index_;
@@ -150,6 +177,8 @@ private:
        int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
        float resolution_; // e.g. 10 for 10 V/div
 
+       data::SignalBase::ConversionType conversion_type_;
+       DisplayType display_type_;
        bool autoranging_;
 };