From 9278ae23c4e048093231ec8ac44da72b07684ec7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 11 Dec 2014 12:51:01 -0500 Subject: tweaks to minsec and timecode ruler display, especially at very high zoom. Imported from work on Tracks done in Tel Aviv, November 2014 --- gtk2_ardour/editor_rulers.cc | 245 +++++++++++++++++++++++++++++++------------ 1 file changed, 176 insertions(+), 69 deletions(-) (limited to 'gtk2_ardour/editor_rulers.cc') diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 6506b4633f..68932491e5 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -714,9 +714,12 @@ Editor::update_tempo_based_rulers (ARDOUR::TempoMap::BBTPointList::const_iterato } } + void Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) { + using namespace std; + framepos_t spacer; framepos_t fr; @@ -724,13 +727,14 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) return; } - fr = _session->frame_rate(); + fr = _session->frame_rate(); if (lower > (spacer = (framepos_t) (128 * Editor::get_current_zoom ()))) { lower = lower - spacer; } else { lower = 0; } + upper = upper + spacer; framecnt_t const range = upper - lower; @@ -797,20 +801,30 @@ Editor::set_timecode_ruler_scale (framepos_t lower, framepos_t upper) } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/ timecode_ruler_scale = timecode_show_hours; timecode_mark_modulo = 1; - timecode_nmarks = 2 + 8; + timecode_nmarks = 2 + 8; } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/ timecode_ruler_scale = timecode_show_hours; timecode_mark_modulo = 1; timecode_nmarks = 2 + 24; } else { - /* not possible if framepos_t is a 32 bit quantity */ + const framecnt_t hours_in_range = range / (60 * 60 * fr); + const int text_width_rough_guess = 70; /* pixels, very very approximate guess at how wide the tick mark text is */ - timecode_ruler_scale = timecode_show_hours; - timecode_mark_modulo = 4; - timecode_nmarks = 2 + 24; - } + /* Normally we do not need to know anything about the width of the canvas + to set the ruler scale, because the caller has already determined + the width and set lower + upper arguments to this function to match that. + But in this case, where the range defined by lower and uppper can vary + substantially (basically anything from 24hrs+ to several billion years) + trying to decide which tick marks to show does require us to know + about the available width. + */ + + timecode_nmarks = _track_canvas->width() / text_width_rough_guess; + timecode_ruler_scale = timecode_show_many_hours; + timecode_mark_modulo = max ((framecnt_t) 1, 1 + (hours_in_range / timecode_nmarks)); + } } void @@ -846,7 +860,12 @@ Editor::metric_get_timecode (std::vector& marks, gdou if ((timecode.subframes % timecode_mark_modulo) == 0) { if (timecode.subframes == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + if (timecode.hours) { + snprintf (buf, sizeof(buf), "%s%u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds); + } else { + snprintf (buf, sizeof(buf), "%s%u:%02u", timecode.negative ? "-" : "", timecode.minutes, timecode.seconds); + } + } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; snprintf (buf, sizeof(buf), ".%02u", timecode.subframes); @@ -881,7 +900,11 @@ Editor::metric_get_timecode (std::vector& marks, gdou mark.style = ArdourCanvas::Ruler::Mark::Minor; mark.position = pos; } - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + if (timecode.hours) { + snprintf (buf, sizeof(buf), "%s%u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds); + } else { + snprintf (buf, sizeof(buf), "%s%u:%02u", timecode.negative ? "-" : "", timecode.minutes, timecode.seconds); + } } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -908,7 +931,11 @@ Editor::metric_get_timecode (std::vector& marks, gdou } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; } - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + if (timecode.hours) { + snprintf (buf, sizeof(buf), "%s%u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds); + } else { + snprintf (buf, sizeof(buf), "%s%u:%02u", timecode.negative ? "-" : "", timecode.minutes, timecode.seconds); + } } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -931,18 +958,51 @@ Editor::metric_get_timecode (std::vector& marks, gdou _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); if ((timecode.hours % timecode_mark_modulo) == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + if (timecode.hours) { + snprintf (buf, sizeof(buf), "%s%u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds); + } else { + snprintf (buf, sizeof(buf), "%s%u:%02u", timecode.negative ? "-" : "", timecode.minutes, timecode.seconds); + } } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; - + } mark.label = buf; mark.position = pos; marks.push_back (mark); - Timecode::increment_hours( timecode, _session->config.get_subframes_per_frame() ); + /* Move to next hour */ + Timecode::increment_hours( timecode, _session->config.get_subframes_per_frame() ); + } + break; + + case timecode_show_many_hours: + // Find timecode time of this sample (pos) + _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); + // Go to next whole hour down + Timecode::hours_floor (timecode); + + for (n = 0; n < timecode_nmarks; ) { + _session->timecode_to_sample(timecode, pos, true /* use_offset */, false /* use_subframes */ ); + if ((timecode.hours % timecode_mark_modulo) == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + if (timecode.hours) { + snprintf (buf, sizeof(buf), "%s%u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds); + } else { + snprintf (buf, sizeof(buf), "%s%u:%02u", timecode.negative ? "-" : "", timecode.minutes, timecode.seconds); + } + mark.label = buf; + mark.position = pos; + marks.push_back (mark); + ++n; + } + /* can't use Timecode::increment_hours() here because we may be traversing thousands of hours + and doing it 1 hour at a time is just stupid (and slow). + */ + timecode.hours += timecode_mark_modulo; } break; + case timecode_show_frames: // Find timecode time of this sample (pos) _session->sample_to_timecode(pos, timecode, true /* use_offset */, false /* use_subframes */ ); @@ -958,7 +1018,11 @@ Editor::metric_get_timecode (std::vector& marks, gdou mark.style = ArdourCanvas::Ruler::Mark::Minor; } mark.position = pos; - snprintf (buf, sizeof(buf), "%s%02u:%02u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds, timecode.frames); + if (timecode.hours) { + snprintf (buf, sizeof(buf), "%s%u:%02u:%02u", timecode.negative ? "-" : "", timecode.hours, timecode.minutes, timecode.seconds); + } else { + snprintf (buf, sizeof(buf), "%s%u:%02u", timecode.negative ? "-" : "", timecode.minutes, timecode.seconds); + } } else { snprintf (buf, sizeof(buf)," "); mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -997,7 +1061,7 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper, bbt_bars = 0; bbt_nmarks = 1; - bbt_ruler_scale = bbt_over; + bbt_ruler_scale = bbt_show_many; switch (_snap_type) { case SnapToBeatDiv2: @@ -1089,7 +1153,7 @@ Editor::compute_bbt_ruler_scale (framepos_t lower, framepos_t upper, } if (bbt_bars > 8192) { - bbt_ruler_scale = bbt_over; + bbt_ruler_scale = bbt_show_many; } else if (bbt_bars > 1024) { bbt_ruler_scale = bbt_show_64; } else if (bbt_bars > 256) { @@ -1478,15 +1542,14 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l break; - case bbt_over: - bbt_nmarks = 1; - snprintf (buf, sizeof(buf), "cannot handle %" PRIu32 " bars", bbt_bars ); - mark.style = ArdourCanvas::Ruler::Mark::Major; - mark.label = buf; - mark.position = lower; - marks.push_back (mark); - - break; + case bbt_show_many: + bbt_nmarks = 1; + snprintf (buf, sizeof(buf), "cannot handle %" PRIu32 " bars", bbt_bars ); + mark.style = ArdourCanvas::Ruler::Mark::Major; + mark.label = buf; + mark.position = lower; + marks.push_back (mark); + break; case bbt_show_64: bbt_nmarks = (gint) (bbt_bars / 64) + 1; @@ -1655,14 +1718,13 @@ sample_to_clock_parts ( framepos_t sample, void Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper) { - framepos_t fr; + framepos_t fr = _session->frame_rate() * 1000; framepos_t spacer; if (_session == 0) { return; } - fr = _session->frame_rate() * 1000; /* to prevent 'flashing' */ if (lower > (spacer = (framepos_t)(128 * Editor::get_current_zoom ()))) { @@ -1673,85 +1735,110 @@ Editor::set_minsec_ruler_scale (framepos_t lower, framepos_t upper) upper += spacer; framecnt_t const range = (upper - lower) * 1000; - if (range < (fr / 50)) { - minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */ - minsec_ruler_scale = minsec_show_frames; - minsec_mark_modulo = 10; - } else if (range <= (fr / 10)) { /* 0-0.1 second */ + if (range <= (fr / 10)) { /* 0-0.1 second */ minsec_mark_interval = fr / 1000; /* show 1/1000 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 10; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= (fr / 2)) { /* 0-0.5 second */ minsec_mark_interval = fr / 100; /* show 1/100 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 100; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= fr) { /* 0-1 second */ minsec_mark_interval = fr / 10; /* show 1/10 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 200; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 2 * fr) { /* 1-2 seconds */ minsec_mark_interval = fr / 10; /* show 1/10 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 500; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 8 * fr) { /* 2-5 seconds */ minsec_mark_interval = fr / 5; /* show 2 seconds */ - minsec_ruler_scale = minsec_show_frames; + minsec_ruler_scale = minsec_show_msecs; minsec_mark_modulo = 1000; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 16 * fr) { /* 8-16 seconds */ minsec_mark_interval = fr; /* show 1 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 2; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 30 * fr) { /* 10-30 seconds */ minsec_mark_interval = fr; /* show 1 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 5; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 60 * fr) { /* 30-60 seconds */ minsec_mark_interval = fr; /* show 1 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 5; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 2 * 60 * fr) { /* 1-2 minutes */ minsec_mark_interval = 5 * fr; /* show 5 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 3; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 4 * 60 * fr) { /* 4 minutes */ minsec_mark_interval = 5 * fr; /* show 10 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 30; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 10 * 60 * fr) { /* 10 minutes */ minsec_mark_interval = 30 * fr; /* show 30 seconds */ minsec_ruler_scale = minsec_show_seconds; minsec_mark_modulo = 120; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 30 * 60 * fr) { /* 10-30 minutes */ minsec_mark_interval = 60 * fr; /* show 1 minute */ minsec_ruler_scale = minsec_show_minutes; minsec_mark_modulo = 5; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 60 * 60 * fr) { /* 30 minutes - 1hr */ minsec_mark_interval = 2 * 60 * fr; /* show 2 minutes */ minsec_ruler_scale = minsec_show_minutes; minsec_mark_modulo = 10; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 4 * 60 * 60 * fr) { /* 1 - 4 hrs*/ minsec_mark_interval = 5 * 60 * fr; /* show 10 minutes */ minsec_ruler_scale = minsec_show_minutes; minsec_mark_modulo = 30; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 8 * 60 * 60 * fr) { /* 4 - 8 hrs*/ minsec_mark_interval = 20 * 60 * fr; /* show 20 minutes */ minsec_ruler_scale = minsec_show_minutes; minsec_mark_modulo = 60; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else if (range <= 16 * 60 * 60 * fr) { /* 16-24 hrs*/ minsec_mark_interval = 60 * 60 * fr; /* show 60 minutes */ minsec_ruler_scale = minsec_show_hours; minsec_mark_modulo = 2; + minsec_nmarks = 2 + (range / minsec_mark_interval); } else { - minsec_mark_interval = 4 * 60 * 60 * fr; /* show 4 hrs */ - minsec_ruler_scale = minsec_show_hours; - minsec_mark_modulo = 4; - } - minsec_nmarks = 2 + (range / minsec_mark_interval); + const framecnt_t hours_in_range = range / (60 * 60 * fr); + const int text_width_rough_guess = 70; /* pixels, very very approximate guess at how wide the tick mark text is */ + + /* Normally we do not need to know anything about the width of the canvas + to set the ruler scale, because the caller has already determined + the width and set lower + upper arguments to this function to match that. + + But in this case, where the range defined by lower and uppper can vary + substantially (anything from 24hrs+ to several billion years) + trying to decide which tick marks to show does require us to know + about the available width. + */ + + minsec_nmarks = _track_canvas->width() / text_width_rough_guess; + minsec_mark_modulo = max ((framecnt_t) 1, 1 + (hours_in_range / minsec_nmarks)); + minsec_mark_interval = minsec_mark_modulo * (60 * 60 * fr); + minsec_ruler_scale = minsec_show_many_hours; + } } void -Editor::metric_get_minsec (std::vector& marks, gdouble lower, gdouble /*upper*/, gint /*maxchars*/) +Editor::metric_get_minsec (std::vector& marks, gdouble lower, gdouble upper, gint /*maxchars*/) { framepos_t pos; framepos_t spacer; @@ -1772,7 +1859,29 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl } pos = (((1000 * (framepos_t) floor(lower)) + (minsec_mark_interval/2))/minsec_mark_interval) * minsec_mark_interval; + switch (minsec_ruler_scale) { + + case minsec_show_msecs: + for (n = 0; n < minsec_nmarks && n < upper; pos += minsec_mark_interval, ++n) { + sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); + if (millisecs % minsec_mark_modulo == 0) { + if (millisecs == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + } else { + mark.style = ArdourCanvas::Ruler::Mark::Minor; + } + snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); + } else { + buf[0] = '\0'; + mark.style = ArdourCanvas::Ruler::Mark::Micro; + } + mark.label = buf; + mark.position = pos/1000.0; + marks.push_back (mark); + } + break; + case minsec_show_seconds: for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); @@ -1782,7 +1891,7 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; } - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); + snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld", hrs, mins, secs); } else { buf[0] = '\0'; mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -1791,7 +1900,8 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl mark.position = pos/1000.0; marks.push_back (mark); } - break; + break; + case minsec_show_minutes: for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); @@ -1801,7 +1911,7 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl } else { mark.style = ArdourCanvas::Ruler::Mark::Minor; } - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); + snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld", hrs, mins, secs); } else { buf[0] = '\0'; mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -1810,13 +1920,14 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl mark.position = pos/1000.0; marks.push_back (mark); } - break; + break; + case minsec_show_hours: for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); if (hrs % minsec_mark_modulo == 0) { mark.style = ArdourCanvas::Ruler::Mark::Major; - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); + snprintf (buf, sizeof(buf), "%02ld:%02ld", hrs, mins); } else { buf[0] = '\0'; mark.style = ArdourCanvas::Ruler::Mark::Micro; @@ -1824,26 +1935,22 @@ Editor::metric_get_minsec (std::vector& marks, gdoubl mark.label = buf; mark.position = pos/1000.0; marks.push_back (mark); + } + break; + + case minsec_show_many_hours: + for (n = 0; n < minsec_nmarks; ) { + sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); + if (hrs % minsec_mark_modulo == 0) { + mark.style = ArdourCanvas::Ruler::Mark::Major; + snprintf (buf, sizeof(buf), "%02ld:00", hrs); + mark.label = buf; + mark.position = pos/1000.0; + marks.push_back (mark); + ++n; + } + pos += minsec_mark_interval; } - break; - case minsec_show_frames: - for (n = 0; n < minsec_nmarks; pos += minsec_mark_interval, ++n) { - sample_to_clock_parts (pos, _session->frame_rate(), &hrs, &mins, &secs, &millisecs); - if (millisecs % minsec_mark_modulo == 0) { - if (millisecs == 0) { - mark.style = ArdourCanvas::Ruler::Mark::Major; - } else { - mark.style = ArdourCanvas::Ruler::Mark::Minor; - } - snprintf (buf, sizeof(buf), "%02ld:%02ld:%02ld.%03ld", hrs, mins, secs, millisecs); - } else { - buf[0] = '\0'; - mark.style = ArdourCanvas::Ruler::Mark::Micro; - } - mark.label = buf; - mark.position = pos/1000.0; - marks.push_back (mark); - } - break; - } + break; + } } -- cgit v1.2.3