start updating menus for 8.7

jcupitt · jcupitt · commit 4b1503db8210 · 2018-07-31T15:36:27.000+01:00
diff --git a/share/nip2/start/Filter.def b/share/nip2/start/Filter.def
@@ -20,6 +20,41 @@ Filter_conv_item = class
 		action x = map_unary (conv filter_sharp) x;
 	}
 
+	Usharp_item = class
+		Menuaction "_Unsharp Mask" "cored sharpen of L only in LAB image" {
+		action x = class
+			_result {
+			_vislevel = 3;
+	
+			size = Option "Radius" [
+				"3 pixels",
+				"5 pixels",
+				"7 pixels",
+				"9 pixels",
+				"11 pixels",
+				"51 pixels"
+			] 0;
+	
+			st = Scale "Smoothness threshold" 0 5 2;
+			bm = Scale "Brighten by at most" 1 50 10;
+			dm = Scale "Darken by at most" 1 50 20;
+			fs = Scale "Sharpen flat areas by" 0 5 0.5;
+			js = Scale "Sharpen jaggy areas by" 0 5 1;
+	
+			_result
+				= map_unary process x
+			{
+				process in
+					= Image in'''
+				{
+					in' = colour_transform_to Image_type.LABS in.value;
+					in'' = sharpen [3, 5, 7, 9, 11, 51]?size st bm dm fs js in';
+					in''' = colour_transform_to (get_type in) in'';
+				}
+			}
+		}
+	}
+
 	Emboss_item = class
 		Menuaction "_Emboss" "1 pixel displace emboss" {
 		action x = map_unary (conv filter_emboss) x;
@@ -32,16 +67,7 @@ Filter_conv_item = class
 
 	Sobel_item = class
 		Menuaction "So_bel" "3x3 Sobel edge detect" {
-		action x 
-			= map_unary sobel x
-		{
-			sobel im
-				= abs (a - 128) + abs (b - 128)
-			{
-				a = conv filter_sobel im;
-				b = conv (rot270 filter_sobel) im;
-			}
-		}
+		action x = map_unary sobel x;
 	}
 
 /* 3x3 line detect of image
@@ -62,37 +88,20 @@ Kirk
 		}
 	}
 
-	Usharp_item = class
-		Menuaction "_Unsharp Mask" "cored sharpen of L only in LAB image" {
-		action x = class
+	Canny_item = class
+		Menuaction "Canny" "Canny edge detector" {
+		action x = class 
 			_result {
 			_vislevel = 3;
-	
-			size = Option "Radius" [
-				"3 pixels",
-				"5 pixels",
-				"7 pixels",
-				"9 pixels",
-				"11 pixels",
-				"51 pixels"
-			] 0;
-	
-			st = Scale "Smoothness threshold" 0 5 2;
-			bm = Scale "Brighten by at most" 1 50 10;
-			dm = Scale "Darken by at most" 1 50 20;
-			fs = Scale "Sharpen flat areas by" 0 5 0.5;
-			js = Scale "Sharpen jaggy areas by" 0 5 1;
-	
-			_result
+
+			sigma = Scale "Sigma" 0.1 10 2;
+			prec = Option "Precision" ["Int", "Float", "Approximate"] 1;
+
+			_result 
 				= map_unary process x
 			{
 				process in
-					= Image in'''
-				{
-					in' = colour_transform_to Image_type.LABS in.value;
-					in'' = sharpen [3, 5, 7, 9, 11, 51]?size st bm dm fs js in';
-					in''' = colour_transform_to (get_type in) in'';
-				}
+					= canny sigma prec.value in;
 			}
 		}
 	}
diff --git a/share/nip2/start/Image.def b/share/nip2/start/Image.def
@@ -1902,16 +1902,38 @@ Pattern_images_item = class
 
 			text = String "Text to paint" "<i>Hello</i> world!";
 			font = Fontname "Use font" Workspaces.Preferences.PAINTBOX_FONT;
-			wrap = Expression "Wrap text at" 500;
+			fontfile = Pathname "Font file" "";
+			width = Expression "Text width" 500;
+			height = Expression "Text height" 0;
 			align = Option "Alignment" [
 				"Left",
 				"Centre", 
 				"Right" 
 			] 0;
 			dpi = Expression "DPI" 300;
+			spacing = Expression "Line spacing" 1.1;
+
+			_result 
+				= Image out
+			{
+				[out] = vips_call "text" [text.value] 
+					(base_options ++ fontfile_options);
+
+				base_options = [
+					$font => font.value,
+					$width => to_real width,
+					$height => to_real height,
+					$align => align.value,
+					$dpi => to_real dpi,
+					$spacing => to_real spacing
+				];
+			
+				fontfile_options
+					= [$fontfile => fontfile.value],
+						fontfile.value != ""
+					= [];
+			}
 
-			_result = Image (im_text text.value font.value 
-				(to_real wrap) align.value (to_real dpi));
 		}
 	}
 
diff --git a/share/nip2/start/_stdenv.def b/share/nip2/start/_stdenv.def
@@ -2617,3 +2617,38 @@ hist_entropy x
 		];
 	}
 }
+
+canny sigma precision x 
+	= oo_unary_function canny_op x, is_class x
+	= canny_im (to_real sigma) (to_int precision) x, is_image x 
+	= error (_ "bad arguments to " ++ "canny")
+{
+	canny_op = Operator "canny" 
+		(canny sigma precision) Operator_type.COMPOUND_REWRAP false;
+
+	canny_im sigma precision x
+		= out
+	{
+		[out] = vips_call "canny" [x] [
+			$sigma => sigma,
+			$precision => precision
+		];
+	}
+
+}
+
+sobel x 
+	= oo_unary_function sobel_op x, is_class x
+	= sobel_im x, is_image x 
+	= error (_ "bad arguments to " ++ "sobel")
+{
+	sobel_op = Operator "sobel" 
+		sobel Operator_type.COMPOUND_REWRAP false;
+
+	sobel_im x
+		= out
+	{
+		[out] = vips_call "sobel" [x] [
+		];
+	}
+}
