Revision: 26360
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26360
Author: broken
Date: 2010-01-28 08:26:21 +0100 (Thu, 28 Jan 2010)
Log Message:
-----------
Fix [#20754] Histogram Not Updating, Showing Incorrect Levels, Colour
Management on/off leads to Crash
Various internal fixes, also additional feature - can drag on the histogram to
change scale
(0 key to reset).
Also fix [#20844] Color balance node (lift freeze)
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_image.h
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/space_image/image_draw.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/makesdna/DNA_color_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_image.h 2010-01-28 07:09:22 UTC
(rev 26359)
+++ trunk/blender/source/blender/blenkernel/BKE_image.h 2010-01-28 07:26:21 UTC
(rev 26360)
@@ -142,9 +142,6 @@
/* for multilayer images as well as for render-viewer */
struct RenderResult *BKE_image_acquire_renderresult(struct Scene *scene,
struct Image *ima);
void BKE_image_release_renderresult(struct Scene *scene, struct Image *ima);
-
-/* frees all ibufs used by any image datablocks */
-void BKE_image_free_image_ibufs(void);
/* goes over all textures that use images */
void BKE_image_free_all_textures(void);
Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-01-28
07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c 2010-01-28
07:26:21 UTC (rev 26360)
@@ -882,12 +882,12 @@
DO_INLINE int get_bin_float(float f)
{
- int bin= (int)(f*511);
+ int bin= (int)(f*255);
/* note: clamp integer instead of float to avoid problems with NaN */
- CLAMP(bin, 0, 511);
+ CLAMP(bin, 0, 255);
- //return (int) (((f + 0.25) / 1.5) * 512);
+ //return (int) (((f + 0.25) / 1.5) * 255);
return bin;
}
@@ -903,17 +903,20 @@
if (hist->ok == 1 ) return;
+ if (hist->xmax == 0.f) hist->xmax = 1.f;
+ if (hist->ymax == 0.f) hist->ymax = 1.f;
+
/* hmmmm */
if (!(ELEM(ibuf->channels, 3, 4))) return;
hist->channels = 3;
- bin_r = MEM_callocN(512 * sizeof(unsigned int), "temp historgram bins");
- bin_g = MEM_callocN(512 * sizeof(unsigned int), "temp historgram bins");
- bin_b = MEM_callocN(512 * sizeof(unsigned int), "temp historgram bins");
+ bin_r = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+ bin_g = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
+ bin_b = MEM_callocN(256 * sizeof(unsigned int), "temp historgram bins");
if (ibuf->rect_float) {
- hist->x_resolution = 512;
+ hist->x_resolution = 256;
/* divide into bins */
rf = ibuf->rect_float;
@@ -942,7 +945,7 @@
/* convert to float */
n=0;
- for (x=0; x<512; x++) {
+ for (x=0; x<256; x++) {
if (bin_r[x] > n)
n = bin_r[x];
if (bin_g[x] > n)
@@ -951,7 +954,7 @@
n = bin_b[x];
}
div = 1.f/(double)n;
- for (x=0; x<512; x++) {
+ for (x=0; x<256; x++) {
hist->data_r[x] = bin_r[x] * div;
hist->data_g[x] = bin_g[x] * div;
hist->data_b[x] = bin_b[x] * div;
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2010-01-28
07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2010-01-28
07:26:21 UTC (rev 26360)
@@ -725,17 +725,6 @@
}
}
-/* frees all ibufs used by any image datablocks */
-void BKE_image_free_image_ibufs(void)
-{
- Image *ima;
-
- for(ima= G.main->image.first; ima; ima= ima->id.next) {
- image_free_buffers(ima);
- }
-
-}
-
void BKE_image_free_all_textures(void)
{
Tex *tex;
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c
2010-01-28 07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c
2010-01-28 07:26:21 UTC (rev 26360)
@@ -690,7 +690,7 @@
#endif
-void ui_draw_but_HISTOGRAM(uiBut *but, uiWidgetColors *wcol, rcti *recti)
+void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, uiWidgetColors *wcol, rcti
*recti)
{
Histogram *hist = (Histogram *)but->poin;
int res = hist->x_resolution;
@@ -699,6 +699,7 @@
int rgb;
float w, h;
float alpha;
+ GLint scissor[4];
if (hist==NULL) { printf("hist is null \n"); return; }
@@ -709,6 +710,7 @@
w = rect.xmax - rect.xmin;
h = rect.ymax - rect.ymin;
+ h *= hist->ymax;
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
@@ -724,6 +726,10 @@
fdrawline(rect.xmin+(i/4.f)*w, rect.ymin, rect.xmin+(i/4.f)*w,
rect.ymax);
}
+ /* need scissor test, histogram can draw outside of boundary */
+ glGetIntegerv(GL_VIEWPORT, scissor);
+ glScissor(ar->winrct.xmin + (rect.xmin-1),
ar->winrct.ymin+(rect.ymin-1), (rect.xmax+1)-(rect.xmin-1),
(rect.ymax+1)-(rect.ymin-1));
+
for (rgb=0; rgb<3; rgb++) {
float *data;
@@ -761,6 +767,9 @@
glDisable(GL_LINE_SMOOTH);
}
+ /* restore scissortest */
+ glScissor(scissor[0], scissor[1], scissor[2], scissor[3]);
+
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glColor4f(0.f, 0.f, 0.f, 0.5f);
uiSetRoundBox(15);
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c
2010-01-28 07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c
2010-01-28 07:26:21 UTC (rev 26360)
@@ -2979,6 +2979,12 @@
ui_get_but_vectorf(but, rgb);
rgb_to_hsv(rgb[0], rgb[1], rgb[2], hsv, hsv+1, hsv+2);
+ /* exception, when using color wheel in 'locked' value state:
+ * allow choosing a hue for black values, by giving a tiny increment */
+ if (but->a2 == 1) { // lock
+ if (hsv[2] == 0.f) hsv[2] = 0.0001f;
+ }
+
ui_hsvcircle_vals_from_pos(hsv, hsv+1, &rect, (float)mx, (float)my);
hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2);
@@ -3412,6 +3418,81 @@
return WM_UI_HANDLER_CONTINUE;
}
+static int ui_numedit_but_HISTOGRAM(uiBut *but, uiHandleButtonData *data, int
mx, int my)
+{
+ Histogram *hist = (Histogram *)but->poin;
+ rcti rect;
+ int changed= 1;
+ float dx, dy, yfac=1.f;
+
+ rect.xmin= but->x1; rect.xmax= but->x2;
+ rect.ymin= but->y1; rect.ymax= but->y2;
+
+ dx = mx - data->draglastx;
+ dy = my - data->draglasty;
+
+ yfac = MIN2(powf(hist->ymax, 2.f), 1.f) * 0.5;
+ hist->ymax += dy * yfac;
+
+ CLAMP(hist->ymax, 1.f, 100.f);
+
+ data->draglastx= mx;
+ data->draglasty= my;
+
+ return changed;
+}
+
+static int ui_do_but_HISTOGRAM(bContext *C, uiBlock *block, uiBut *but,
uiHandleButtonData *data, wmEvent *event)
+{
+ int mx, my;
+
+ mx= event->x;
+ my= event->y;
+ ui_window_to_block(data->region, block, &mx, &my);
+
+ if(data->state == BUTTON_STATE_HIGHLIGHT) {
+ if(event->type==LEFTMOUSE && event->val==KM_PRESS) {
+ data->dragstartx= mx;
+ data->dragstarty= my;
+ data->draglastx= mx;
+ data->draglasty= my;
+ button_activate_state(C, but, BUTTON_STATE_NUM_EDITING);
+
+ /* also do drag the first time */
+ if(ui_numedit_but_HISTOGRAM(but, data, mx, my))
+ ui_numedit_apply(C, block, but, data);
+
+ return WM_UI_HANDLER_BREAK;
+ }
+ else if (event->type == ZEROKEY && event->val == KM_PRESS) {
+ Histogram *hist = (Histogram *)but->poin;
+ hist->ymax = 1.f;
+
+ button_activate_state(C, but, BUTTON_STATE_EXIT);
+ return WM_UI_HANDLER_BREAK;
+ }
+ }
+ else if(data->state == BUTTON_STATE_NUM_EDITING) {
+ if(event->type == ESCKEY) {
+ data->cancel= 1;
+ data->escapecancel= 1;
+ button_activate_state(C, but, BUTTON_STATE_EXIT);
+ }
+ else if(event->type == MOUSEMOVE) {
+ if(mx!=data->draglastx || my!=data->draglasty) {
+ if(ui_numedit_but_HISTOGRAM(but, data, mx, my))
+ ui_numedit_apply(C, block, but, data);
+ }
+ }
+ else if(event->type==LEFTMOUSE && event->val!=KM_PRESS) {
+ button_activate_state(C, but, BUTTON_STATE_EXIT);
+ }
+ return WM_UI_HANDLER_BREAK;
+ }
+
+ return WM_UI_HANDLER_CONTINUE;
+}
+
#ifdef INTERNATIONAL
static int ui_do_but_CHARTAB(bContext *C, uiBlock *block, uiBut *but,
uiHandleButtonData *data, wmEvent *event)
{
@@ -3926,7 +4007,7 @@
}
/* reset to default */
else if(event->type == ZEROKEY && event->val == KM_PRESS) {
- if (!(ELEM(but->type, HSVCIRCLE, HSVCUBE)))
+ if (!(ELEM3(but->type, HSVCIRCLE, HSVCUBE, HISTOGRAM)))
ui_set_but_default(C, but);
}
/* handle menu */
@@ -3996,8 +4077,9 @@
case ROW:
case LISTROW:
case BUT_IMAGE:
+ retval= ui_do_but_EXIT(C, but, data, event);
case HISTOGRAM:
- retval= ui_do_but_EXIT(C, but, data, event);
+ retval= ui_do_but_HISTOGRAM(C, block, but, data, event);
break;
case TEX:
case IDPOIN:
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h
2010-01-28 07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h
2010-01-28 07:26:21 UTC (rev 26360)
@@ -439,7 +439,7 @@
void ui_draw_gradient(rcti *rect, float *rgb, int type, float alpha);
-void ui_draw_but_HISTOGRAM(uiBut *but, struct uiWidgetColors *wcol, rcti
*rect);
+void ui_draw_but_HISTOGRAM(ARegion *ar, uiBut *but, struct uiWidgetColors
*wcol, rcti *rect);
void ui_draw_but_COLORBAND(uiBut *but, struct uiWidgetColors *wcol, rcti
*rect);
void ui_draw_but_NORMAL(uiBut *but, struct uiWidgetColors *wcol, rcti *rect);
void ui_draw_but_CURVE(ARegion *ar, uiBut *but, struct uiWidgetColors *wcol,
rcti *rect);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c
2010-01-28 07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c
2010-01-28 07:26:21 UTC (rev 26360)
@@ -2712,7 +2712,7 @@
break;
case HISTOGRAM:
- ui_draw_but_HISTOGRAM(but, &tui->wcol_regular,
rect);
+ ui_draw_but_HISTOGRAM(ar, but,
&tui->wcol_regular, rect);
break;
case BUT_CURVE:
Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c
2010-01-28 07:09:22 UTC (rev 26359)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c
2010-01-28 07:26:21 UTC (rev 26360)
@@ -701,11 +701,6 @@
/* render info */
if(ibuf && ima && show_render)
draw_render_info(ima, ar);
-
- /* histogram */
- if (ibuf) {
- histogram_update(&sima->hist, ibuf);
- }
/* XXX integrate this code */
#if 0
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
