ardour/livetrax
13
0
Fork 0
Code

More FramedCurve render work

Browse Source 
- draw last point correctly if applicable

	- comment intent.
This commit is contained in:
nick_m 2016-06-04 06:40:59 +10:00
parent a98015e11a
commit 1eb8216408
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libs/canvas/framed_curve.cc
View File

@ -201,45 +201,49 @@ FramedCurve::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) c
} }
} }
/* a redraw may have been requested between the last sample and the last point.*/ const Duple first_sample = Duple (samples[left].x, samples[left].y);
const Duple first_point = Duple (samples[left].x, samples[left].y); /* move to the first sample's x and the draw height */
Duple last_point = Duple (samples[right].x, samples[right].y); window_space = item_to_window (Duple (first_sample.x, draw.height()));
if (draw.x1 > last_point.x) {
last_point = Duple (_points.back().x, _points.back().y);
}
window_space = item_to_window (first_point);
context->move_to (window_space.x, window_space.y); context->move_to (window_space.x, window_space.y);
/* draw line between samples */ /* draw line to first sample and then between samples */
for (uint32_t idx = left + 1; idx <= right; ++idx) { for (uint32_t idx = left; idx <= right; ++idx) {
window_space = item_to_window (Duple (samples[idx].x, samples[idx].y), false); window_space = item_to_window (Duple (samples[idx].x, samples[idx].y), false);
context->line_to (window_space.x, window_space.y); context->line_to (window_space.x, window_space.y);
} }
/* a redraw may have been requested between the last sample and the last point.
if so, draw a line to the last _point.
*/
Duple last_sample = Duple (samples[right].x, samples[right].y);
if (draw.x1 > last_sample.x) {
last_sample = Duple (_points.back().x, _points.back().y);
window_space = item_to_window (last_sample, false);
context->line_to (window_space.x, window_space.y);
}
switch (curve_fill) { switch (curve_fill) {
case None: case None:
context->stroke(); context->stroke();
break; break;
case Inside: case Inside:
context->stroke_preserve (); context->stroke_preserve ();
/* close the frame, possibly using the last _point's x rather than samples[right].x */
window_space = item_to_window (Duple (last_point.x, draw.height())); window_space = item_to_window (Duple (last_sample.x, draw.height()));
context->line_to (window_space.x, window_space.y); context->line_to (window_space.x, window_space.y);
window_space = item_to_window (Duple (first_point.x, draw.height())); window_space = item_to_window (Duple (first_sample.x, draw.height()));
context->line_to (window_space.x, window_space.y); context->line_to (window_space.x, window_space.y);
context->close_path(); context->close_path();
setup_fill_context(context); setup_fill_context(context);
context->fill (); context->fill ();
break; break;
case Outside: case Outside:
context->stroke_preserve (); context->stroke_preserve ();
window_space = item_to_window (last_point); window_space = item_to_window (last_sample);
context->line_to (window_space.x, window_space.y); context->line_to (window_space.x, window_space.y);
window_space = item_to_window (first_point); window_space = item_to_window (first_sample);
context->line_to (window_space.x, window_space.y); context->line_to (window_space.x, window_space.y);
context->close_path(); context->close_path();
setup_fill_context(context); setup_fill_context(context);