X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fanalogsignal.hpp;h=4c42e579b662e596289b65828b9a3c6edf4e3f56;hp=0c14b66acd6a0e42ade65556efcf2b5dae2724e7;hb=HEAD;hpb=0822e33a2eb713815ae2cd5d6fcca0865643bb00

diff --git a/pv/views/trace/analogsignal.hpp b/pv/views/trace/analogsignal.hpp
index 0c14b66a..6fbcc24b 100644
--- a/pv/views/trace/analogsignal.hpp
+++ b/pv/views/trace/analogsignal.hpp
@@ -17,8 +17,8 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP
 
 #include <memory>
 
@@ -27,6 +27,7 @@
 #include <QSpinBox>
 
 #include <pv/views/trace/signal.hpp>
+#include <pv/views/trace/logicsignal.hpp>
 
 using std::pair;
 using std::shared_ptr;
@@ -42,15 +43,13 @@ class SignalBase;
 namespace views {
 namespace trace {
 
-class AnalogSignal : public Signal
+class AnalogSignal : public LogicSignal
 {
 	Q_OBJECT
 
 private:
 	static const QPen AxisPen;
-	static const QColor SignalColors[4];
 	static const QColor GridMajorColor, GridMinorColor;
-	static const QColor SamplingPointColor;
 	static const QColor SamplingPointColorLo;
 	static const QColor SamplingPointColorNe;
 	static const QColor SamplingPointColorHi;
@@ -75,38 +74,35 @@ private:
 public:
 	AnalogSignal(pv::Session &session, shared_ptr<data::SignalBase> base);
 
-	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.
 	 * @return A pair containing the minimum and maximum y-values.
 	 */
-	pair<int, int> v_extents() const;
+	virtual pair<int, int> v_extents() const;
 
 	/**
 	 * Paints the background layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_back(QPainter &p, ViewItemPaintParams &pp);
+	virtual void paint_back(QPainter &p, ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the mid-layer of the signal with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with..
 	 */
-	void paint_mid(QPainter &p, ViewItemPaintParams &pp);
+	virtual void paint_mid(QPainter &p, ViewItemPaintParams &pp);
 
 	/**
 	 * Paints the foreground layer of the item with a QPainter
 	 * @param p the QPainter to paint into.
 	 * @param pp the painting parameters object to paint with.
 	 */
-	void paint_fore(QPainter &p, ViewItemPaintParams &pp);
+	virtual void paint_fore(QPainter &p, ViewItemPaintParams &pp);
 
 private:
 	void paint_grid(QPainter &p, int y, int left, int right);
@@ -121,15 +117,7 @@ private:
 		int y, int left, const int64_t start, const int64_t end,
 		const double pixels_offset, const double samples_per_pixel);
 
-	void paint_logic_mid(QPainter &p, ViewItemPaintParams &pp);
-
-	void paint_logic_caps(QPainter &p, QLineF *const lines,
-		vector< pair<int64_t, bool> > &edges,
-		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.
@@ -137,6 +125,7 @@ private:
 	float get_resolution(int scale_index);
 
 	void update_scale();
+	virtual void update_logic_level_offsets();
 
 	void update_conversion_widgets();
 
@@ -185,19 +174,10 @@ private:
 
 	double signal_min_, signal_max_;  // Min/max values of this signal's analog data
 
-	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
-
 	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_;
@@ -205,10 +185,23 @@ 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 save_settings() and restore_settings() 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
 } // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACE_ANALOGSIGNAL_HPP