AnalogSignal: Add conversion type and display type

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

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 542edda95e190237d0638be53b55447b24fdf261..5283a2c5e569d949ad9112da048432eeb7c87120 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -26,6 +26,9 @@
 
 #include <QComboBox>
 
+using std::pair;
+using std::shared_ptr;
+
 namespace pv {
 
 namespace data {
@@ -44,6 +47,7 @@ class AnalogSignal : public Signal
 private:
        static const QColor SignalColours[4];
        static const QColor GridMajorColor, GridMinorColor;
+       static const QColor SamplingPointColour;
 
        static const float EnvelopeThreshold;
 
@@ -51,13 +55,18 @@ private:
        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 +76,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.
@@ -110,12 +119,12 @@ 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);
 
@@ -141,8 +150,10 @@ private Q_SLOTS:
 
        void on_autoranging_changed(int state);
 
+       void on_conversion_changed(int index);
+
 private:
-       QComboBox *resolution_cb_;
+       QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
 
        float scale_;
        int scale_index_;
@@ -152,6 +163,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_;
 };