X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=f4cc17845e120284710f5bdda0044bcd7f1e389b;hp=3b352f932e7a0c0808d18ff7f4cb48bf30d98f17;hb=1931b5f932cf068d073bc798f11dd21ede5389a2;hpb=561ba3ae052a93fe150a2161fcdc361144e68e4f

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 3b352f9..f4cc178 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -20,13 +20,12 @@
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 #define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 
-#include "signal.hpp"
-
 #include <memory>
 
 #include <QComboBox>
 #include <QSpinBox>
-#include <QTimer>
+
+#include <pv/views/trace/signal.hpp>
 
 using std::pair;
 using std::shared_ptr;
@@ -48,10 +47,16 @@ class AnalogSignal : public Signal
 
 private:
 	static const QPen AxisPen;
-	static const QColor SignalColours[4];
+	static const QColor SignalColors[4];
 	static const QColor GridMajorColor, GridMinorColor;
-	static const QColor SamplingPointColour;
+	static const QColor SamplingPointColor;
+	static const QColor SamplingPointColorLo;
+	static const QColor SamplingPointColorNe;
+	static const QColor SamplingPointColorHi;
 	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;
@@ -69,7 +74,7 @@ private:
 public:
 	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
-	virtual ~AnalogSignal() = default;
+	~AnalogSignal();
 
 	shared_ptr<pv::data::SignalData> data() const;
 
@@ -99,6 +104,8 @@ public:
 	 */
 	void scale_handle_drag_release();
 
+	virtual void on_setting_changed(const QString &key, const QVariant &value);
+
 	/**
 	 * Paints the background layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
@@ -133,8 +140,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,
@@ -142,6 +147,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.
 	 */
@@ -157,7 +165,7 @@ 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);
@@ -173,13 +181,13 @@ 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_;
 	QSpinBox *pvdiv_sb_, *nvdiv_sb_, *div_height_sb_;
 
-	QTimer delayed_conversion_starter_;
-
 	float scale_;
 	int scale_index_;
 	int scale_index_drag_offset_;
@@ -190,6 +198,7 @@ private:
 
 	DisplayType display_type_;
 	bool autoranging_;
+	int conversion_threshold_disp_mode_;
 };
 
 } // namespace trace