Added a preview and #if'ed out some unreachable code.

* plug-ins/common/engrave.c: Added a preview and #if'ed out some
  unreachable code.
This commit is contained in:
David Odin 2004-09-25 14:06:11 +00:00
parent ad1c2ca0fc
commit b1f789d6f0
2 changed files with 272 additions and 210 deletions

View File

@ -1,3 +1,8 @@
2004-09-25 DindinX <dindinx@gimp.org>
* plug-ins/common/engrave.c: Added a preview and #if'ed out some
unreachable code.
2004-09-25 Michael Natterer <mitch@gimp.org>
* app/core/gimppickable.[ch]: added new vitrual function

View File

@ -35,31 +35,40 @@
typedef struct
{
gint height;
gint limit;
gint height;
gboolean limit;
gboolean preview;
} EngraveValues;
static void query (void);
static void run (const gchar *name,
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
gint nparams,
const GimpParam *param,
gint *nreturn_vals,
GimpParam **return_vals);
static gboolean engrave_dialog (void);
static gboolean engrave_dialog (GimpDrawable *drawable);
static void engrave (GimpDrawable *drawable);
static void engrave_large (GimpDrawable *drawable,
gint height,
gint limit);
static void engrave_small (GimpDrawable *drawable,
gint height,
gint limit,
gint tile_width);
static void engrave_sub (gint height,
gint limit,
gint bpp,
gint color_n);
static void engrave (GimpDrawable *drawable,
GimpDrawablePreview *preview);
#if 0
static void engrave_large (GimpDrawable *drawable,
gint height,
gboolean limit,
GimpDrawablePreview *preview);
#endif
static void engrave_small (GimpDrawable *drawable,
gint height,
gboolean limit,
gint tile_width,
GimpDrawablePreview *preview);
static void engrave_sub (gint height,
gboolean limit,
gint bpp,
gint color_n);
GimpPlugInInfo PLUG_IN_INFO =
{
@ -71,10 +80,11 @@ GimpPlugInInfo PLUG_IN_INFO =
static EngraveValues pvals =
{
10
10, /* height */
FALSE, /* limit */
TRUE /* preview */
};
MAIN ()
static void
@ -90,16 +100,16 @@ query (void)
};
gimp_install_procedure ("plug_in_engrave",
"Engrave the contents of the specified drawable",
"Creates a black-and-white 'engraved' version of an image as seen in old illustrations",
"Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
"Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
"1995,1996,1997",
N_("En_grave..."),
"RGBA, GRAYA",
GIMP_PLUGIN,
G_N_ELEMENTS (args), 0,
args, NULL);
"Engrave the contents of the specified drawable",
"Creates a black-and-white 'engraved' version of an image as seen in old illustrations",
"Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
"Spencer Kimball & Peter Mattis, Eiichi Takamori, Torsten Martinsen",
"1995,1996,1997",
N_("En_grave..."),
"RGBA, GRAYA",
GIMP_PLUGIN,
G_N_ELEMENTS (args), 0,
args, NULL);
gimp_plugin_menu_register ("plug_in_engrave",
N_("<Image>/Filters/Distorts"));
@ -137,25 +147,25 @@ run (const gchar *name,
gimp_get_data ("plug_in_engrave", &pvals);
/* First acquire information with a dialog */
if (!engrave_dialog ())
{
gimp_drawable_detach (drawable);
return;
}
if (!engrave_dialog (drawable))
{
gimp_drawable_detach (drawable);
return;
}
break;
case GIMP_RUN_NONINTERACTIVE:
/* Make sure all the arguments are there! */
if (nparams != 5)
status = GIMP_PDB_CALLING_ERROR;
status = GIMP_PDB_CALLING_ERROR;
if (status == GIMP_PDB_SUCCESS)
{
pvals.height = param[3].data.d_int32;
pvals.limit = (param[4].data.d_int32) ? TRUE : FALSE;
}
{
pvals.height = param[3].data.d_int32;
pvals.limit = (param[4].data.d_int32) ? TRUE : FALSE;
}
if ((status == GIMP_PDB_SUCCESS) &&
pvals.height < 0)
status = GIMP_PDB_CALLING_ERROR;
pvals.height < 0)
status = GIMP_PDB_CALLING_ERROR;
break;
case GIMP_RUN_WITH_LAST_VALS:
@ -172,14 +182,14 @@ run (const gchar *name,
gimp_progress_init (_("Engraving..."));
gimp_tile_cache_ntiles (TILE_CACHE_SIZE);
engrave (drawable);
engrave (drawable, NULL);
if (run_mode != GIMP_RUN_NONINTERACTIVE)
gimp_displays_flush ();
gimp_displays_flush ();
/* Store data */
if (run_mode == GIMP_RUN_INTERACTIVE)
gimp_set_data ("plug_in_engrave", &pvals, sizeof (EngraveValues));
gimp_set_data ("plug_in_engrave", &pvals, sizeof (EngraveValues));
}
values[0].data.d_status = status;
@ -187,10 +197,11 @@ run (const gchar *name,
}
static gboolean
engrave_dialog (void)
engrave_dialog (GimpDrawable *drawable)
{
GtkWidget *dlg;
GtkWidget *vbox;
GtkWidget *dialog;
GtkWidget *main_vbox;
GtkWidget *preview;
GtkWidget *table;
GtkWidget *toggle;
GtkObject *adj;
@ -198,48 +209,61 @@ engrave_dialog (void)
gimp_ui_init ("engrave", FALSE);
dlg = gimp_dialog_new (_("Engrave"), "engrave",
NULL, 0,
gimp_standard_help_func, "plug-in-engrave",
dialog = gimp_dialog_new (_("Engrave"), "engrave",
NULL, 0,
gimp_standard_help_func, "plug-in-engrave",
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
NULL);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
main_vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox);
gtk_widget_show (main_vbox);
preview = gimp_drawable_preview_new (drawable, &pvals.preview);
gtk_box_pack_start_defaults (GTK_BOX (main_vbox), preview);
gtk_widget_show (preview);
g_signal_connect_swapped (preview, "invalidated",
G_CALLBACK (engrave),
drawable);
table = gtk_table_new (1, 3, FALSE);
gtk_table_set_col_spacings (GTK_TABLE (table), 6);
gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), table, FALSE, FALSE, 0);
gtk_widget_show (table);
adj = gimp_scale_entry_new (GTK_TABLE (table), 0, 0,
_("_Height:"), SCALE_WIDTH, 0,
pvals.height, 2.0, 16.0, 1.0, 4.0, 0,
TRUE, 0, 0,
NULL, NULL);
_("_Height:"), SCALE_WIDTH, 0,
pvals.height, 2.0, 16.0, 1.0, 4.0, 0,
TRUE, 0, 0,
NULL, NULL);
g_signal_connect (adj, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&pvals.height);
g_signal_connect_swapped (adj, "value_changed",
G_CALLBACK (gimp_preview_invalidate),
preview);
toggle = gtk_check_button_new_with_mnemonic (_("_Limit line width"));
gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (main_vbox), toggle, FALSE, FALSE, 0);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), pvals.limit);
gtk_widget_show (toggle);
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&pvals.limit);
g_signal_connect_swapped (toggle, "toggled",
G_CALLBACK (gimp_preview_invalidate),
preview);
gtk_widget_show (dlg);
gtk_widget_show (dialog);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
gtk_widget_destroy (dialog);
return run;
}
@ -247,41 +271,48 @@ engrave_dialog (void)
/* Engrave interface functions */
static void
engrave (GimpDrawable *drawable)
engrave (GimpDrawable *drawable,
GimpDrawablePreview *preview)
{
gint tile_width;
gint height;
gint limit;
gint tile_width;
gint height;
gboolean limit;
tile_width = gimp_tile_width();
height = pvals.height;
limit = pvals.limit;
/* [DindinX] this test is always false since
* tile_width == 64 and height <= 16 */
#if 0
if (height >= tile_width)
engrave_large (drawable, height, limit);
engrave_large (drawable, height, limit, preview);
else
engrave_small (drawable, height, limit, tile_width);
#endif
engrave_small (drawable, height, limit, tile_width, preview);
}
#if 0
static void
engrave_large (GimpDrawable *drawable,
gint height,
gint limit)
engrave_large (GimpDrawable *drawable,
gint height,
gboolean limit,
GimpDrawablePreview *preview)
{
GimpPixelRgn src_rgn, dest_rgn;
guchar *src_row, *dest_row;
guchar *src, *dest;
gulong *average;
gint row, col, b, bpp;
gint x, y, y_step, inten, v;
gulong count;
gint x1, y1, x2, y2;
gint progress, max_progress;
gpointer pr;
GimpPixelRgn src_rgn, dest_rgn;
guchar *src_row, *dest_row;
guchar *src, *dest;
gulong *average;
gint row, col, b, bpp;
gint x, y, y_step, inten, v;
gulong count;
gint x1, y1, x2, y2;
gint progress, max_progress;
gpointer pr;
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
bpp = (gimp_drawable_is_rgb(drawable->drawable_id)) ? 3 : 1;
average = g_new(gulong, bpp);
bpp = (gimp_drawable_is_rgb (drawable->drawable_id)) ? 3 : 1;
average = g_new (gulong, bpp);
/* Initialize progress */
progress = 0;
@ -290,76 +321,76 @@ engrave_large (GimpDrawable *drawable,
for (y = y1; y < y2; y += height - (y % height))
{
for (x = x1; x < x2; ++x)
{
y_step = height - (y % height);
y_step = MIN(y_step, x2 - x);
{
y_step = height - (y % height);
y_step = MIN (y_step, x2 - x);
gimp_pixel_rgn_init (&src_rgn, drawable, x, y, 1, y_step,
FALSE, FALSE);
for (b = 0; b < bpp; b++)
average[b] = 0;
count = 0;
gimp_pixel_rgn_init (&src_rgn, drawable, x, y, 1, y_step,
FALSE, FALSE);
for (b = 0; b < bpp; b++)
average[b] = 0;
count = 0;
for (pr = gimp_pixel_rgns_register (1, &src_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process(pr))
{
src_row = src_rgn.data;
for (row = 0; row < src_rgn.h; row++)
{
src = src_row;
for (col = 0; col < src_rgn.w; col++)
{
for (b = 0; b < bpp; b++)
average[b] += src[b];
src += src_rgn.bpp;
count += 1;
}
src_row += src_rgn.rowstride;
}
/* Update progress */
progress += src_rgn.w * src_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
for (pr = gimp_pixel_rgns_register (1, &src_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process(pr))
{
src_row = src_rgn.data;
for (row = 0; row < src_rgn.h; row++)
{
src = src_row;
for (col = 0; col < src_rgn.w; col++)
{
for (b = 0; b < bpp; b++)
average[b] += src[b];
src += src_rgn.bpp;
count += 1;
}
src_row += src_rgn.rowstride;
}
/* Update progress */
progress += src_rgn.w * src_rgn.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
if (count > 0)
for (b = 0; b < bpp; b++)
average[b] = (guchar) (average[b] / count);
if (count > 0)
for (b = 0; b < bpp; b++)
average[b] = (guchar) (average[b] / count);
if (bpp < 3)
inten = average[0] / 254.0 * height;
else
inten = GIMP_RGB_INTENSITY (average[0],
if (bpp < 3)
inten = average[0] / 254.0 * height;
else
inten = GIMP_RGB_INTENSITY (average[0],
average[1],
average[2]) / 254.0 * height;
gimp_pixel_rgn_init (&dest_rgn,
drawable, x, y, 1, y_step, TRUE, TRUE);
for (pr = gimp_pixel_rgns_register (1, &dest_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process(pr))
{
dest_row = dest_rgn.data;
for (row = 0; row < dest_rgn.h; row++)
{
dest = dest_row;
v = inten > row ? 255 : 0;
if (limit)
{
if (row == 0)
v = 255;
else if (row == height-1)
v = 0;
}
for (b = 0; b < bpp; b++)
dest[b] = v;
dest_row += dest_rgn.rowstride;
}
/* Update progress */
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update((double) progress / (double) max_progress);
}
}
gimp_pixel_rgn_init (&dest_rgn,
drawable, x, y, 1, y_step, TRUE, TRUE);
for (pr = gimp_pixel_rgns_register (1, &dest_rgn);
pr != NULL;
pr = gimp_pixel_rgns_process(pr))
{
dest_row = dest_rgn.data;
for (row = 0; row < dest_rgn.h; row++)
{
dest = dest_row;
v = inten > row ? 255 : 0;
if (limit)
{
if (row == 0)
v = 255;
else if (row == height-1)
v = 0;
}
for (b = 0; b < bpp; b++)
dest[b] = v;
dest_row += dest_rgn.rowstride;
}
/* Update progress */
progress += dest_rgn.w * dest_rgn.h;
gimp_progress_update((double) progress / (double) max_progress);
}
}
}
g_free(average);
@ -369,6 +400,7 @@ engrave_large (GimpDrawable *drawable,
gimp_drawable_merge_shadow(drawable->drawable_id, TRUE);
gimp_drawable_update(drawable->drawable_id, x1, y1, x2 - x1, y2 - y1);
}
#endif
typedef struct
{
@ -380,38 +412,54 @@ typedef struct
PixelArea area;
static void
engrave_small (GimpDrawable *drawable,
gint height,
gint limit,
gint tile_width)
engrave_small (GimpDrawable *drawable,
gint line_height,
gboolean limit,
gint tile_width,
GimpDrawablePreview *preview)
{
GimpPixelRgn src_rgn, dest_rgn;
gint bpp, color_n;
gint x1, y1, x2, y2;
gint progress, max_progress;
gint bpp, color_n;
gint x1, y1, x2, y2;
gint width, height;
gint progress, max_progress;
/*
For speed efficiency, operates on PixelAreas, whose each width and
height are less than tile size.
If both ends of area cannot be divided by height ( as
x1%height != 0 etc.), operates on the remainder pixels.
If both ends of area cannot be divided by line_height ( as
x1%line_height != 0 etc.), operates on the remainder pixels.
*/
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
if (preview)
{
gimp_preview_get_position (GIMP_PREVIEW (preview), &x1, &y1);
gimp_preview_get_size (GIMP_PREVIEW (preview), &width, &height);
x2 = x1 + width;
y2 = y1 + height;
}
else
{
gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2);
width = x2 - x1;
height = y2 - y1;
}
gimp_pixel_rgn_init (&src_rgn, drawable,
x1, y1, x2 - x1, y2 - y1, FALSE, FALSE);
x1, y1, width, height, FALSE, FALSE);
gimp_pixel_rgn_init (&dest_rgn, drawable,
x1, y1, x2 - x1, y2 - y1, TRUE, TRUE);
x1, y1, width, height, (preview == NULL), TRUE);
/* Initialize progress */
progress = 0;
max_progress = (x2 - x1) * (y2 - y1);
max_progress = width * height;
bpp = drawable->bpp;
color_n = (gimp_drawable_is_rgb (drawable->drawable_id)) ? 3 : 1;
area.width = (tile_width / height) * height;
area.width = (tile_width / line_height) * line_height;
area.data = g_new(guchar, (glong) bpp * area.width * area.width);
for (area.y = y1; area.y < y2;
@ -420,36 +468,45 @@ engrave_small (GimpDrawable *drawable,
area.h = area.width - (area.y % area.width);
area.h = MIN(area.h, y2 - area.y);
for (area.x = x1; area.x < x2; ++area.x)
{
gimp_pixel_rgn_get_rect (&src_rgn, area.data, area.x, area.y, 1,
area.h);
{
gimp_pixel_rgn_get_rect (&src_rgn, area.data, area.x, area.y, 1,
area.h);
engrave_sub (height, limit, bpp, color_n);
engrave_sub (line_height, limit, bpp, color_n);
gimp_pixel_rgn_set_rect (&dest_rgn, area.data, area.x, area.y, 1,
area.h);
/* Update progress */
progress += area.h;
gimp_progress_update ((double) progress / (double) max_progress);
}
gimp_pixel_rgn_set_rect (&dest_rgn, area.data,
area.x, area.y, 1, area.h);
}
if (!preview)
{
/* Update progress */
progress += area.h * width;
gimp_progress_update ((double) progress / (double) max_progress);
}
}
g_free(area.data);
/* update the engraved region */
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, x2 - x1, y2 - y1);
if (preview)
{
gimp_drawable_preview_draw_region (preview, &dest_rgn);
}
else
{
gimp_drawable_flush (drawable);
gimp_drawable_merge_shadow (drawable->drawable_id, TRUE);
gimp_drawable_update (drawable->drawable_id, x1, y1, x2 - x1, y2 - y1);
}
}
static void
engrave_sub (gint height,
gint limit,
gint bpp,
gint color_n)
gint limit,
gint bpp,
gint color_n)
{
glong average[3]; /* color_n <= 3 */
glong average[3]; /* color_n <= 3 */
gint y, h, inten, v;
guchar *buf_row, *buf;
gint row;
@ -470,30 +527,30 @@ engrave_sub (gint height,
h = MIN(h, area.y + area.h - y);
for (i = 0; i < color_n; i++)
average[i] = 0;
average[i] = 0;
count = 0;
/* Read */
buf_row = area.data + (y - area.y) * rowstride;
for (row = 0; row < h; row++)
{
buf = buf_row;
for (i = 0; i < color_n; i++)
average[i] += buf[i];
count++;
buf_row += rowstride;
}
{
buf = buf_row;
for (i = 0; i < color_n; i++)
average[i] += buf[i];
count++;
buf_row += rowstride;
}
/* Average */
if (count > 0)
for (i = 0; i < color_n; i++)
average[i] /= count;
for (i = 0; i < color_n; i++)
average[i] /= count;
if (bpp < 3)
inten = average[0] / 254.0 * height;
inten = average[0] / 254.0 * height;
else
inten = GIMP_RGB_INTENSITY (average[0],
inten = GIMP_RGB_INTENSITY (average[0],
average[1],
average[2]) / 254.0 * height;
@ -501,19 +558,19 @@ engrave_sub (gint height,
buf_row = area.data + (y - area.y) * rowstride;
for (row = 0; row < h; row++)
{
buf = buf_row;
v = inten > row ? 255 : 0;
if (limit)
{
if (row == 0)
v = 255;
else if (row == height-1)
v = 0;
}
for (i = 0; i < color_n; i++)
buf[i] = v;
buf_row += rowstride;
}
{
buf = buf_row;
v = inten > row ? 255 : 0;
if (limit)
{
if (row == 0)
v = 255;
else if (row == height-1)
v = 0;
}
for (i = 0; i < color_n; i++)
buf[i] = v;
buf_row += rowstride;
}
}
}