Mercurial > geeqie
annotate src/histogram.c @ 1310:ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
author | zas_ |
---|---|
date | Sun, 22 Feb 2009 17:40:32 +0000 |
parents | 2320339ca8be |
children | fcf0e7a6143e |
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 | 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 | 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 | 15 |
16 #include "pixbuf_util.h" | |
17 | |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
18 #include <math.h> |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
19 |
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 * image histogram |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
23 *---------------------------------------------------------------------------- |
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 |
1294 | 26 #define HISTMAP_SIZE 256 |
27 | |
28 struct _HistMap { | |
1308 | 29 gulong r[HISTMAP_SIZE]; |
30 gulong g[HISTMAP_SIZE]; | |
31 gulong b[HISTMAP_SIZE]; | |
32 gulong max[HISTMAP_SIZE]; | |
1294 | 33 }; |
442 | 34 |
290 | 35 struct _Histogram { |
1304 | 36 gint channel_mode; /* drawing mode for histogram */ |
37 gint log_mode; /* logarithmical or not */ | |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
38 guint vgrid; /* number of vertical divisions, 0 for none */ |
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
39 guint hgrid; /* number of horizontal divisions, 0 for none */ |
1304 | 40 struct { |
41 int R; /* red */ | |
42 int G; /* green */ | |
43 int B; /* blue */ | |
44 int A; /* alpha */ | |
45 } grid_color; /* grid color */ | |
1302
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
46 |
290 | 47 }; |
48 | |
609
b690cecbf5b8
Use function(void) instead of function() for declaring functions which
zas_
parents:
475
diff
changeset
|
49 Histogram *histogram_new(void) |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
50 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
51 Histogram *histogram; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
52 |
442 | 53 histogram = g_new0(Histogram, 1); |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
54 histogram->channel_mode = options->histogram.last_channel_mode; |
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
55 histogram->log_mode = options->histogram.last_log_mode; |
1304 | 56 |
57 /* grid */ | |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
58 histogram->vgrid = 5; |
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
59 histogram->hgrid = 3; |
1304 | 60 histogram->grid_color.R = 160; |
61 histogram->grid_color.G = 160; | |
62 histogram->grid_color.B = 160; | |
63 histogram->grid_color.A = 250; | |
273
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 return histogram; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
66 } |
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 void histogram_free(Histogram *histogram) |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
69 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
70 g_free(histogram); |
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 |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
74 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
|
75 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
76 if (!histogram) return 0; |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
77 options->histogram.last_channel_mode = histogram->channel_mode = chan; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
78 return chan; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
79 } |
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 gint histogram_get_channel(Histogram *histogram) |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
82 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
83 if (!histogram) return 0; |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
84 return histogram->channel_mode; |
273
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 |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
87 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
|
88 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
89 if (!histogram) return 0; |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
90 options->histogram.last_log_mode = histogram->log_mode = mode; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
91 return mode; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
92 } |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
93 |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
94 gint histogram_get_mode(Histogram *histogram) |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
95 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
96 if (!histogram) return 0; |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
97 return histogram->log_mode; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
98 } |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
99 |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
100 const gchar *histogram_label(Histogram *histogram) |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
101 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
102 const gchar *t1 = ""; |
999 | 103 |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
104 if (!histogram) return NULL; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
105 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
106 if (histogram->log_mode) |
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
107 switch (histogram->channel_mode) |
442 | 108 { |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
109 case HCHAN_R: t1 = _("logarithmical histogram on red"); break; |
442 | 110 case HCHAN_G: t1 = _("logarithmical histogram on green"); break; |
111 case HCHAN_B: t1 = _("logarithmical histogram on blue"); break; | |
112 case HCHAN_RGB: t1 = _("logarithmical histogram on RGB"); break; | |
113 case HCHAN_MAX: t1 = _("logarithmical histogram on max value"); break; | |
114 } | |
999 | 115 else |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
116 switch (histogram->channel_mode) |
442 | 117 { |
118 case HCHAN_R: t1 = _("linear histogram on red"); break; | |
119 case HCHAN_G: t1 = _("linear histogram on green"); break; | |
120 case HCHAN_B: t1 = _("linear histogram on blue"); break; | |
121 case HCHAN_RGB: t1 = _("linear histogram on RGB"); break; | |
122 case HCHAN_MAX: t1 = _("linear histogram on max value"); break; | |
123 } | |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
124 return t1; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
125 } |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
126 |
1294 | 127 static HistMap *histmap_read(GdkPixbuf *imgpixbuf) |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
128 { |
462 | 129 gint w, h, i, j, srs, has_alpha, step; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
130 guchar *s_pix; |
1294 | 131 HistMap *histmap; |
132 | |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
133 w = gdk_pixbuf_get_width(imgpixbuf); |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
134 h = gdk_pixbuf_get_height(imgpixbuf); |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
135 srs = gdk_pixbuf_get_rowstride(imgpixbuf); |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
136 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
|
137 has_alpha = gdk_pixbuf_get_has_alpha(imgpixbuf); |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
138 |
1294 | 139 histmap = g_new0(HistMap, 1); |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
140 |
462 | 141 step = 3 + !!(has_alpha); |
1294 | 142 for (i = 0; i < h; i++) |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
143 { |
1294 | 144 guchar *sp = s_pix + (i * srs); /* 8bit */ |
145 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
|
146 { |
1294 | 147 guint max = sp[0]; |
148 if (sp[1] > max) max = sp[1]; | |
149 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
|
150 |
1308 | 151 histmap->r[sp[0]]++; |
152 histmap->g[sp[1]]++; | |
153 histmap->b[sp[2]]++; | |
154 histmap->max[max]++; | |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
155 |
1294 | 156 sp += step; |
462 | 157 } |
158 } | |
1308 | 159 |
1294 | 160 return histmap; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
161 } |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
162 |
1298 | 163 const HistMap *histmap_get(FileData *fd) |
1294 | 164 { |
165 if (fd->histmap) return fd->histmap; | |
166 | |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
167 if (fd->pixbuf) |
1294 | 168 { |
169 fd->histmap = histmap_read(fd->pixbuf); | |
170 return fd->histmap; | |
171 } | |
172 return NULL; | |
173 } | |
174 | |
1302
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
175 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
|
176 { |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
177 guint i; |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
178 float add; |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
179 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
180 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
|
181 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
182 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
|
183 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
184 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
|
185 { |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
186 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
|
187 |
1304 | 188 pixbuf_draw_line(pixbuf, x, y, width, height, xpos, y, xpos, y + height, |
189 histogram->grid_color.R, | |
190 histogram->grid_color.G, | |
191 histogram->grid_color.B, | |
192 histogram->grid_color.A); | |
1302
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
193 } |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
194 } |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
195 |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
196 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
|
197 { |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
198 guint i; |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
199 float add; |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
200 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
201 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
|
202 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
203 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
|
204 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
205 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
|
206 { |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
207 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
|
208 |
1304 | 209 pixbuf_draw_line(pixbuf, x, y, width, height, x, ypos, x + width, ypos, |
210 histogram->grid_color.R, | |
211 histogram->grid_color.G, | |
212 histogram->grid_color.B, | |
213 histogram->grid_color.A); | |
1302
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
214 } |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
215 } |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
216 |
1298 | 217 gint 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
|
218 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
219 /* FIXME: use the coordinates correctly */ |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
220 gint i; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
221 gulong max = 0; |
1000
4fe8f9656107
For the sake of consistency, use glib basic types everywhere.
zas_
parents:
999
diff
changeset
|
222 gdouble logmax; |
1308 | 223 gint combine = (HISTMAP_SIZE - 1) / width + 1; |
224 gint ypos = y + height; | |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
225 |
1294 | 226 if (!histogram || !histmap) return 0; |
1302
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 /* Draw the grid */ |
8d1f9739c06a
Add grid to bar histogram, simplify the code and draw horizontal lines too.
zas_
parents:
1298
diff
changeset
|
229 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
|
230 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
|
231 |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
232 for (i = 0; i < HISTMAP_SIZE; i++) |
1308 | 233 { |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
234 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
|
235 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
|
236 if (histmap->b[i] > max) max = histmap->b[i]; |
1308 | 237 } |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
238 |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
239 if (max > 0) |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
240 logmax = log(max); |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
241 else |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
242 logmax = 1.0; |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
243 |
463 | 244 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
|
245 { |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
246 gint j; |
290 | 247 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
|
248 gint rplus = 0; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
249 gint gplus = 0; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
250 gint bplus = 0; |
1294 | 251 gint ii = i * HISTMAP_SIZE / width; |
1308 | 252 gint xpos = x + i; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
253 |
290 | 254 for (j = 0; j < combine; j++) |
255 { | |
1308 | 256 guint p = ii + j; |
257 v[0] += histmap->r[p]; | |
258 v[1] += histmap->g[p]; | |
259 v[2] += histmap->b[p]; | |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
260 v[3] += histmap->max[p]; |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
261 } |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
262 |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
263 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
|
264 v[j] /= combine; |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
265 |
463 | 266 for (j = 0; j < 4; j++) |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
267 { |
463 | 268 gint k; |
1308 | 269 gint chanmax = 0; |
463 | 270 |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
271 for (k = 1; k < 3; k++) |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
272 if (v[k] > v[chanmax]) |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
273 chanmax = k; |
1308 | 274 |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
275 if (histogram->channel_mode >= HCHAN_RGB |
1308 | 276 || chanmax == histogram->channel_mode) |
463 | 277 { |
278 gulong pt; | |
279 gint r = rplus; | |
280 gint g = gplus; | |
281 gint b = bplus; | |
282 | |
1308 | 283 switch (chanmax) |
463 | 284 { |
1308 | 285 case 0: rplus = r = 255; break; |
286 case 1: gplus = g = 255; break; | |
287 case 2: bplus = b = 255; break; | |
463 | 288 } |
289 | |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
290 switch (histogram->channel_mode) |
463 | 291 { |
292 case HCHAN_RGB: | |
293 if (r == 255 && g == 255 && b == 255) | |
294 { | |
295 r = 0; b = 0; g = 0; | |
296 } | |
297 break; | |
1310
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
298 case HCHAN_R: b = 0; g = 0; break; |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
299 case HCHAN_G: r = 0; b = 0; break; |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
300 case HCHAN_B: r = 0; g = 0; break; |
ef05743535e3
Fix and simplify histogram code, drop histogram based on mean value.
zas_
parents:
1308
diff
changeset
|
301 case HCHAN_MAX: r = 0; b = 0; g = 0; break; |
463 | 302 } |
303 | |
1308 | 304 if (v[chanmax] == 0) |
463 | 305 pt = 0; |
1303
9669104eb58a
Remove histogram_ prefix from struct _Histogram fields names and rename them more properly.
zas_
parents:
1302
diff
changeset
|
306 else if (histogram->log_mode) |
1308 | 307 pt = ((gdouble)log(v[chanmax])) / logmax * (height - 1); |
463 | 308 else |
1308 | 309 pt = ((gdouble)v[chanmax]) / max * (height - 1); |
463 | 310 |
442 | 311 pixbuf_draw_line(pixbuf, |
290 | 312 x, y, width, height, |
1308 | 313 xpos, ypos, xpos, ypos - pt, |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
314 r, g, b, 255); |
463 | 315 } |
1308 | 316 |
317 v[chanmax] = -1; | |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
318 } |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
319 } |
463 | 320 |
273
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
321 return TRUE; |
e0e2c2b72c5a
reworked the histogram patch by Uwe Ohse, most of the code is in
nadvornik
parents:
diff
changeset
|
322 } |
1294 | 323 |
324 void histogram_notify_cb(FileData *fd, NotifyType type, gpointer data) | |
325 { | |
326 if (type != NOTIFY_TYPE_INTERNAL && fd->histmap) | |
327 { | |
328 g_free(fd->histmap); | |
329 fd->histmap = NULL; | |
330 } | |
331 } | |
332 | |
1055
1646720364cf
Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents:
1000
diff
changeset
|
333 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ |