[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26092] trunk/blender/source/blender/ editors/space_image: * Make image Histogram only update when region is visible

[Matt Ebb]

Revision: 26092
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26092
Author:   broken
Date:     2010-01-19 03:26:36 +0100 (Tue, 19 Jan 2010)

Log Message:
-----------
* Make image Histogram only update when region is visible
* Clean up some remaining code

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_draw.c
    trunk/blender/source/blender/editors/space_image/space_image.c

Modified: trunk/blender/source/blender/editors/space_image/image_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_draw.c	2010-01-19 02:15:37 UTC (rev 26091)
+++ trunk/blender/source/blender/editors/space_image/image_draw.c	2010-01-19 02:26:36 UTC (rev 26092)
@@ -204,16 +204,6 @@
 	UI_DrawString(10, 10, str);
 }
 
-static inline int get_bin_float(float f)
-{
-	CLAMP(f, 0.0, 1.0);
-	
-	//return (int) (((f + 0.25) / 1.5) * 512);
-
-	return (int)(f * 511);
-}
-
-
 /* image drawing */
 
 static void draw_image_grid(ARegion *ar, float zoomx, float zoomy)

Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c	2010-01-19 02:15:37 UTC (rev 26091)
+++ trunk/blender/source/blender/editors/space_image/space_image.c	2010-01-19 02:26:36 UTC (rev 26092)
@@ -75,6 +75,21 @@
 
 #include "image_intern.h"
 
+
+static void image_histogram_tag_refresh(ScrArea *sa)
+{
+	SpaceImage *sima= (SpaceImage *)sa->spacedata.first;
+	ARegion *ar;
+	
+	/* only while histogram is visible */
+	for (ar=sa->regionbase.first; ar; ar=ar->next) {
+		if (ar->regiontype == RGN_TYPE_PREVIEW && ar->flag & RGN_FLAG_HIDDEN)
+			return;
+	}
+	
+	sima->hist.ok=0;
+}
+
 /* ******************** manage regions ********************* */
 
 ARegion *image_has_buttons_region(ScrArea *sa)
@@ -128,6 +143,8 @@
 	
 	arnew->flag = RGN_FLAG_HIDDEN;
 	
+	image_histogram_tag_refresh(sa);
+	
 	return arnew;
 }
 
@@ -315,12 +332,6 @@
 	}
 }
 
-static void image_histogram_tag_refresh(ScrArea *sa)
-{
-	SpaceImage *sima= (SpaceImage *)sa->spacedata.first;
-	sima->hist.ok=0;
-}
-
 static void image_listener(ScrArea *sa, wmNotifier *wmn)
 {
 	SpaceImage *sima= (SpaceImage *)sa->spacedata.first;