annotate src/histogram.c @ 1477:29aa897ea540

fixed histogram drawing
author nadvornik
date Thu, 26 Mar 2009 07:56:01 +0000
parents 2441a90c4bcf
children f96cc7807780
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
1 /*
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
2 * Geeqie
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1055
diff changeset
3 * Copyright (C) 2008 - 2009 The Geeqie Team
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
4 *
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
5 * Author: Vladimir Nadvornik
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
6 * based on a patch by Uwe Ohse
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
7 *
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
9 * Please read the included file COPYING for more information.
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
11 */
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
12
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 273
diff changeset
13 #include "main.h"
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
14 #include "histogram.h"
284
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
15
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
16 #include "pixbuf_util.h"
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
17 #include "filedata.h"
284
84c4618cd1cb Fix missing header files inclusions.
zas_
parents: 281
diff changeset
18
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
19 #include <math.h>
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
20
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
21 /*
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
22 *----------------------------------------------------------------------------
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
23 * image histogram
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
24 *----------------------------------------------------------------------------
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
25 */
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
26
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
27 #define HISTMAP_SIZE 256
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
28
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
29 struct _HistMap {
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
30 gulong r[HISTMAP_SIZE];
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
31 gulong g[HISTMAP_SIZE];
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
32 gulong b[HISTMAP_SIZE];
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
33 gulong max[HISTMAP_SIZE];
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
34
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
35 gint idle_id;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
36 GdkPixbuf *pixbuf;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
37 gint y;
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
38 };
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
39
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 287
diff changeset
40
609
b690cecbf5b8 Use function(void) instead of function() for declaring functions which
zas_
parents: 475
diff changeset
41 Histogram *histogram_new(void)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
42 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
43 Histogram *histogram;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
44
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
45 histogram = g_new0(Histogram, 1);
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
46 histogram->histogram_channel = HCHAN_RGB;
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
47 histogram->histogram_mode = 0;
1304
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
48
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
49 /* grid */
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
50 histogram->vgrid = 5;
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
51 histogram->hgrid = 3;
1304
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
52 histogram->grid_color.R = 160;
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
53 histogram->grid_color.G = 160;
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
54 histogram->grid_color.B = 160;
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
55 histogram->grid_color.A = 250;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
56
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
57 return histogram;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
58 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
59
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
60 void histogram_free(Histogram *histogram)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
61 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
62 g_free(histogram);
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
63 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
64
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
65
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
66 gint histogram_set_channel(Histogram *histogram, gint chan)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
67 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
68 if (!histogram) return 0;
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
69 histogram->histogram_channel = chan;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
70 return chan;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
71 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
72
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
73 gint histogram_get_channel(Histogram *histogram)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
74 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
75 if (!histogram) return 0;
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
76 return histogram->histogram_channel;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
77 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
78
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
79 gint histogram_set_mode(Histogram *histogram, gint mode)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
80 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
81 if (!histogram) return 0;
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
82 histogram->histogram_mode = mode;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
83 return mode;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
84 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
85
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
86 gint histogram_get_mode(Histogram *histogram)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
87 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
88 if (!histogram) return 0;
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
89 return histogram->histogram_mode;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
90 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
91
1312
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
92 gint histogram_toggle_channel(Histogram *histogram)
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
93 {
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
94 if (!histogram) return 0;
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
95 return histogram_set_channel(histogram, (histogram_get_channel(histogram)+1)%HCHAN_COUNT);
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
96 }
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
97
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
98 gint histogram_toggle_mode(Histogram *histogram)
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
99 {
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
100 if (!histogram) return 0;
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
101 return histogram_set_mode(histogram, !histogram_get_mode(histogram));
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
102 }
fcf0e7a6143e Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().
zas_
parents: 1310
diff changeset
103
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
104 const gchar *histogram_label(Histogram *histogram)
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
105 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
106 const gchar *t1 = "";
999
bbed8e9a5d33 Indentation fixes.
zas_
parents: 612
diff changeset
107
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
108 if (!histogram) return NULL;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
109
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
110 if (histogram->histogram_mode)
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
111 switch (histogram->histogram_channel)
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
112 {
1344
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
113 case HCHAN_R: t1 = _("Log Histogram on Red"); break;
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
114 case HCHAN_G: t1 = _("Log Histogram on Green"); break;
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
115 case HCHAN_B: t1 = _("Log Histogram on Blue"); break;
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
116 case HCHAN_RGB: t1 = _("Log Histogram on RGB"); break;
1349
5f21db044ec4 max value -> value. Shorter.
zas_
parents: 1344
diff changeset
117 case HCHAN_MAX: t1 = _("Log Histogram on value"); break;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
118 }
999
bbed8e9a5d33 Indentation fixes.
zas_
parents: 612
diff changeset
119 else
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
120 switch (histogram->histogram_channel)
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
121 {
1344
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
122 case HCHAN_R: t1 = _("Linear Histogram on Red"); break;
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
123 case HCHAN_G: t1 = _("Linear Histogram on Green"); break;
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
124 case HCHAN_B: t1 = _("Linear Histogram on Blue"); break;
3f9be528787c show histogram label in the title
nadvornik
parents: 1329
diff changeset
125 case HCHAN_RGB: t1 = _("Linear Histogram on RGB"); break;
1349
5f21db044ec4 max value -> value. Shorter.
zas_
parents: 1344
diff changeset
126 case HCHAN_MAX: t1 = _("Linear Histogram on value"); break;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
127 }
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
128 return t1;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
129 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
130
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
131 static HistMap *histmap_new(void)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
132 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
133 HistMap *histmap = g_new0(HistMap, 1);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
134 histmap->idle_id = -1;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
135 return histmap;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
136 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
137
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
138 void histmap_free(HistMap *histmap)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
139 {
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
140 if (!histmap) return;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
141 if (histmap->idle_id != -1) g_source_remove(histmap->idle_id);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
142 if (histmap->pixbuf) g_object_unref(histmap->pixbuf);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
143 g_free(histmap);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
144 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
145
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
146 static gboolean histmap_read(HistMap *histmap, gboolean whole)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
147 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
148 gint w, h, i, j, srs, has_alpha, step, end_line;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
149 guchar *s_pix;
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
150 GdkPixbuf *imgpixbuf = histmap->pixbuf;
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
151
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
152 w = gdk_pixbuf_get_width(imgpixbuf);
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
153 h = gdk_pixbuf_get_height(imgpixbuf);
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
154 srs = gdk_pixbuf_get_rowstride(imgpixbuf);
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
155 s_pix = gdk_pixbuf_get_pixels(imgpixbuf);
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
156 has_alpha = gdk_pixbuf_get_has_alpha(imgpixbuf);
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
157
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
158 if (whole)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
159 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
160 end_line = h;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
161 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
162 else
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
163 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
164 gint lines = 1 + 16384 / w;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
165 end_line = histmap->y + lines;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
166 if (end_line > h) end_line = h;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
167 }
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
168
462
6a2934cd0883 histogram_read(): speed up calculations by 20%.
zas_
parents: 461
diff changeset
169 step = 3 + !!(has_alpha);
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
170 for (i = histmap->y; i < end_line; i++)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
171 {
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
172 guchar *sp = s_pix + (i * srs); /* 8bit */
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
173 for (j = 0; j < w; j++)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
174 {
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
175 guint max = sp[0];
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
176 if (sp[1] > max) max = sp[1];
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
177 if (sp[2] > max) max = sp[2];
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
178
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
179 histmap->r[sp[0]]++;
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
180 histmap->g[sp[1]]++;
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
181 histmap->b[sp[2]]++;
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
182 histmap->max[max]++;
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
183
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
184 sp += step;
462
6a2934cd0883 histogram_read(): speed up calculations by 20%.
zas_
parents: 461
diff changeset
185 }
6a2934cd0883 histogram_read(): speed up calculations by 20%.
zas_
parents: 461
diff changeset
186 }
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
187 histmap->y = end_line;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
188 return end_line >= h;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
189 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
190
1298
c37f36b97173 added histogram pane
nadvornik
parents: 1294
diff changeset
191 const HistMap *histmap_get(FileData *fd)
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
192 {
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
193 if (fd->histmap && fd->histmap->idle_id == -1) return fd->histmap; /* histmap exists and is finished */
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
194
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
195 return NULL;
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
196 }
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
197
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
198 static gboolean histmap_idle_cb(gpointer data)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
199 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
200 FileData *fd = data;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
201 if (histmap_read(fd->histmap, FALSE))
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
202 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
203 /* finished */
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
204 g_object_unref(fd->histmap->pixbuf); /*pixbuf is no longer needed */
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
205 fd->histmap->pixbuf = NULL;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
206 fd->histmap->idle_id = -1;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
207 file_data_send_notification(fd, NOTIFY_HISTMAP);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
208 return FALSE;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
209 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
210 return TRUE;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
211 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
212
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
213 gboolean histmap_start_idle(FileData *fd)
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
214 {
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
215 if (fd->histmap || !fd->pixbuf) return FALSE;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
216
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
217 fd->histmap = histmap_new();
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
218 fd->histmap->pixbuf = fd->pixbuf;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
219 g_object_ref(fd->histmap->pixbuf);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
220
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
221 fd->histmap->idle_id = g_idle_add_full(G_PRIORITY_DEFAULT_IDLE, histmap_idle_cb, fd, NULL);
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
222 return TRUE;
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
223 }
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
224
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
225
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
226 static void histogram_vgrid(Histogram *histogram, GdkPixbuf *pixbuf, gint x, gint y, gint width, gint height)
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
227 {
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
228 guint i;
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
229 float add;
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
230
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
231 if (histogram->vgrid == 0) return;
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
232
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
233 add = width / (float)histogram->vgrid;
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
234
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
235 for (i = 1; i < histogram->vgrid; i++)
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
236 {
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
237 gint xpos = x + (int)(i * add + 0.5);
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
238
1304
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
239 pixbuf_draw_line(pixbuf, x, y, width, height, xpos, y, xpos, y + height,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
240 histogram->grid_color.R,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
241 histogram->grid_color.G,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
242 histogram->grid_color.B,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
243 histogram->grid_color.A);
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
244 }
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
245 }
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
246
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
247 static void histogram_hgrid(Histogram *histogram, GdkPixbuf *pixbuf, gint x, gint y, gint width, gint height)
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
248 {
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
249 guint i;
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
250 float add;
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
251
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
252 if (histogram->hgrid == 0) return;
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
253
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
254 add = height / (float)histogram->hgrid;
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
255
1303
9669104eb58a Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents: 1302
diff changeset
256 for (i = 1; i < histogram->hgrid; i++)
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
257 {
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
258 gint ypos = y + (int)(i * add + 0.5);
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
259
1304
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
260 pixbuf_draw_line(pixbuf, x, y, width, height, x, ypos, x + width, ypos,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
261 histogram->grid_color.R,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
262 histogram->grid_color.G,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
263 histogram->grid_color.B,
edeb07e1da5d Move grid color setting to histogram_new().
zas_
parents: 1303
diff changeset
264 histogram->grid_color.A);
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
265 }
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
266 }
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
267
1431
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1349
diff changeset
268 gboolean histogram_draw(Histogram *histogram, const HistMap *histmap, GdkPixbuf *pixbuf, gint x, gint y, gint width, gint height)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
269 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
270 /* FIXME: use the coordinates correctly */
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
271 gint i;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
272 gulong max = 0;
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 999
diff changeset
273 gdouble logmax;
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
274 gint combine = (HISTMAP_SIZE - 1) / width + 1;
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
275 gint ypos = y + height;
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
276
1431
7e180091e0b7 More gboolean and tidy up.
zas_
parents: 1349
diff changeset
277 if (!histogram || !histmap) return FALSE;
1302
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
278
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
279 /* Draw the grid */
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
280 histogram_vgrid(histogram, pixbuf, x, y, width, height);
8d1f9739c06a Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents: 1298
diff changeset
281 histogram_hgrid(histogram, pixbuf, x, y, width, height);
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
282
1477
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
283 /* exclude overexposed and underexposed */
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
284 for (i = 1; i < HISTMAP_SIZE - 1; i++)
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
285 {
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
286 if (histmap->r[i] > max) max = histmap->r[i];
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
287 if (histmap->g[i] > max) max = histmap->g[i];
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
288 if (histmap->b[i] > max) max = histmap->b[i];
1477
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
289 if (histmap->max[i] > max) max = histmap->max[i];
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
290 }
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
291
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
292 if (max > 0)
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
293 logmax = log(max);
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
294 else
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
295 logmax = 1.0;
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
296
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
297 for (i = 0; i < width; i++)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
298 {
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
299 gint j;
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 287
diff changeset
300 glong v[4] = {0, 0, 0, 0};
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
301 gint rplus = 0;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
302 gint gplus = 0;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
303 gint bplus = 0;
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
304 gint ii = i * HISTMAP_SIZE / width;
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
305 gint xpos = x + i;
1477
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
306 gint num_chan;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
307
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 287
diff changeset
308 for (j = 0; j < combine; j++)
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 287
diff changeset
309 {
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
310 guint p = ii + j;
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
311 v[0] += histmap->r[p];
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
312 v[1] += histmap->g[p];
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
313 v[2] += histmap->b[p];
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
314 v[3] += histmap->max[p];
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
315 }
1310
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
316
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
317 for (j = 0; combine > 1 && j < 4; j++)
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
318 v[j] /= combine;
ef05743535e3 Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents: 1308
diff changeset
319
1477
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
320 num_chan = (histogram->histogram_channel == HCHAN_RGB) ? 3 : 1;
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
321 for (j = 0; j < num_chan; j++)
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
322 {
1477
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
323 gint chanmax;
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
324 if (histogram->histogram_channel == HCHAN_RGB)
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
325 {
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
326 chanmax = HCHAN_R;
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
327 if (v[HCHAN_G] > v[HCHAN_R]) chanmax = HCHAN_G;
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
328 if (v[HCHAN_B] > v[chanmax]) chanmax = HCHAN_B;
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
329 }
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
330 else
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
331 {
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
332 chanmax = histogram->histogram_channel;
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
333 }
29aa897ea540 fixed histogram drawing
nadvornik
parents: 1439
diff changeset
334
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
335 {
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
336 gulong pt;
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
337 gint r = rplus;
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
338 gint g = gplus;
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
339 gint b = bplus;
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
340
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
341 switch (chanmax)
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
342 {
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
343 case HCHAN_R: rplus = r = 255; break;
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
344 case HCHAN_G: gplus = g = 255; break;
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
345 case HCHAN_B: bplus = b = 255; break;
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
346 }
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
347
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
348 switch (histogram->histogram_channel)
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
349 {
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
350 case HCHAN_RGB:
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
351 if (r == 255 && g == 255 && b == 255)
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
352 {
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
353 r = 0; b = 0; g = 0;
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
354 }
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
355 break;
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
356 case HCHAN_R: b = 0; g = 0; break;
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
357 case HCHAN_G: r = 0; b = 0; break;
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
358 case HCHAN_B: r = 0; g = 0; break;
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
359 case HCHAN_MAX: r = 0; b = 0; g = 0; break;
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
360 }
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
361
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
362 if (v[chanmax] == 0)
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
363 pt = 0;
1329
1fc356f629fe Clean up histogram stuff: options saving/restoring, osd histogram separation, tidy up.
zas_
parents: 1312
diff changeset
364 else if (histogram->histogram_mode)
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
365 pt = ((gdouble)log(v[chanmax])) / logmax * (height - 1);
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
366 else
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
367 pt = ((gdouble)v[chanmax]) / max * (height - 1);
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
368
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 290
diff changeset
369 pixbuf_draw_line(pixbuf,
290
4bbde8a38ad4 improved histogram drawing
nadvornik
parents: 287
diff changeset
370 x, y, width, height,
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
371 xpos, ypos, xpos, ypos - pt,
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
372 r, g, b, 255);
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
373 }
1308
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
374
2320339ca8be Attempt to simplify and fix histrogram code.
zas_
parents: 1304
diff changeset
375 v[chanmax] = -1;
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
376 }
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
377 }
463
544934a1ff89 histogram_draw(): tidy up.
zas_
parents: 462
diff changeset
378
273
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
379 return TRUE;
e0e2c2b72c5a reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff changeset
380 }
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
381
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
382 void histogram_notify_cb(FileData *fd, NotifyType type, gpointer data)
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
383 {
1432
cf4029d10d38 improved notification system
nadvornik
parents: 1431
diff changeset
384 if ((type & (NOTIFY_CHANGE || NOTIFY_REREAD)) && fd->histmap)
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
385 {
1439
2441a90c4bcf compute histogram in idle time
nadvornik
parents: 1432
diff changeset
386 histmap_free(fd->histmap);
1294
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
387 fd->histmap = NULL;
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
388 }
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
389 }
7ac9664242b2 histogram caching
nadvornik
parents: 1284
diff changeset
390
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1000
diff changeset
391 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */