X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=fd724492c80e306dcabdf164fa3cd9b11f4789c2;hp=6afc394227170c99151acc9d8220daa3fed63def;hb=633e8ade5289eff00c7137f59269361aa547449a;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 6afc3942..fd724492 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -22,10 +22,10 @@
 
 #include <memory>
 
+#include <QColor>
 #include <QComboBox>
 #include <QSpinBox>
 
-#include <pv/globalsettings.hpp>
 #include <pv/views/trace/signal.hpp>
 
 using std::pair;
@@ -42,7 +42,7 @@ class SignalBase;
 namespace views {
 namespace trace {
 
-class AnalogSignal : public Signal, public GlobalSettingsInterface
+class AnalogSignal : public Signal
 {
 	Q_OBJECT
 
@@ -75,8 +75,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;
@@ -89,24 +87,6 @@ public:
 	 */
 	pair<int, int> v_extents() const;
 
-	/**
-	 * Returns the offset to show the drag handle.
-	 */
-	int scale_handle_offset() const;
-
-	/**
-	 * Handles the scale handle being dragged to an offset.
-	 * @param offset the offset the scale handle was dragged to.
-	 */
-	void scale_handle_dragged(int offset);
-
-	/**
-	 * @copydoc pv::view::Signal::signal_scale_handle_drag_release()
-	 */
-	void scale_handle_drag_release();
-
-	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.
@@ -160,12 +140,28 @@ private:
 
 	void update_conversion_widgets();
 
+	/**
+	 * Determines the closest level change (i.e. edge) to a given sample, which
+	 * is useful for e.g. the "snap to edge" functionality.
+	 *
+	 * @param sample_pos Sample to use
+	 * @return The changes left and right of the given position
+	 */
+	virtual vector<data::LogicSegment::EdgePair> get_nearest_level_changes(uint64_t sample_pos);
+
 	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:
+	virtual void on_setting_changed(const QString &key, const QVariant &value);
+
 	void on_min_max_changed(float min, float max);
 
 	void on_pos_vdivs_changed(int vdivs);
@@ -182,8 +178,6 @@ 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_;
@@ -191,15 +185,24 @@ private:
 
 	float scale_;
 	int scale_index_;
-	int scale_index_drag_offset_;
 
 	int div_height_;
 	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
-	float resolution_; // e.g. 10 for 10 V/div
+	float resolution_;  // e.g. 10 for 10 V/div
+
+	bool show_analog_minor_grid_;
+	QColor high_fill_color_;
+	bool show_sampling_points_, fill_high_areas_;
 
 	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