dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins: Port qbist to GimpProcedureDialog 

Connected anti-aliasing GUI to a property so that
script writers could also configure this when running
the plug-in.
This commit is contained in:
Alx Sa 2024-03-28 17:55:50 +00:00
parent e1170f2cb9
commit 82d4bf26ad
1 changed files with 52 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
plug-ins/common/qbist.c
View File

@ -115,7 +115,8 @@ static GimpValueArray * qbist_run (GimpProcedure *procedure,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
static gboolean dialog_run (void); static gboolean dialog_run (GimpProcedure *procedure,
GimpProcedureConfig *config);
static void dialog_new_variations (GtkWidget *widget, static void dialog_new_variations (GtkWidget *widget,
gpointer data); gpointer data);
static void dialog_update_previews (GtkWidget *widget, static void dialog_update_previews (GtkWidget *widget,
@ -189,17 +190,24 @@ qbist_create_procedure (GimpPlugIn *plug_in,
gimp_procedure_set_documentation (procedure, gimp_procedure_set_documentation (procedure,
_("Generate a huge variety of " _("Generate a huge variety of "
"abstract patterns"), "abstract patterns"),
"This Plug-in is based on an article by " _("This Plug-in is based on an article by "
"Jörn Loviscach (appeared in c't 10/95, " "Jörn Loviscach (appeared in c't 10/95, "
"page 326). It generates modern art " "page 326). It generates modern art "
"pictures from a random genetic " "pictures from a random genetic "
"formula.", "formula."),
name); name);
gimp_procedure_set_attribution (procedure, gimp_procedure_set_attribution (procedure,
"Jörn Loviscach, Jens Ch. Restemeier", "Jörn Loviscach, Jens Ch. Restemeier",
"Jörn Loviscach, Jens Ch. Restemeier", "Jörn Loviscach, Jens Ch. Restemeier",
PLUG_IN_VERSION); PLUG_IN_VERSION);
GIMP_PROC_ARG_BOOLEAN (procedure, "anti-aliasing",
_("_Anti-aliasing"),
_("Enable anti-aliasing using an oversampling "
"algorithm"),
TRUE,
G_PARAM_READWRITE);
/* Saving the pattern as a parasite is a trick allowing to store /* Saving the pattern as a parasite is a trick allowing to store
* random binary data. * random binary data.
*/ */
@ -207,11 +215,6 @@ qbist_create_procedure (GimpPlugIn *plug_in,
"Qbist pattern", NULL, "Qbist pattern", NULL,
G_PARAM_READWRITE); G_PARAM_READWRITE);
GIMP_PROC_AUX_ARG_INT (procedure, "oversampling",
"Oversampling", NULL,
1, 4, 4,
G_PARAM_READWRITE);
GIMP_PROC_AUX_ARG_STRING (procedure, "data-path", GIMP_PROC_AUX_ARG_STRING (procedure, "data-path",
"Path of data file", "Path of data file",
_("Any file which will be used as source for pattern generation"), _("Any file which will be used as source for pattern generation"),
@ -241,6 +244,7 @@ qbist_run (GimpProcedure *procedure,
guint32 pattern_data_length; guint32 pattern_data_length;
gint total_pixels; gint total_pixels;
gint done_pixels; gint done_pixels;
gboolean anti_aliasing = TRUE;
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
@ -284,14 +288,12 @@ qbist_run (GimpProcedure *procedure,
memset (&qbist_info, 0, sizeof (qbist_info)); memset (&qbist_info, 0, sizeof (qbist_info));
create_info (&qbist_info.info); create_info (&qbist_info.info);
qbist_info.oversampling = 4;
switch (run_mode) switch (run_mode)
{ {
case GIMP_RUN_INTERACTIVE: case GIMP_RUN_INTERACTIVE:
g_object_get (config, g_object_get (config,
"data-path", &qbist_info.path, "data-path", &qbist_info.path,
"oversampling", &qbist_info.oversampling,
"pattern", &pattern_parasite, "pattern", &pattern_parasite,
NULL); NULL);
if (pattern_parasite) if (pattern_parasite)
@ -303,17 +305,18 @@ qbist_run (GimpProcedure *procedure,
pattern_parasite = NULL; pattern_parasite = NULL;
} }
if (! dialog_run ()) if (! dialog_run (procedure, config))
return gimp_procedure_new_return_values (procedure, return gimp_procedure_new_return_values (procedure,
GIMP_PDB_CANCEL, GIMP_PDB_CANCEL,
NULL); NULL);
g_object_get (config, "anti-aliasing", &anti_aliasing, NULL);
pattern_parasite = gimp_parasite_new ("pattern", 0, pattern_parasite = gimp_parasite_new ("pattern", 0,
sizeof (qbist_info.info), sizeof (qbist_info.info),
&qbist_info.info); &qbist_info.info);
g_object_set (config, g_object_set (config,
"data-path", qbist_info.path, "data-path", qbist_info.path,
"oversampling", qbist_info.oversampling,
"pattern", pattern_parasite, "pattern", pattern_parasite,
NULL); NULL);
gimp_parasite_free (pattern_parasite); gimp_parasite_free (pattern_parasite);
@ -327,9 +330,9 @@ qbist_run (GimpProcedure *procedure,
case GIMP_RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
g_object_get (config, g_object_get (config,
"data-path", &qbist_info.path, "data-path", &qbist_info.path,
"oversampling", &qbist_info.oversampling, "anti-aliasing", &anti_aliasing,
"pattern", &pattern_parasite, "pattern", &pattern_parasite,
NULL); NULL);
if (pattern_parasite) if (pattern_parasite)
@ -346,6 +349,8 @@ qbist_run (GimpProcedure *procedure,
total_pixels = img_width * img_height; total_pixels = img_width * img_height;
done_pixels = 0; done_pixels = 0;
qbist_info.oversampling = anti_aliasing ? 4 : 1;
buffer = gimp_drawable_get_shadow_buffer (drawable); buffer = gimp_drawable_get_shadow_buffer (drawable);
iter = gegl_buffer_iterator_new (buffer, iter = gegl_buffer_iterator_new (buffer,
@ -839,9 +844,9 @@ dialog_load (GtkWidget *widget,
NULL); NULL);
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog), gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK, GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL, GTK_RESPONSE_CANCEL,
-1); -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
if (qbist_info.path) if (qbist_info.path)
@ -881,9 +886,9 @@ dialog_save (GtkWidget *widget,
NULL); NULL);
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog), gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK, GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL, GTK_RESPONSE_CANCEL,
-1); -1);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog),
@ -903,16 +908,9 @@ dialog_save (GtkWidget *widget,
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
} }
static void
dialog_toggle_antialaising (GtkWidget *widget,
gpointer data)
{
qbist_info.oversampling =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) ? 4 : 1;
}
static gboolean static gboolean
dialog_run (void) dialog_run (GimpProcedure *procedure,
GimpProcedureConfig *config)
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *vbox; GtkWidget *vbox;
@ -925,33 +923,21 @@ dialog_run (void)
gimp_ui_init (PLUG_IN_BINARY); gimp_ui_init (PLUG_IN_BINARY);
dialog = gimp_dialog_new (_("G-Qbist"), PLUG_IN_ROLE, dialog = gimp_procedure_dialog_new (procedure,
NULL, 0, GIMP_PROCEDURE_CONFIG (config),
gimp_standard_help_func, PLUG_IN_PROC, _("G-Qbist"));
_("_Cancel"), GTK_RESPONSE_CANCEL, vbox = gimp_procedure_dialog_fill_box (GIMP_PROCEDURE_DIALOG (dialog),
_("_OK"), GTK_RESPONSE_OK, "qbist-vbox", "anti-aliasing",
NULL);
NULL);
gimp_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
gimp_window_set_transient (GTK_WINDOW (dialog));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
vbox, FALSE, FALSE, 0);
gtk_widget_show (vbox);
grid = gtk_grid_new (); grid = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (grid), 6); gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
gtk_grid_set_column_spacing (GTK_GRID (grid), 6); gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
gtk_widget_set_margin_bottom (grid, 6);
gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
gtk_widget_show (grid); gtk_widget_set_visible (grid, TRUE);
gtk_box_reorder_child (GTK_BOX (vbox), grid, 0);
info[0] = qbist_info.info; info[0] = qbist_info.info;
dialog_new_variations (NULL, NULL); dialog_new_variations (NULL, NULL);
@ -971,7 +957,7 @@ dialog_run (void)
gtk_grid_attach (GTK_GRID (grid), frame, i % 3, i / 3, 1, 2); gtk_grid_attach (GTK_GRID (grid), frame, i % 3, i / 3, 1, 2);
gtk_container_add (GTK_CONTAINER (frame), button); gtk_container_add (GTK_CONTAINER (frame), button);
gtk_widget_show (frame); gtk_widget_set_visible (frame, TRUE);
} }
else if (i > 2) else if (i > 2)
{ {
@ -982,7 +968,7 @@ dialog_run (void)
gtk_grid_attach (GTK_GRID (grid), button, i % 3, i / 3, 1, 1); gtk_grid_attach (GTK_GRID (grid), button, i % 3, i / 3, 1, 1);
} }
gtk_widget_set_valign (button, GTK_ALIGN_END); gtk_widget_set_valign (button, GTK_ALIGN_END);
gtk_widget_show (button); gtk_widget_set_visible (button, TRUE);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (dialog_select_preview), G_CALLBACK (dialog_select_preview),
@ -991,27 +977,18 @@ dialog_run (void)
preview[i] = gimp_preview_area_new (); preview[i] = gimp_preview_area_new ();
gtk_widget_set_size_request (preview[i], preview_size, preview_size); gtk_widget_set_size_request (preview[i], preview_size, preview_size);
gtk_container_add (GTK_CONTAINER (button), preview[i]); gtk_container_add (GTK_CONTAINER (button), preview[i]);
gtk_widget_show (preview[i]); gtk_widget_set_visible (preview[i], TRUE);
} }
button = gtk_check_button_new_with_mnemonic (_("_Antialiasing"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
qbist_info.oversampling > 1);
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
g_signal_connect (button, "toggled",
G_CALLBACK (dialog_toggle_antialaising),
NULL);
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
gtk_widget_set_margin_top (bbox, 6);
gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
gtk_widget_show (bbox); gtk_widget_set_visible (bbox, TRUE);
button = gtk_button_new_with_mnemonic (_("_Undo")); button = gtk_button_new_with_mnemonic (_("_Undo"));
gtk_container_add (GTK_CONTAINER (bbox), button); gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_widget_show (button); gtk_widget_set_visible (button, TRUE);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (dialog_undo), G_CALLBACK (dialog_undo),
@ -1019,7 +996,7 @@ dialog_run (void)
button = gtk_button_new_with_mnemonic (_("_Open")); button = gtk_button_new_with_mnemonic (_("_Open"));
gtk_container_add (GTK_CONTAINER (bbox), button); gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_widget_show (button); gtk_widget_set_visible (button, TRUE);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (dialog_load), G_CALLBACK (dialog_load),
@ -1027,16 +1004,18 @@ dialog_run (void)
button = gtk_button_new_with_mnemonic (_("_Save")); button = gtk_button_new_with_mnemonic (_("_Save"));
gtk_container_add (GTK_CONTAINER (bbox), button); gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_widget_show (button); gtk_widget_set_visible (button, TRUE);
g_signal_connect (button, "clicked", g_signal_connect (button, "clicked",
G_CALLBACK (dialog_save), G_CALLBACK (dialog_save),
NULL); NULL);
gtk_widget_show (dialog); gimp_procedure_dialog_fill (GIMP_PROCEDURE_DIALOG (dialog),
"qbist-vbox", NULL);
gtk_widget_set_visible (dialog, TRUE);
dialog_update_previews (NULL, preview_size); dialog_update_previews (NULL, preview_size);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); run = gimp_procedure_dialog_run (GIMP_PROCEDURE_DIALOG (dialog));
if (run) if (run)
qbist_info.info = info[0]; qbist_info.info = info[0];