X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.hpp;h=5f81d443c8f53e08353e91d13b9534b7a6805dd7;hb=c677193dc6e691493081fe87476a04e1674093a5;hp=95a02084dca1d95cafa28949b24dccd5441d4930;hpb=7ee199a77ecbb7edd6decca4786648cfe07e6eec;p=pulseview.git

diff --git a/pv/view/view.hpp b/pv/view/view.hpp
index 95a0208..5f81d44 100644
--- a/pv/view/view.hpp
+++ b/pv/view/view.hpp
@@ -66,8 +66,8 @@ private:
 	};
 
 private:
-	static const double MaxScale;
-	static const double MinScale;
+	static const pv::util::Timestamp MaxScale;
+	static const pv::util::Timestamp MinScale;
 
 	static const int MaxScrollValue;
 	static const int MaxViewAutoUpdateRate;
@@ -108,7 +108,7 @@ public:
 	 * Returns the time offset of the left edge of the view in
 	 * seconds.
 	 */
-	double offset() const;
+	const pv::util::Timestamp& offset() const;
 
 	/**
 	 * Returns the vertical scroll offset.
@@ -123,12 +123,17 @@ public:
 	/**
 	 * Returns the SI prefix to apply to the graticule time markings.
 	 */
-	unsigned int tick_prefix() const;
+	pv::util::SIPrefix tick_prefix() const;
+
+	/**
+	 * Returns the number of fractional digits shown for the time markings.
+	 */
+	unsigned int tick_precision() const;
 
 	/**
 	 * Returns period of the graticule time markings.
 	 */
-	double tick_period() const;
+	const pv::util::Timestamp& tick_period() const;
 
 	/**
 	 * Returns the unit of time currently used.
@@ -152,12 +157,12 @@ public:
 	 * @param scale The new view scale in seconds per pixel.
 	 * @param offset The view time offset in seconds.
 	 */
-	void set_scale_offset(double scale, double offset);
+	void set_scale_offset(double scale, const pv::util::Timestamp& offset);
 
 	std::set< std::shared_ptr<pv::data::SignalData> >
 		get_visible_data() const;
 
-	std::pair<double, double> get_time_extents() const;
+	std::pair<pv::util::Timestamp, pv::util::Timestamp> get_time_extents() const;
 
 	/**
 	 * Enables or disables sticky scrolling, i.e. the view always shows
@@ -188,7 +193,7 @@ public:
 	/**
 	 * Adds a new flag at a specified time.
 	 */
-	void add_flag(double time);
+	void add_flag(const pv::util::Timestamp& time);
 
 	/**
 	 * Removes a flag from the list.
@@ -211,14 +216,30 @@ Q_SIGNALS:
 
 	void selection_changed();
 
-	void scale_offset_changed();
+	/// Emitted when the offset changed.
+	void offset_changed();
+
+	/// Emitted when the scale changed.
+	void scale_changed();
 
 	void sticky_scrolling_changed(bool state);
 
 	void always_zoom_to_fit_changed(bool state);
 
+	/// Emitted when the tick_prefix changed.
+	void tick_prefix_changed();
+
+	/// Emitted when the tick_precision changed.
+	void tick_precision_changed();
+
+	/// Emitted when the tick_period changed.
+	void tick_period_changed();
+
+	/// Emitted when the time_unit changed.
+	void time_unit_changed();
+
 private:
-	void get_scroll_layout(double &length, double &offset) const;
+	void get_scroll_layout(double &length, pv::util::Timestamp &offset) const;
 
 	/**
 	 * Simultaneously sets the zoom and offset.
@@ -267,7 +288,6 @@ private:
 
 	void determine_time_unit();
 
-private:
 	bool eventFilter(QObject *object, QEvent *event);
 
 	bool viewportEvent(QEvent *e);
@@ -295,6 +315,42 @@ private Q_SLOTS:
 
 	void on_hover_point_changed();
 
+	/**
+	 * Sets the 'offset_' member and emits the 'offset_changed'
+	 * signal if needed.
+	 */
+	void set_offset(const pv::util::Timestamp& offset);
+
+	/**
+	 * Sets the 'scale_' member and emits the 'scale_changed'
+	 * signal if needed.
+	 */
+	void set_scale(double scale);
+
+	/**
+	 * Sets the 'tick_prefix_' member and emits the 'tick_prefix_changed'
+	 * signal if needed.
+	 */
+	void set_tick_prefix(pv::util::SIPrefix tick_prefix);
+
+	/**
+	 * Sets the 'tick_precision_' member and emits the 'tick_precision_changed'
+	 * signal if needed.
+	 */
+	void set_tick_precision(unsigned tick_precision);
+
+	/**
+	 * Sets the 'tick_period_' member and emits the 'tick_period_changed'
+	 * signal if needed.
+	 */
+	void set_tick_period(const pv::util::Timestamp& tick_period);
+
+	/**
+	 * Sets the 'time_unit' member and emits the 'time_unit_changed'
+	 * signal if needed.
+	 */
+	void set_time_unit(pv::util::TimeUnit time_unit);
+
 private:
 	Session &session_;
 
@@ -306,15 +362,16 @@ private:
 	double scale_;
 
 	/// The view time offset in seconds.
-	double offset_;
+	pv::util::Timestamp offset_;
 
 	bool updating_scroll_;
 	bool sticky_scrolling_;
 	bool always_zoom_to_fit_;
 	QTimer delayed_view_updater_;
 
-	double tick_period_;
-	unsigned int tick_prefix_;
+	pv::util::Timestamp tick_period_;
+	pv::util::SIPrefix tick_prefix_;
+	unsigned int tick_precision_;
 	util::TimeUnit time_unit_;
 
 	bool show_cursors_;