add combine mode to indexed hist

Author: jcupitt

ChangeLog

@@ -3,6 +3,7 @@ started 8.6.0 16/8/17
 - improve radiance support
 - add composite to alpha menu
 - add Image / Select / Fill 
+- add combine mode to indexed histogram
 
 started 8.5.1 22/1/17
 - fix a crash bug

share/nip2/start/Histogram.def

@@ -80,21 +80,28 @@ Hist_find_item = class
 	Indexed_item = class
 		Menuaction "_Indexed" 
 			"use a 1-band index image to pick bins for an n-band image" {
-		action x y 
-			= map_binary map x y
-		{
-			map a b
-				= hist_find_indexed index im
-			{
-				[im, index] = sortc (const is_index) [a, b];
+		action x y  = class
+			_result {
+			_vislevel = 3;
+
+			combine = Combine_picker Combine_type.SUM;
 
-				is_index x
-					= has_image x && b == 1 && 
-						(f == Image_format.UCHAR || f == Image_format.USHORT)
+			_result
+				= map_binary map x y
+			{
+				map a b
+					= hist_find_indexed combine.value index im
 				{
-					im = get_image x;
-					b = get_bands x;
-					f = get_format x;
+					[im, index] = sortc (const is_index) [a, b];
+
+					is_index x
+						= has_image x && b == 1 && 
+							(f == Image_format.UCHAR || f == Image_format.USHORT)
+					{
+						im = get_image x;
+						b = get_bands x;
+						f = get_format x;
+					}
 				}
 			}
 		}

share/nip2/start/_stdenv.def

@@ -1434,15 +1434,39 @@ hist_find_nD bins image
 		(hist_find_nD bins) Operator_type.COMPOUND_REWRAP false;
 }
 
-hist_find_indexed index value
+hist_find_indexed mode index value
 	= oo_binary_function hist_find_indexed_op index value, is_class index
 	= oo_binary'_function hist_find_indexed_op index value, is_class value
-	= im_hist_indexed index value, is_image index && is_image value
+	= indexed index value, is_image index && is_image value
 	= error (_ "bad arguments to " ++ "hist_find_indexed")
 {
 	hist_find_indexed_op = Operator "hist_find_indexed" 
-		(compose (compose Plot_histogram) hist_find_indexed) 
+		(compose (compose Plot_histogram) (hist_find_indexed mode)) 
 			Operator_type.COMPOUND false;
+
+	indexed index value
+		= out
+	{
+		[out] = vips_call "hist_find_indexed" [value, index] [
+			"combine" => mode
+		];
+	}
+}
+
+hist_entropy x 
+	= oo_unary_function hist_entropy_op x, is_class x
+	= entropy x, is_image x 
+	= error (_ "bad arguments to " ++ "hist_entropy")
+{
+	hist_entropy_op = Operator "hist_entropy" 
+		hist_entropy Operator_type.COMPOUND_REWRAP false;
+
+	entropy x
+		= out
+	{
+		[out] = vips_call "hist_entropy" [x] [
+		];
+	}
 }
 
 hist_map hist image

share/nip2/start/_types.def

@@ -1389,3 +1389,22 @@ Blend_picker default = class
 	blend = Option "Blend" Blend_type.descriptions default;
 }
 
+Combine_type = class {
+	MAX = 0;
+	SUM = 1;
+	MIN = 2;
+
+	enum = Enum [
+		_ "Maximum" => MAX,
+		_ "Sum" => SUM,
+		_ "Minimum" => MIN
+	];
+}
+
+Combine type = class {
+	value = Combine_type.enum.names?type;
+}
+
+Combine_sum = Combine Combine_type.SUM;
+
+Combine_picker default = Option "Combine" Combine_type.enum.names default;