ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

rulers: change API to accept a pointer instead of a reference to a Metric

Browse Source 
We need to be able to construct Metrics after the ruler is constructed
in order to deal with Triggers which are potentially short-lived. We
stored the reference as a pointer anyway, so it's not as much of a change
as it appears.
This commit is contained in:
Paul Davis 2021-12-24 14:06:53 -07:00
parent 7f3681c7ac
commit 753d1c9754
3 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/editor_rulers.cc
View File

@ -141,24 +141,24 @@ Editor::initialize_rulers ()
_minsec_metric = new MinsecMetric (this);
_samples_metric = new SamplesMetric (this);
timecode_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_timecode_metric,
timecode_ruler = new ArdourCanvas::Ruler (_time_markers_group, _timecode_metric,
ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height));
timecode_ruler->set_font_description (font);
CANVAS_DEBUG_NAME (timecode_ruler, "timecode ruler");
timecode_nmarks = 0;
samples_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_samples_metric,
samples_ruler = new ArdourCanvas::Ruler (_time_markers_group, _samples_metric,
ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height));
samples_ruler->set_font_description (font);
CANVAS_DEBUG_NAME (samples_ruler, "samples ruler");
minsec_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_minsec_metric,
minsec_ruler = new ArdourCanvas::Ruler (_time_markers_group, _minsec_metric,
ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height));
minsec_ruler->set_font_description (font);
CANVAS_DEBUG_NAME (minsec_ruler, "minsec ruler");
minsec_nmarks = 0;
bbt_ruler = new ArdourCanvas::Ruler (_time_markers_group, *_bbt_metric,
bbt_ruler = new ArdourCanvas::Ruler (_time_markers_group, _bbt_metric,
ArdourCanvas::Rect (0, 0, ArdourCanvas::COORD_MAX, timebar_height));
bbt_ruler->set_font_description (font);
bbt_ruler->set_second_font_description (larger_font);

8
libs/canvas/canvas/ruler.h
View File

@ -56,10 +56,10 @@ public:
virtual void get_marks (std::vector<Mark>&, int64_t lower, int64_t upper, int maxchars) const = 0;
};
Ruler (Canvas*, const Metric& m);
Ruler (Canvas*, const Metric& m, Rect const&);
Ruler (Item*, const Metric& m);
Ruler (Item*, const Metric& m, Rect const&);
Ruler (Canvas*, const Metric* m);
Ruler (Canvas*, const Metric* m, Rect const&);
Ruler (Item*, const Metric* m);
Ruler (Item*, const Metric* m, Rect const&);
virtual ~Ruler () {
delete _font_description;

94
libs/canvas/ruler.cc
View File

@ -31,9 +31,9 @@
using namespace std;
using namespace ArdourCanvas;
Ruler::Ruler (Canvas* c, const Metric& m)
Ruler::Ruler (Canvas* c, const Metric* m)
: Rectangle (c)
, _metric (&m)
, _metric (m)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
@ -43,9 +43,9 @@ Ruler::Ruler (Canvas* c, const Metric& m)
{
}
Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r)
Ruler::Ruler (Canvas* c, const Metric* m, Rect const& r)
: Rectangle (c, r)
, _metric (&m)
, _metric (m)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
@ -55,9 +55,9 @@ Ruler::Ruler (Canvas* c, const Metric& m, Rect const& r)
{
}
Ruler::Ruler (Item* parent, const Metric& m)
Ruler::Ruler (Item* parent, const Metric* m)
: Rectangle (parent)
, _metric (&m)
, _metric (m)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
@ -67,9 +67,9 @@ Ruler::Ruler (Item* parent, const Metric& m)
{
}
Ruler::Ruler (Item* parent, const Metric& m, Rect const& r)
Ruler::Ruler (Item* parent, const Metric* m, Rect const& r)
: Rectangle (parent, r)
, _metric (&m)
, _metric (m)
, _lower (0)
, _upper (0)
, _divide_height (-1.0)
@ -127,7 +127,7 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
Distance height = self.height();
if (_need_marks) {
if (_need_marks && _metric) {
marks.clear ();
_metric->get_marks (marks, _lower, _upper, 50);
_need_marks = false;
@ -155,27 +155,28 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
}
cr->stroke ();
/* draw ticks + text */
if (_metric) {
/* draw ticks + text */
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (cr);
Glib::RefPtr<Pango::Layout> layout = Pango::Layout::create (cr);
Pango::FontDescription* last_font_description = 0;
Pango::FontDescription* last_font_description = 0;
for (vector<Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
Duple pos;
Pango::FontDescription* fd = _font_description;
for (vector<Mark>::const_iterator m = marks.begin(); m != marks.end(); ++m) {
Duple pos;
Pango::FontDescription* fd = _font_description;
pos.x = floor ((m->position - _lower) / _metric->units_per_pixel);
pos.y = self.y1; /* bottom edge */
pos.x = floor ((m->position - _lower) / _metric->units_per_pixel);
pos.y = self.y1; /* bottom edge */
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);
}
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) {
switch (m->style) {
case Mark::Major:
if (_divide_height >= 0) {
cr->rel_line_to (0, -_divide_height);
@ -192,31 +193,32 @@ Ruler::render (Rect const & area, Cairo::RefPtr<Cairo::Context> cr) const
case Mark::Micro:
cr->rel_line_to (0, -height/5.0);
break;
}
cr->stroke ();
if (fd != last_font_description) {
layout->set_font_description (*fd);
last_font_description = fd;
}
/* 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() + .5 * (height - logical.get_height()));
}
layout->show_in_cairo_context (cr);
cr->stroke ();
if (fd != last_font_description) {
layout->set_font_description (*fd);
last_font_description = fd;
}
/* 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() + .5 * (height - logical.get_height()));
}
layout->show_in_cairo_context (cr);
}
}
}
if (_divide_height >= 0.0) {
cr->set_line_width (1.0);