X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=a66fb9e2fcefca99164644ac7ceb7dae75c209a4;hb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;hp=cf4938a721df410c67cb452e9ba13319c98a96fd;hpb=c6d9cf6582589fd375e67579d42ee914ce6382a1;p=pulseview.git diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp index cf4938a7..a66fb9e2 100644 --- a/pv/views/trace/analogsignal.hpp +++ b/pv/views/trace/analogsignal.hpp @@ -50,7 +50,13 @@ 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; + static const QColor ThresholdColorHi; static const int64_t TracePaintBlockSize; static const float EnvelopeThreshold; @@ -132,8 +138,6 @@ private: int y, int left, const int64_t start, const int64_t end, const double pixels_offset, const double samples_per_pixel); - void paint_conversion_thresholds(QPainter &p, ViewItemPaintParams &pp); - void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp); void paint_logic_caps(QPainter &p, QLineF *const lines, @@ -141,6 +145,9 @@ private: bool level, double samples_per_pixel, double pixels_offset, float x_offset, float y_offset); + shared_ptr get_analog_segment_to_paint() const; + shared_ptr get_logic_segment_to_paint() const; + /** * Computes the scale factor from the scale index and vdiv settings. */ @@ -172,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_; @@ -187,6 +196,7 @@ private: DisplayType display_type_; bool autoranging_; + int conversion_threshold_disp_mode_; }; } // namespace trace