X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fruler.hpp;h=f717c3785674c2b814838b915a18d18741ad6fed;hb=c677193dc6e691493081fe87476a04e1674093a5;hp=864d611dda4607479d6bbc2f55394d5fab6d0071;hpb=415341a11f0023cc9cec7b62cf8058c84c8b7ea6;p=pulseview.git

diff --git a/pv/view/ruler.hpp b/pv/view/ruler.hpp
index 864d611..f717c37 100644
--- a/pv/view/ruler.hpp
+++ b/pv/view/ruler.hpp
@@ -18,22 +18,37 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifndef PULSEVIEW_PV_VIEW_RULER_H
-#define PULSEVIEW_PV_VIEW_RULER_H
+#ifndef PULSEVIEW_PV_VIEW_RULER_HPP
+#define PULSEVIEW_PV_VIEW_RULER_HPP
 
+#include <functional>
 #include <memory>
 
+#include <boost/optional.hpp>
+
 #include "marginwidget.hpp"
+#include <pv/util.hpp>
+
+namespace RulerTest {
+class tick_position_test_0;
+class tick_position_test_1;
+class tick_position_test_2;
+}
 
 namespace pv {
 namespace view {
 
 class TimeItem;
+class ViewItem;
 
 class Ruler : public MarginWidget
 {
 	Q_OBJECT
 
+	friend class RulerTest::tick_position_test_0;
+	friend class RulerTest::tick_position_test_1;
+	friend class RulerTest::tick_position_test_2;
+
 private:
 
 	/// Height of the ruler in multipes of the text height
@@ -44,20 +59,9 @@ private:
 	/// Height of the hover arrow in multiples of the text height
 	static const float HoverArrowSize;
 
-	static const int Padding;
-
-	/**
-	 * The vertical offset, relative to the bottom line of the widget,
-	 * where the arrows of the cursor labels end.
-	 */
-	static const int BaselineOffset;
-
 public:
 	Ruler(View &parent);
 
-public:
-	void clear_selection();
-
 public:
 	QSize sizeHint() const;
 
@@ -69,18 +73,25 @@ public:
 	QSize extended_size_hint() const;
 
 private:
-	void paintEvent(QPaintEvent *event);
+	/**
+	 * Gets the time items.
+	 */
+	std::vector< std::shared_ptr<pv::view::ViewItem> > items();
+
+	/**
+	 * Gets the first view item which has a label that contains @c pt .
+	 * @param pt the point to search with.
+	 * @return the view item that has been found, or and empty
+	 *   @c shared_ptr if no item was found.
+	 */
+	std::shared_ptr<pv::view::ViewItem> get_mouse_over_item(
+		const QPoint &pt);
 
-	void mouseMoveEvent(QMouseEvent *e);
-	void mousePressEvent(QMouseEvent *e);
-	void mouseReleaseEvent(QMouseEvent *);
-	void leaveEvent(QEvent*);
+private:
+	void paintEvent(QPaintEvent *event);
 
 	void mouseDoubleClickEvent(QMouseEvent *e);
 
-	void keyPressEvent(QKeyEvent *e);
-
-private:
 	/**
 	 * Draw a hover arrow under the cursor position.
 	 * @param p The painter to draw into.
@@ -90,14 +101,48 @@ private:
 
 	int calculate_text_height() const;
 
-private:
-	std::shared_ptr<TimeItem> mouse_down_item_;
+	struct TickPositions
+	{
+		std::vector<std::pair<double, QString>> major;
+		std::vector<double> minor;
+	};
+
+	/**
+	 * Holds the tick positions so that they don't have to be recalculated on
+	 * every redraw. Set by 'paintEvent()' when needed.
+	 */
+	boost::optional<TickPositions> tick_position_cache_;
+
+	/**
+	 * Calculates the major and minor tick positions.
+	 *
+	 * @param major_period The period between the major ticks.
+	 * @param offset The time at the left border of the ruler.
+	 * @param scale The scale in seconds per pixel.
+	 * @param width the Width of the ruler.
+	 * @param format_function A function used to format the major tick times.
+	 * @return An object of type 'TickPositions' that contains the major tick
+	 *         positions together with the labels at that ticks, and the minor
+	 *         tick positions.
+	 */
+	static TickPositions calculate_tick_positions(
+		const pv::util::Timestamp& major_period,
+		const pv::util::Timestamp& offset,
+		const double scale,
+		const int width,
+		std::function<QString(const pv::util::Timestamp&)> format_function);
+
+protected:
+	void resizeEvent(QResizeEvent*) override;
 
 private Q_SLOTS:
 	void hover_point_changed();
+
+	// Resets the 'tick_position_cache_'.
+	void invalidate_tick_position_cache();
 };
 
 } // namespace view
 } // namespace pv
 
-#endif // PULSEVIEW_PV_VIEW_RULER_H
+#endif // PULSEVIEW_PV_VIEW_RULER_HPP