X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=19334ee289e08ee049736ff2218da59308cebff5;hp=97d5160bd08b42591191211121f6d16fc874669a;hb=99c4952654ae218a6b45ca61066deb4f81f68416;hpb=d0c0573b3ee694827a747727f862c5f91736ca05

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 97d5160..19334ee 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -25,7 +25,6 @@
 #include <QComboBox>
 #include <QSpinBox>
 
-#include <pv/globalsettings.hpp>
 #include <pv/views/trace/signal.hpp>
 
 using std::pair;
@@ -42,18 +41,18 @@ class SignalBase;
 namespace views {
 namespace trace {
 
-class AnalogSignal : public Signal, public GlobalSettingsInterface
+class AnalogSignal : public Signal
 {
 	Q_OBJECT
 
 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 SamplingPointColourLo;
-	static const QColor SamplingPointColourNe;
-	static const QColor SamplingPointColourHi;
+	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;
@@ -75,8 +74,6 @@ private:
 public:
 	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
-	~AnalogSignal();
-
 	shared_ptr<pv::data::SignalData> data() const;
 
 	virtual void save_settings(QSettings &settings) const;
@@ -105,7 +102,7 @@ public:
 	 */
 	void scale_handle_drag_release();
 
-	void on_setting_changed(const QString &key, const QVariant &value);
+	virtual void on_setting_changed(const QString &key, const QVariant &value);
 
 	/**
 	 * Paints the background layer of the signal with a QPainter
@@ -162,9 +159,14 @@ private:
 
 	void perform_autoranging(bool keep_divs, bool force_update);
 
+	void reset_pixel_values();
+	void process_next_sample_value(float x, float value);
+
 protected:
 	void populate_popup_form(QWidget *parent, QFormLayout *form);
 
+	virtual void hover_point_changed(const QPoint &hp);
+
 private Q_SLOTS:
 	void on_min_max_changed(float min, float max);
 
@@ -200,6 +202,12 @@ private:
 	DisplayType display_type_;
 	bool autoranging_;
 	int conversion_threshold_disp_mode_;
+
+	vector<float> value_at_pixel_pos_;
+	float value_at_hover_pos_;
+	float prev_value_at_pixel_;  // Only used during lookup table update
+	float min_value_at_pixel_, max_value_at_pixel_;  // Only used during lookup table update
+	int current_pixel_pos_;  // Only used during lookup table update
 };
 
 } // namespace trace