X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.hpp;h=08edda36f0dcc818135747189dc76ff8ada121c2;hp=07de4eb436541cbc281a22d3df85dbcf7e84fa4a;hb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede;hpb=4cffac16f3fb0ced3450c7df9c02b2d35bcd01e1;ds=sidebyside

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 07de4eb4..08edda36 100644
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -18,21 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
-#define PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
+#define PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP
 
 #include "signal.hpp"
 
 #include <memory>
 
+#include <QComboBox>
+
 namespace pv {
 
 namespace data {
 class Analog;
 class AnalogSegment;
+class SignalBase;
 }
 
-namespace view {
+namespace views {
+namespace TraceView {
 
 class AnalogSignal : public Signal
 {
@@ -45,17 +49,20 @@ private:
 	static const float EnvelopeThreshold;
 
 	static const int MaximumVDivs;
+	static const int MaxScaleIndex, MinScaleIndex;
+	static const int InfoTextMarginRight, InfoTextMarginBottom;
 
 public:
 	AnalogSignal(pv::Session &session,
-		std::shared_ptr<sigrok::Channel> channel,
-		std::shared_ptr<pv::data::Analog> data);
+		std::shared_ptr<data::SignalBase> base);
 
 	virtual ~AnalogSignal() = default;
 
 	std::shared_ptr<pv::data::SignalData> data() const;
 
-	std::shared_ptr<pv::data::Analog> analog_data() const;
+	virtual void save_settings(QSettings &settings) const;
+
+	virtual void restore_settings(QSettings &settings);
 
 	/**
 	 * Computes the vertical extents of the contents of this row item.
@@ -93,6 +100,13 @@ public:
 	 */
 	void paint_mid(QPainter &p, const 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, const ViewItemPaintParams &pp);
+
 private:
 	void paint_grid(QPainter &p, int y, int left, int right);
 
@@ -109,6 +123,8 @@ private:
 	/**
 	 * Computes the scale factor from the scale index and vdiv settings.
 	 */
+	float get_resolution(int scale_index);
+
 	void update_scale();
 
 protected:
@@ -117,8 +133,10 @@ protected:
 private Q_SLOTS:
 	void on_vdivs_changed(int vdivs);
 
+	void on_resolution_changed(int index);
+
 private:
-	std::shared_ptr<pv::data::Analog> data_;
+	QComboBox *resolution_cb_;
 
 	float scale_;
 	int scale_index_;
@@ -129,7 +147,8 @@ private:
 	float resolution_; // e.g. 10 for 10 V/div
 };
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_ANALOGSIGNAL_HPP
+#endif // PULSEVIEW_PV_VIEWS_TRACEVIEW_ANALOGSIGNAL_HPP