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 07b667119b6a7e78a9633971aa2afaa1da9a9075..a66fb9e2fcefca99164644ac7ceb7dae75c209a4 100644 (file)
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -46,9 +46,17 @@ class AnalogSignal : public Signal
        Q_OBJECT
 
 private:
+       static const QPen AxisPen;
        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;
+       static const QColor ThresholdColorHi;
 
        static const int64_t TracePaintBlockSize;
        static const float EnvelopeThreshold;
@@ -137,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.
         */
@@ -144,13 +155,15 @@ private:
 
        void update_scale();
 
+       void update_conversion_widgets();
+
        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_min_max_changed(float min, float max);
 
        void on_pos_vdivs_changed(int vdivs);
        void on_neg_vdivs_changed(int vdivs);
@@ -161,11 +174,16 @@ private Q_SLOTS:
        void on_autoranging_changed(int state);
 
        void on_conversion_changed(int index);
+       void on_conv_threshold_changed(int index=-1);
+       void on_delayed_conversion_starter();
 
        void on_display_type_changed(int index);
 
+       void on_settingViewConversionThresholdDispMode_changed(const QVariant new_value);
+
 private:
-       QComboBox *resolution_cb_, *conversion_cb_, *display_type_cb_;
+       QComboBox *resolution_cb_, *conversion_cb_, *conv_threshold_cb_,
+               *display_type_cb_;
        QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
 
        float scale_;
@@ -178,6 +196,7 @@ private:
 
        DisplayType display_type_;
        bool autoranging_;
+       int conversion_threshold_disp_mode_;
 };
 
 } // namespace trace