X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=c588eb88bf26e33abb7e7a8ac0fc53e7dc30af47;hb=440bdf504a05efe589e8954ad28be62ba2c2d325;hp=19334ee289e08ee049736ff2218da59308cebff5;hpb=99c4952654ae218a6b45ca61066deb4f81f68416;p=pulseview.git

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 19334ee2..c588eb88 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -22,6 +22,7 @@
 
 #include <memory>
 
+#include <QColor>
 #include <QComboBox>
 #include <QSpinBox>
 
@@ -76,9 +77,8 @@ public:
 
 	shared_ptr<pv::data::SignalData> data() const;
 
-	virtual void save_settings(QSettings &settings) const;
-
-	virtual void restore_settings(QSettings &settings);
+	virtual std::map<QString, QVariant> save_settings() const;
+	virtual void restore_settings(std::map<QString, QVariant> settings);
 
 	/**
 	 * Computes the vertical extents of the contents of this row item.
@@ -86,24 +86,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();
-
-	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.
@@ -157,6 +139,15 @@ 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();
@@ -168,6 +159,8 @@ protected:
 	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);
@@ -184,23 +177,17 @@ 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_;
 
-	float scale_;
-	int scale_index_;
-	int scale_index_drag_offset_;
+	double signal_min_, signal_max_;  // Min/max values of this signal's analog data
 
-	int div_height_;
-	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
-	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_;
@@ -208,6 +195,18 @@ private:
 	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
+
+	// ---------------------------------------------------------------------------
+	// Note: Make sure to update .. when adding a trace-configurable variable here
+	float scale_;
+	int scale_index_;
+
+	int div_height_;
+	int pos_vdivs_, neg_vdivs_;  // divs per positive/negative side
+	float resolution_;  // e.g. 10 for 10 V/div
+
+	DisplayType display_type_;
+	bool autoranging_;
 };
 
 } // namespace trace