++next;
i->second->property_x1() = - d;
i->second->property_x2() = - d;
+ ArdourCanvas::SimpleLine* f = i->second;
_lines.erase(i);
- _lines.insert(make_pair(- d, i->second));
+ _lines.insert(make_pair(- d, f));
i = next;
}
}
}
void
-TempoLines::draw (ARDOUR::TempoMap::BBTPointList& points, double frames_per_unit)
+TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin,
+ const ARDOUR::TempoMap::BBTPointList::const_iterator& end,
+ double frames_per_unit)
{
- ARDOUR::TempoMap::BBTPointList::iterator i;
+ ARDOUR::TempoMap::BBTPointList::const_iterator i;
ArdourCanvas::SimpleLine *line = NULL;
gdouble xpos;
double who_cares;
uint32_t bars = 0;
uint32_t color;
- const size_t needed = points.size();
+ const size_t needed = distance (begin, end);
_canvas.get_scroll_region (x1, y1, x2, who_cares);
/* get the first bar spacing */
- i = points.end();
+ i = end;
i--;
- bars = (*i).bar - (*points.begin()).bar;
- beats = points.size() - bars;
+ bars = (*i).bar - (*begin).bar;
+ beats = distance (begin, end) - bars;
beat_density = (beats * 10.0f) / _canvas.get_width ();
xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
const double needed_right = xpos;
- i = points.begin();
+ i = begin;
xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
const double needed_left = xpos;
bool inserted_last_time = true;
bool invalidated = false;
- for (i = points.begin(); i != points.end(); ++i) {
+ for (i = begin; i != end; ++i) {
- switch ((*i).type) {
- case ARDOUR::TempoMap::Bar:
- break;
-
- case ARDOUR::TempoMap::Beat:
- if ((*i).beat == 1) {
- color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get();
- } else {
- color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get();
- if (beat_density > 2.0) {
- break; /* only draw beat lines if the gaps between beats are large. */
- }
- }
-
- xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
-
- if (inserted_last_time && !_lines.empty()) {
- li = _lines.lower_bound(xpos); // first line >= xpos
+ if ((*i).is_bar()) {
+ color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get();
+ } else {
+ if (beat_density > 2.0) {
+ continue; /* only draw beat lines if the gaps between beats are large. */
}
+ color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get();
+ }
- line = (li != _lines.end()) ? li->second : NULL;
- assert(!line || line->property_x1() == li->first);
-
- Lines::iterator next = li;
- if (next != _lines.end())
- ++next;
-
- exhausted = (next == _lines.end());
-
- // Hooray, line is perfect
- if (line && line->property_x1() == xpos) {
- if (li != _lines.end())
- ++li;
-
- line->property_color_rgba() = color;
- inserted_last_time = false; // don't search next time
-
+ xpos = rint(((framepos_t)(*i).frame) / (double)frames_per_unit);
+
+ if (inserted_last_time && !_lines.empty()) {
+ li = _lines.lower_bound(xpos); // first line >= xpos
+ }
+
+ line = (li != _lines.end()) ? li->second : NULL;
+ assert(!line || line->property_x1() == li->first);
+
+ Lines::iterator next = li;
+ if (next != _lines.end())
+ ++next;
+
+ exhausted = (next == _lines.end());
+
+ // Hooray, line is perfect
+ if (line && line->property_x1() == xpos) {
+ if (li != _lines.end())
+ ++li;
+
+ line->property_color_rgba() = color;
+ inserted_last_time = false; // don't search next time
+
// Use existing line, moving if necessary
- } else if (!exhausted) {
- Lines::iterator steal = _lines.end();
- --steal;
-
- // Steal from the right
- if (left->first > needed_left && li != steal && steal->first > needed_right) {
- //cout << "*** STEALING FROM RIGHT" << endl;
- line = steal->second;
- _lines.erase(steal);
- line->property_x1() = xpos;
- line->property_x2() = xpos;
- line->property_color_rgba() = color;
- _lines.insert(make_pair(xpos, line));
- inserted_last_time = true; // search next time
- invalidated = true;
-
- // Shift clean range left
- _clean_left = min(_clean_left, xpos);
- _clean_right = min(_clean_right, steal->first);
-
- // Move this line to where we need it
- } else {
- Lines::iterator existing = _lines.find(xpos);
- if (existing != _lines.end()) {
- //cout << "*** EXISTING LINE" << endl;
- li = existing;
- li->second->property_color_rgba() = color;
- inserted_last_time = false; // don't search next time
- } else {
- //cout << "*** MOVING LINE" << endl;
- const double x1 = line->property_x1();
- const bool was_clean = x1 >= _clean_left && x1 <= _clean_right;
- invalidated = invalidated || was_clean;
- // Invalidate clean portion (XXX: too harsh?)
- _clean_left = needed_left;
- _clean_right = needed_right;
- _lines.erase(li);
- line->property_color_rgba() = color;
- line->property_x1() = xpos;
- line->property_x2() = xpos;
- _lines.insert(make_pair(xpos, line));
- inserted_last_time = true; // search next time
- }
- }
-
- // Create a new line
- } else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
- //cout << "*** CREATING LINE" << endl;
- assert(_lines.find(xpos) == _lines.end());
- line = new ArdourCanvas::SimpleLine (*_group);
- line->property_x1() = xpos;
- line->property_x2() = xpos;
- line->property_y1() = 0.0;
- line->property_y2() = _height;
- line->property_color_rgba() = color;
- _lines.insert(make_pair(xpos, line));
- inserted_last_time = true;
-
- // Steal from the left
- } else {
- //cout << "*** STEALING FROM LEFT" << endl;
- assert(_lines.find(xpos) == _lines.end());
- Lines::iterator steal = _lines.begin();
+ } else if (!exhausted) {
+ Lines::iterator steal = _lines.end();
+ --steal;
+
+ // Steal from the right
+ if (left->first > needed_left && li != steal && steal->first > needed_right) {
+ //cout << "*** STEALING FROM RIGHT" << endl;
+ double const x = steal->first;
line = steal->second;
_lines.erase(steal);
- line->property_color_rgba() = color;
line->property_x1() = xpos;
line->property_x2() = xpos;
+ line->property_color_rgba() = color;
_lines.insert(make_pair(xpos, line));
inserted_last_time = true; // search next time
invalidated = true;
-
- // Shift clean range right
- _clean_left = max(_clean_left, steal->first);
- _clean_right = max(_clean_right, xpos);
+
+ // Shift clean range left
+ _clean_left = min(_clean_left, xpos);
+ _clean_right = min(_clean_right, x);
+
+ // Move this line to where we need it
+ } else {
+ Lines::iterator existing = _lines.find(xpos);
+ if (existing != _lines.end()) {
+ //cout << "*** EXISTING LINE" << endl;
+ li = existing;
+ li->second->property_color_rgba() = color;
+ inserted_last_time = false; // don't search next time
+ } else {
+ //cout << "*** MOVING LINE" << endl;
+ const double x1 = line->property_x1();
+ const bool was_clean = x1 >= _clean_left && x1 <= _clean_right;
+ invalidated = invalidated || was_clean;
+ // Invalidate clean portion (XXX: too harsh?)
+ _clean_left = needed_left;
+ _clean_right = needed_right;
+ _lines.erase(li);
+ line->property_color_rgba() = color;
+ line->property_x1() = xpos;
+ line->property_x2() = xpos;
+ _lines.insert(make_pair(xpos, line));
+ inserted_last_time = true; // search next time
+ }
}
-
- break;
+
+ // Create a new line
+ } else if (_lines.size() < needed || _lines.size() < MAX_CACHED_LINES) {
+ //cout << "*** CREATING LINE" << endl;
+ assert(_lines.find(xpos) == _lines.end());
+ line = new ArdourCanvas::SimpleLine (*_group);
+ line->property_x1() = xpos;
+ line->property_x2() = xpos;
+ line->property_y1() = 0.0;
+ line->property_y2() = _height;
+ line->property_color_rgba() = color;
+ _lines.insert(make_pair(xpos, line));
+ inserted_last_time = true;
+
+ // Steal from the left
+ } else {
+ //cout << "*** STEALING FROM LEFT" << endl;
+ assert(_lines.find(xpos) == _lines.end());
+ Lines::iterator steal = _lines.begin();
+ double const x = steal->first;
+ line = steal->second;
+ _lines.erase(steal);
+ line->property_color_rgba() = color;
+ line->property_x1() = xpos;
+ line->property_x2() = xpos;
+ _lines.insert(make_pair(xpos, line));
+ inserted_last_time = true; // search next time
+ invalidated = true;
+
+ // Shift clean range right
+ _clean_left = max(_clean_left, x);
+ _clean_right = max(_clean_right, xpos);
}
}
projects / ardour.git / blobdiff