Attached.
--alan
* Pascal Obry (pas...@obry.net) [150423 09:58]:
* Subject: Re: [darktable-devel] Histogram Change?:
> Le jeudi 23 avril 2015 ?? 08:45 -0600, Alan Lundin a ??crit :
> > FYI, I've made a few very small changes to the histogram.
> > These changes
> >
> > * remove the text which I think gets in the way and distracts
> > more than is helpful,
> > * raises the contrast and visibility of the curves,
> > * changes the background to black for better visibility
> >
> > I think most would find it to be an improvement. If the developers
> > feel like it is a worthy change, I'd like to see it added to the
> > source tree.
> >
> > These changes were made to just one file (src/libs/histogram.c) from
> > version 1.6.4 .
>
> >From Git repository?
>
> Can you please do (if on Git repo):
>
> $ git diff > hist.path
> Or
> $ diff -c > hist.patch
>
> And attach this patch to your message or attach it to a Redmine issue?
>
> A patch inline in a message is not usable.
>
> Cheers,
>
> --
> Pascal Obry / Magny Les Hameaux (78)
>
> The best way to travel is by means of imagination
>
> http://v2p.fr.eu.org
> http://www.obry.net
>
> gpg --keyserver keys.gnupg.net --recv-key F949BD3B
>
>
> ------------------------------------------------------------------------------
> BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
> Develop your own process in accordance with the BPMN 2 standard
> Learn Process modeling best practices with Bonita BPM through live exercises
> http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
> source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
> _______________________________________________
> darktable-devel mailing list
> darktable-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/darktable-devel
>
>
*** histogram.c Fri Apr 17 09:23:47 2015
--- histogram.c.orig Wed Apr 15 10:26:35 2015
***************
*** 316,322 ****
cairo_rectangle(cr, 0, 0, width, height);
cairo_clip(cr);
! cairo_set_source_rgb(cr, .0, .0, .0);
cairo_rectangle(cr, 0, 0, width, height);
cairo_fill(cr);
if(d->highlight == 1)
--- 316,322 ----
cairo_rectangle(cr, 0, 0, width, height);
cairo_clip(cr);
! cairo_set_source_rgb(cr, .3, .3, .3);
cairo_rectangle(cr, 0, 0, width, height);
cairo_fill(cr);
if(d->highlight == 1)
***************
*** 332,337 ****
--- 332,345 ----
cairo_fill(cr);
}
+ // draw grid
+ cairo_set_line_width(cr, .4);
+ cairo_set_source_rgb(cr, .1, .1, .1);
+ if(dev->histogram_type == DT_DEV_HISTOGRAM_WAVEFORM)
+ dt_draw_waveform_lines(cr, 0, 0, width, height);
+ else
+ dt_draw_grid(cr, 4, 0, 0, width, height);
+
if(hist_max > 0.0f)
{
cairo_save(cr);
***************
*** 367,383 ****
cairo_set_line_width(cr, 1.);
if(d->red)
{
! cairo_set_source_rgba(cr, 1., 0., 0., 1.0);
dt_draw_histogram_8(cr, hist, 0, dev->histogram_type == DT_DEV_HISTOGRAM_LINEAR);
}
if(d->green)
{
! cairo_set_source_rgba(cr, 0., 1., 0., 1.0);
dt_draw_histogram_8(cr, hist, 1, dev->histogram_type == DT_DEV_HISTOGRAM_LINEAR);
}
if(d->blue)
{
! cairo_set_source_rgba(cr, 0., 0., 1., 1.0);
dt_draw_histogram_8(cr, hist, 2, dev->histogram_type == DT_DEV_HISTOGRAM_LINEAR);
}
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
--- 375,391 ----
cairo_set_line_width(cr, 1.);
if(d->red)
{
! cairo_set_source_rgba(cr, 1., 0., 0., 0.2);
dt_draw_histogram_8(cr, hist, 0, dev->histogram_type == DT_DEV_HISTOGRAM_LINEAR);
}
if(d->green)
{
! cairo_set_source_rgba(cr, 0., 1., 0., 0.2);
dt_draw_histogram_8(cr, hist, 1, dev->histogram_type == DT_DEV_HISTOGRAM_LINEAR);
}
if(d->blue)
{
! cairo_set_source_rgba(cr, 0., 0., 1., 0.2);
dt_draw_histogram_8(cr, hist, 2, dev->histogram_type == DT_DEV_HISTOGRAM_LINEAR);
}
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
***************
*** 386,399 ****
cairo_restore(cr);
}
! // draw grid
! cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
! cairo_set_line_width(cr, .4);
! cairo_set_source_rgb(cr, .5, .5, .5);
! if(dev->histogram_type == DT_DEV_HISTOGRAM_WAVEFORM)
! dt_draw_waveform_lines(cr, 0, 0, width, height);
! else
! dt_draw_grid(cr, 4, 0, 0, width, height);
// buttons to control the display of the histogram: linear/log, r, g, b
if(d->highlight != 0)
--- 394,415 ----
cairo_restore(cr);
}
! cairo_set_source_rgb(cr, .25, .25, .25);
! cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
! cairo_set_font_size(cr, .1 * height);
!
! char exifline[50];
! cairo_move_to(cr, .02 * width, .98 * height);
! dt_image_print_exif(&dev->image_storage, exifline, 50);
! cairo_save(cr);
! // cairo_show_text(cr, exifline);
! cairo_set_line_width(cr, 2.0);
! cairo_set_source_rgba(cr, 1, 1, 1, 0.3);
! cairo_text_path(cr, exifline);
! cairo_stroke_preserve(cr);
! cairo_set_source_rgb(cr, .25, .25, .25);
! cairo_fill(cr);
! cairo_restore(cr);
// buttons to control the display of the histogram: linear/log, r, g, b
if(d->highlight != 0)
------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
darktable-devel mailing list
darktable-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/darktable-devel
