X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fruler.cc;h=5fa9cb5493485a455237d29323ec1ff182422394;hb=70bed9d6a01279fa9d9fc03738e591f0bedd3362;hp=ac46249001c37dc0364c88671e9a95264c20ea10;hpb=5ee4f419259574197255d11afcc0bec25b6473d2;p=ardour.git

diff --git a/libs/canvas/ruler.cc b/libs/canvas/ruler.cc
index ac46249001..5fa9cb5493 100644
--- a/libs/canvas/ruler.cc
+++ b/libs/canvas/ruler.cc
@@ -19,7 +19,9 @@
 
 #include <algorithm>
 #include <cairomm/context.h>
-#include "pbd/compose.h"
+
+#include <pangomm/layout.h>
+
 #include "canvas/ruler.h"
 #include "canvas/types.h"
 #include "canvas/debug.h"
@@ -29,57 +31,88 @@
 using namespace std;
 using namespace ArdourCanvas;
 
-Ruler::Ruler (Group *p, const Metric& m)
-	: Item (p)
-	, Fill (p)
-	, Outline (p)
-	, _metric (m)
+Ruler::Ruler (Canvas* c, const Metric& m)
+	: Rectangle (c)
+	, _metric (&m)
+	, _lower (0)
+	, _upper (0)
+        , _divide_height (-1.0)
+	, _need_marks (true)
+{
+}
+
+Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r)
+	: Rectangle (c, r)
+	, _metric (&m)
+	, _lower (0)
+	, _upper (0)
+        , _divide_height (-1.0)
+	, _need_marks (true)
+{
+}
+
+Ruler::Ruler (Item* parent, const Metric& m)
+	: Rectangle (parent)
+	, _metric (&m)
+	, _lower (0)
+	, _upper (0)
+        , _divide_height (-1.0)
+	, _need_marks (true)
+{
+}
+
+Ruler::Ruler (Item* parent, const Metric& m, Rect const& r)
+	: Rectangle (parent, r)
+	, _metric (&m)
+	, _lower (0)
+	, _upper (0)
+        , _divide_height (-1.0)
+	, _need_marks (true)
 {
 }
 
 void
 Ruler::set_range (double l, double u)
 {
+	begin_visual_change ();
 	_lower = l;
 	_upper = u;
+	_need_marks = true;
+	end_visual_change ();
 }
 
 void
-Ruler::set_size (Rect const & area)
+Ruler::set_font_description (Pango::FontDescription fd)
 {
-	if (_rect != area) {
-		begin_visual_change ();
-		_rect = area;
-		_bounding_box_dirty = true;
-		end_visual_change ();
-	}
+	begin_visual_change ();
+	_font_description = new Pango::FontDescription (fd);
+	end_visual_change ();
 }
 
 void
-Ruler::compute_bounding_box () const
+Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 {
-	if (!_rect.empty()) {
-		_bounding_box = _rect;
+	if (_lower == _upper) {
+		/* nothing to draw */
+		return;
 	}
 
-	_bounding_box_dirty = false;
-}
-
-void
-Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
-{
-	Rect self (item_to_window (_rect));
+	Rect self (item_to_window (get()));
 	boost::optional<Rect> i = self.intersection (area);
+
 	if (!i) {
 		return;
 	}
 
 	Rect intersection (i.get());
 
-	vector<Mark> marks;
 	Distance height = self.height();
 
-	_metric.get_marks (marks, _lower, _upper, 50);
+	if (_need_marks) {
+		marks.clear ();
+		_metric->get_marks (marks, _lower, _upper, 50);
+		_need_marks = false;
+	}
 
 	/* draw background */
 
@@ -87,31 +120,113 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
 	cr->rectangle (intersection.x0, intersection.y0, intersection.width(), intersection.height());
 	cr->fill ();
 
-	/* draw ticks */
-	
+	/* switch to outline context */
+
 	setup_outline_context (cr);
 
+	/* draw line on lower edge as a separator */
+
+	if (_outline_width == 1.0) {
+		/* Cairo single pixel line correction */
+		cr->move_to (self.x0, self.y1-0.5);
+		cr->line_to (self.x1, self.y1-0.5);
+	} else {
+		cr->move_to (self.x0, self.y1);
+		cr->line_to (self.x1, self.y1);
+	}
+	cr->stroke ();
+
+	/* draw ticks + text */
+	
+	Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (cr);
+	if (_font_description) {
+		layout->set_font_description (*_font_description);
+	}
+
 	for (vector<Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
 		Duple pos;
 
-		pos.x = self.x0 + ((m->position - _lower) / _metric.units_per_pixel);
+		pos.x = floor ((m->position - _lower) / _metric->units_per_pixel);
 		pos.y = self.y1; /* bottom edge */
-		
-		cr->move_to (pos.x, pos.y);
+
+		if (_outline_width == 1.0) {
+			/* Cairo single pixel line correction */
+			cr->move_to (pos.x + 0.5, pos.y);
+		} else {
+			cr->move_to (pos.x, pos.y);
+		}
 		
 		switch (m->style) {
 		case Mark::Major:
-			cr->rel_move_to (0, -height);
+                        if (_divide_height >= 0) {
+                                cr->rel_line_to (0, -_divide_height);
+                        } else {
+                                cr->rel_line_to (0, -height);
+                        }
 			break;
 		case Mark::Minor:
-			cr->rel_move_to (0, -(height/2.0));
+			cr->rel_line_to (0, -height/4.0);
 			break;
 		case Mark::Micro:
-			cr->rel_move_to (0, pos.y-(height/4.0));
+			cr->rel_line_to (0, -height/16.0);
 			break;
 		}
 		cr->stroke ();
+
+		/* and the text */
+
+		if (!m->label.empty()) {
+			Pango::Rectangle logical;
+
+			layout->set_text (m->label);
+			logical = layout->get_pixel_logical_extents ();
+			
+                        if (_divide_height >= 0) {
+                                cr->move_to (pos.x + 2.0, self.y0 + _divide_height + logical.get_y() + 2.0); /* 2 pixel padding below divider */
+                        } else {
+                                cr->move_to (pos.x + 2.0, self.y0 + logical.get_y());
+                        }
+			layout->show_in_cairo_context (cr);
+		}
 	}
 
+        if (_divide_height >= 0.0) {
+                
+                cr->set_line_width (1.0);
+
+                set_source_rgba (cr, _divider_color_top);
+                cr->move_to (self.x0, self.y0 + _divide_height-1.0+0.5);
+                cr->line_to (self.x1, self.y0 + _divide_height-1.0+0.5);
+                cr->stroke ();
+
+                set_source_rgba (cr, _divider_color_bottom);
+                cr->move_to (self.x0, self.y0 + _divide_height+0.5);
+                cr->line_to (self.x1, self.y0 + _divide_height+0.5);
+                cr->stroke ();
+
+
+        }
+
 	/* done! */
 }
+
+void
+Ruler::set_divide_height (double h)
+{
+        _divide_height = h;
+}
+
+void
+Ruler::set_divide_colors (Color t, Color b)
+{
+        _divider_color_bottom = b;
+        _divider_color_top = t;
+}
+
+void
+Ruler::set_metric (const Metric& m)
+{
+        _metric = &m;
+        _need_marks = true;
+        redraw ();
+}