From 0d0cbc8f24463a15178fa2a69cb8efe11f8576e6 Mon Sep 17 00:00:00 2001 From: Maciek Dworak Date: Mon, 24 Jan 2011 23:02:49 +0000 Subject: [PATCH] Fixes to histogram and tone curve grids --- rtgui/histogrampanel.cc | 10 ++++++---- rtgui/mycurve.cc | 11 +++++------ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc index e79b87514..3c240d5bc 100644 --- a/rtgui/histogrampanel.cc +++ b/rtgui/histogrampanel.cc @@ -387,10 +387,12 @@ void HistogramArea::renderHistogram () { bgc->set_line_attributes (1, Gdk::LINE_ON_OFF_DASH, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER); - backBuffer->draw_line (bgc, winw/3, 0, winw/3, winh-1); - backBuffer->draw_line (bgc, 2*winw/3, 0, 2*winw/3, winh-1); - backBuffer->draw_line (bgc, 0, winh/3, winw-1, winh/3); - backBuffer->draw_line (bgc, 0, 2*winh/3, winw-1, 2*winh/3); + backBuffer->draw_line (bgc, winw/4, 0, winw/4, winh); + backBuffer->draw_line (bgc, 2*winw/4, 0, 2*winw/4, winh); + backBuffer->draw_line (bgc, 3*winw/4, 0, 3*winw/4, winh); + backBuffer->draw_line (bgc, 0, winh/4, winw, winh/4); + backBuffer->draw_line (bgc, 0, 2*winh/4, winw, 2*winh/4); + backBuffer->draw_line (bgc, 0, 3*winh/4, winw, 3*winh/4); bgc->set_line_attributes (1, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER); diff --git a/rtgui/mycurve.cc b/rtgui/mycurve.cc index 60fa20813..1ceedec4a 100644 --- a/rtgui/mycurve.cc +++ b/rtgui/mycurve.cc @@ -182,11 +182,11 @@ void MyCurve::draw (int handle) { c = style->get_dark (state); cr->set_source_rgb (c.get_red_p(), c.get_green_p(), c.get_blue_p()); cr->set_antialias (Cairo::ANTIALIAS_NONE); - for (int i = 0; i < 5; i++) { - cr->move_to (RADIUS, MAX(0,i * innerHeight / 4 - 1) + RADIUS); - cr->line_to (innerWidth + RADIUS, MAX(0,i * innerHeight / 4 - 1) + RADIUS); - cr->move_to (MAX(0,i * innerWidth / 4 - 1) + RADIUS, RADIUS); - cr->line_to (MAX(0,i * innerWidth / 4 - 1) + RADIUS, innerHeight + RADIUS); + for (int i = 0; i < 5; i++) { // + 0.5 to align well with f(x)=x so it will cut through the center + cr->move_to (RADIUS, MAX(0,i * (innerHeight + 0.5) / 4) + RADIUS); + cr->line_to (innerWidth + RADIUS, MAX(0,i * (innerHeight + 0.5) / 4) + RADIUS); + cr->move_to (MAX(0,i * innerWidth / 4) + RADIUS, RADIUS); + cr->line_to (MAX(0,i * innerWidth / 4) + RADIUS, innerHeight + RADIUS); } cr->stroke (); @@ -200,7 +200,6 @@ void MyCurve::draw (int handle) { cr->stroke (); cr->unset_dash (); - cr->set_antialias (Cairo::ANTIALIAS_SUBPIXEL); cr->set_line_width (1.0);