X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=2ba157d8c5ea9cedecca3338c86908855ca215c0;hp=0412c697ba1db0aea118760618fb1fd99c97c04d;hb=051ba3b399abbd83fea8b7ef6f8876884ac0786c;hpb=f4e57597347e47a4ea58fbdc7b0a22e07f1c0ede

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 0412c697..2ba157d8 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_VIEWS_TRACEVIEW_VIEW_HPP
@@ -90,7 +89,7 @@ private:
 	static const int ScaleUnits[3];
 
 public:
-	explicit View(Session &session, QWidget *parent = 0);
+	explicit View(Session &session, bool is_main_view=false, QWidget *parent = 0);
 
 	Session& session();
 	const Session& session() const;
@@ -200,18 +199,17 @@ public:
 
 	std::pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
-	/**
-	 * Enables or disables sticky scrolling, i.e. the view always shows
-	 * the most recent samples when capturing data.
-	 */
-	void enable_sticky_scrolling(bool state);
-
 	/**
 	 * Enables or disables coloured trace backgrounds. If they're not
 	 * coloured then they will use alternating colors.
 	 */
 	void enable_coloured_bg(bool state);
 
+	/**
+	 * Enable or disable showing sampling points.
+	 */
+	void enable_show_sampling_points(bool state);
+
 	/**
 	 * Returns true if cursors are displayed. false otherwise.
 	 */
@@ -402,6 +400,7 @@ private:
 
 	bool updating_scroll_;
 	bool sticky_scrolling_;
+	bool coloured_bg_;
 	bool always_zoom_to_fit_;
 	QTimer delayed_view_updater_;
 
@@ -424,7 +423,12 @@ private:
 	QTimer lazy_event_handler_;
 
 	// This is true when the defaults couldn't be set due to insufficient info
-	bool scroll_needs_defaults;
+	bool scroll_needs_defaults_;
+
+	// A nonzero value indicates the v offset to restore. See View::resizeEvent()
+	int saved_v_offset_;
+
+	bool size_finalized_;
 };
 
 } // namespace TraceView