X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=1819ffddaba08873b30b10d23a900beed0001189;hb=5f9b7de5c8c71801141d35497786bf57f75e3ca4;hp=05d9d60193a00c2b7120f4a8dca1b4719c9d63a4;hpb=aca9aa834c742ba70f49d1ac3eb2d1e02e759416;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 05d9d601..1819ffdd 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -29,7 +29,6 @@
 
 #include <QAbstractScrollArea>
 #include <QSizeF>
-#include <QTimer>
 
 #include <pv/data/signaldata.hpp>
 #include <pv/util.hpp>
@@ -54,6 +53,10 @@ namespace pv {
 
 class Session;
 
+namespace data {
+class Logic;
+}
+
 namespace views {
 
 namespace TraceView {
@@ -92,7 +95,6 @@ private:
 	static const pv::util::Timestamp MinScale;
 
 	static const int MaxScrollValue;
-	static const int MaxViewAutoUpdateRate;
 
 	static const int ScaleUnits[3];
 
@@ -109,7 +111,7 @@ public:
 
 	virtual void clear_signals();
 
-	virtual void add_signal(const shared_ptr<Signal> signal);
+	void add_signal(const shared_ptr<Signal> signal);
 
 #ifdef ENABLE_DECODE
 	virtual void clear_decode_signals();
@@ -212,11 +214,21 @@ public:
 	 */
 	void enable_coloured_bg(bool state);
 
+	/**
+	 * Returns true if the trace background should be drawn with a coloured background.
+	 */
+	bool coloured_bg() const;
+
 	/**
 	 * Enable or disable showing sampling points.
 	 */
 	void enable_show_sampling_points(bool state);
 
+	/**
+	 * Enable or disable showing the analog minor grid.
+	 */
+	void enable_show_analog_minor_grid(bool state);
+
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
 	 */
@@ -342,9 +354,8 @@ private Q_SLOTS:
 
 	void signals_changed();
 	void capture_state_updated(int state);
-	void data_updated();
 
-	void perform_delayed_view_update();
+	virtual void perform_delayed_view_update();
 
 	void process_sticky_events();
 
@@ -409,7 +420,6 @@ private:
 	bool sticky_scrolling_;
 	bool coloured_bg_;
 	bool always_zoom_to_fit_;
-	QTimer delayed_view_updater_;
 
 	pv::util::Timestamp tick_period_;
 	pv::util::SIPrefix tick_prefix_;
@@ -434,8 +444,6 @@ private:
 
 	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
 	int saved_v_offset_;
-
-	bool size_finalized_;
 };
 
 } // namespace TraceView