View: Fixes related to multi-segment display

[pulseview.git] / pv / views / trace / analogsignal.hpp

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 536fc8a61714b6bf323f4a991b934389022b962c..a66fb9e2fcefca99164644ac7ceb7dae75c209a4 100644 (file)
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -50,6 +50,9 @@ private:
        static const QColor SignalColours[4];
        static const QColor GridMajorColor, GridMinorColor;
        static const QColor SamplingPointColour;
+       static const QColor SamplingPointColourLo;
+       static const QColor SamplingPointColourNe;
+       static const QColor SamplingPointColourHi;
        static const QColor ThresholdColor;
        static const QColor ThresholdColorLo;
        static const QColor ThresholdColorNe;
@@ -142,6 +145,9 @@ private:
                bool level, double samples_per_pixel, double pixels_offset,
                float x_offset, float y_offset);
 
+       shared_ptr<pv::data::AnalogSegment> get_analog_segment_to_paint() const;
+       shared_ptr<pv::data::LogicSegment> get_logic_segment_to_paint() const;
+
        /**
         * Computes the scale factor from the scale index and vdiv settings.
         */
@@ -173,6 +179,8 @@ private Q_SLOTS:
 
        void on_display_type_changed(int index);
 
+       void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value);
+
 private:
        QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
                *display_type_cb_;
@@ -188,6 +196,7 @@ private:
 
        DisplayType display_type_;
        bool autoranging_;
+       int conversion_threshold_disp_mode_;
 };
 
 } // namespace trace