added histogram invert

jcupitt · jcupitt · commit 55fa8f6f2764 · 2013-02-15T16:48:01.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 started 7.32 22/1/13
 - added colour temperature to colour and colour to colour temperature
 - removed gtksheet, broken on windows, no future on anywhere
+- added histogram invert
 
 started 7.31 3/9/12
 - don't show tooltips for toolkit menu items with submenus (thanks MvGulik)
diff --git a/TODO b/TODO
@@ -4,7 +4,11 @@
 
 - os x binary can't save png?
 
-- test Mono / Monospace thing
+- Matrix / New / Laplacian
+
+  edit a cell, turns into a plain matrix
+
+  need to override edit method
 
 - didn't we have band_and or equivalent somewhere?
 
@@ -14,10 +18,6 @@
 
 - breadcrumb trail for prog window, so you can get back to where you were?
 
-- im_invertlut() as a menu item
-
-  handy for inverting the results of cum/norm/etc.
-
 - to_image on a hist should tag as image
 
 - lambdas don't pattern match?
diff --git a/share/nip2/start/Histogram.def b/share/nip2/start/Histogram.def
@@ -135,6 +135,11 @@ Hist_norm_item = class
 	action x = map_unary hist_norm x;
 }
 
+Hist_inv_item = class 
+	Menuaction "In_vert" "invert a histogram" {
+	action x = map_unary hist_inv x;
+}
+
 Hist_match_item = class 
 	Menuaction "Ma_tch" 
 		"find LUT which will match first histogram to second" {
diff --git a/share/nip2/start/_stdenv.def b/share/nip2/start/_stdenv.def
@@ -1455,6 +1455,34 @@ hist_norm hist
 		hist_norm Operator_type.COMPOUND_REWRAP false;
 }
 
+hist_inv hist 
+	= oo_unary_function hist_inv_op hist, is_class hist
+	= inv hist, is_image hist
+	= error (_ "bad arguments to " ++ "hist_inv")
+{
+	hist_inv_op = Operator "hist_inv" 
+		hist_inv Operator_type.COMPOUND_REWRAP false;
+
+	inv im
+		= im_invertlut (to_matrix im''') len
+	{
+		// need a vertical doublemask
+		im' 
+			= rot90 im, get_width im > 1 && get_height im == 1 
+			= im, get_width im == 1 && get_height im > 1
+			= error (_ "not a hist");
+		len = get_height im';
+
+		// values must be scaled to 0 - 1
+		im'' = im' / (max im');
+		
+		// add an index column on the left
+		// again, must be in 0-1
+		y = ((make_xy 1 len)?1) / len;
+		im''' = y ++ im'';
+	}
+}
+
 hist_match in ref
 	= oo_binary_function hist_match_op in ref, is_class in
 	= oo_binary'_function hist_match_op in ref, is_class ref
