cd924f453a
This was my initial choice, but the more I think about it, the less I am sure this was the right choice. There was some common code (as I was making a common composite bucket fill once the line art was generated), but there is also a lot of different code and the functions were filled of exception when we were doing a line art fill. Also though there is a bit of color works (the way we decide whether a pixel is part of a stroke or not, though currently this is basic grayscale threshold), this is really not the same as other criterions. In particular this was made obvious on the Select by Color tool where the line art criterion was completely meaningless and would have had to be opted-out! This commit split a bit the code. Instead of finding the line art in the criterion list, I add a third choice to the "Fill whole selection"/"Fill similar colors" radio. In turn I create a new GimpBucketFillArea type with the 3 choices, and remove line art value from GimpSelectCriterion. I am not fully happy yet of this code, as it creates a bit of duplicate code, and I would appreciate to move some code away from gimpdrawable-* and gimppickable-* files. This may happen later. I break the work in pieces to not get too messy. Also this removes access to the smart colorization from the API, but that's probably ok as I prefer to not freeze options too early in the process since API needs to be stable. Probably we should get a concept of experimental API.
211 lines
5.4 KiB
Text
211 lines
5.4 KiB
Text
|
|
typedef GType (* GimpGetTypeFunc) (void);
|
|
|
|
static const GimpGetTypeFunc get_type_funcs[] =
|
|
{
|
|
gegl_distance_metric_get_type,
|
|
gimp_add_mask_type_get_type,
|
|
gimp_blend_mode_get_type,
|
|
gimp_brush_application_mode_get_type,
|
|
gimp_brush_generated_shape_get_type,
|
|
gimp_bucket_fill_area_get_type,
|
|
gimp_bucket_fill_mode_get_type,
|
|
gimp_cap_style_get_type,
|
|
gimp_channel_ops_get_type,
|
|
gimp_channel_type_get_type,
|
|
gimp_clone_type_get_type,
|
|
gimp_color_management_mode_get_type,
|
|
gimp_color_rendering_intent_get_type,
|
|
gimp_color_tag_get_type,
|
|
gimp_component_type_get_type,
|
|
gimp_convert_dither_type_get_type,
|
|
gimp_convert_palette_type_get_type,
|
|
gimp_convolve_type_get_type,
|
|
gimp_desaturate_mode_get_type,
|
|
gimp_dodge_burn_type_get_type,
|
|
gimp_fill_type_get_type,
|
|
gimp_foreground_extract_mode_get_type,
|
|
gimp_gradient_blend_color_space_get_type,
|
|
gimp_gradient_segment_color_get_type,
|
|
gimp_gradient_segment_type_get_type,
|
|
gimp_gradient_type_get_type,
|
|
gimp_grid_style_get_type,
|
|
gimp_histogram_channel_get_type,
|
|
gimp_hue_range_get_type,
|
|
gimp_icon_type_get_type,
|
|
gimp_image_base_type_get_type,
|
|
gimp_image_type_get_type,
|
|
gimp_ink_blob_type_get_type,
|
|
gimp_interpolation_type_get_type,
|
|
gimp_join_style_get_type,
|
|
gimp_layer_color_space_get_type,
|
|
gimp_layer_composite_mode_get_type,
|
|
gimp_layer_mode_get_type,
|
|
gimp_mask_apply_mode_get_type,
|
|
gimp_merge_type_get_type,
|
|
gimp_message_handler_type_get_type,
|
|
gimp_offset_type_get_type,
|
|
gimp_orientation_type_get_type,
|
|
gimp_pdb_arg_type_get_type,
|
|
gimp_pdb_error_handler_get_type,
|
|
gimp_pdb_proc_type_get_type,
|
|
gimp_pdb_status_type_get_type,
|
|
gimp_paint_application_mode_get_type,
|
|
gimp_precision_get_type,
|
|
gimp_progress_command_get_type,
|
|
gimp_repeat_mode_get_type,
|
|
gimp_rotation_type_get_type,
|
|
gimp_run_mode_get_type,
|
|
gimp_select_criterion_get_type,
|
|
gimp_size_type_get_type,
|
|
gimp_stack_trace_mode_get_type,
|
|
gimp_stroke_method_get_type,
|
|
gimp_text_direction_get_type,
|
|
gimp_text_hint_style_get_type,
|
|
gimp_text_justification_get_type,
|
|
gimp_transfer_mode_get_type,
|
|
gimp_transform_direction_get_type,
|
|
gimp_transform_resize_get_type,
|
|
gimp_vectors_stroke_type_get_type
|
|
};
|
|
|
|
static const gchar * const type_names[] =
|
|
{
|
|
"GeglDistanceMetric",
|
|
"GimpAddMaskType",
|
|
"GimpBlendMode",
|
|
"GimpBrushApplicationMode",
|
|
"GimpBrushGeneratedShape",
|
|
"GimpBucketFillArea",
|
|
"GimpBucketFillMode",
|
|
"GimpCapStyle",
|
|
"GimpChannelOps",
|
|
"GimpChannelType",
|
|
"GimpCloneType",
|
|
"GimpColorManagementMode",
|
|
"GimpColorRenderingIntent",
|
|
"GimpColorTag",
|
|
"GimpComponentType",
|
|
"GimpConvertDitherType",
|
|
"GimpConvertPaletteType",
|
|
"GimpConvolveType",
|
|
"GimpDesaturateMode",
|
|
"GimpDodgeBurnType",
|
|
"GimpFillType",
|
|
"GimpForegroundExtractMode",
|
|
"GimpGradientBlendColorSpace",
|
|
"GimpGradientSegmentColor",
|
|
"GimpGradientSegmentType",
|
|
"GimpGradientType",
|
|
"GimpGridStyle",
|
|
"GimpHistogramChannel",
|
|
"GimpHueRange",
|
|
"GimpIconType",
|
|
"GimpImageBaseType",
|
|
"GimpImageType",
|
|
"GimpInkBlobType",
|
|
"GimpInterpolationType",
|
|
"GimpJoinStyle",
|
|
"GimpLayerColorSpace",
|
|
"GimpLayerCompositeMode",
|
|
"GimpLayerMode",
|
|
"GimpMaskApplyMode",
|
|
"GimpMergeType",
|
|
"GimpMessageHandlerType",
|
|
"GimpOffsetType",
|
|
"GimpOrientationType",
|
|
"GimpPDBArgType",
|
|
"GimpPDBErrorHandler",
|
|
"GimpPDBProcType",
|
|
"GimpPDBStatusType",
|
|
"GimpPaintApplicationMode",
|
|
"GimpPrecision",
|
|
"GimpProgressCommand",
|
|
"GimpRepeatMode",
|
|
"GimpRotationType",
|
|
"GimpRunMode",
|
|
"GimpSelectCriterion",
|
|
"GimpSizeType",
|
|
"GimpStackTraceMode",
|
|
"GimpStrokeMethod",
|
|
"GimpTextDirection",
|
|
"GimpTextHintStyle",
|
|
"GimpTextJustification",
|
|
"GimpTransferMode",
|
|
"GimpTransformDirection",
|
|
"GimpTransformResize",
|
|
"GimpVectorsStrokeType"
|
|
};
|
|
|
|
static gboolean enums_initialized = FALSE;
|
|
|
|
#if 0
|
|
/* keep around as documentation how to do compat enums */
|
|
GType gimp_convert_dither_type_compat_get_type (void);
|
|
#endif
|
|
|
|
/**
|
|
* gimp_enums_init:
|
|
*
|
|
* This function makes sure all the enum types are registered
|
|
* with the #GType system. This is intended for use by language
|
|
* bindings that need the symbols early, before gimp_main is run.
|
|
* It's not necessary for plug-ins to call this directly, because
|
|
* the normal plug-in initialization code will handle it implicitly.
|
|
*
|
|
* Since: 2.4
|
|
**/
|
|
void
|
|
gimp_enums_init (void)
|
|
{
|
|
const GimpGetTypeFunc *funcs = get_type_funcs;
|
|
#if 0
|
|
GQuark quark;
|
|
#endif
|
|
gint i;
|
|
|
|
if (enums_initialized)
|
|
return;
|
|
|
|
for (i = 0; i < G_N_ELEMENTS (get_type_funcs); i++, funcs++)
|
|
{
|
|
GType type = (*funcs) ();
|
|
|
|
g_type_class_ref (type);
|
|
}
|
|
|
|
#if 0
|
|
/* keep around as documentation how to do compat enums */
|
|
|
|
/* keep compat enum code in sync with app/app.c (app_libs_init) */
|
|
quark = g_quark_from_static_string ("gimp-compat-enum");
|
|
|
|
g_type_set_qdata (GIMP_TYPE_CONVERT_DITHER_TYPE, quark,
|
|
(gpointer) gimp_convert_dither_type_compat_get_type ());
|
|
#endif
|
|
|
|
gimp_base_compat_enums_init ();
|
|
|
|
enums_initialized = TRUE;
|
|
}
|
|
|
|
/**
|
|
* gimp_enums_get_type_names:
|
|
* @n_type_names: return location for the number of names
|
|
*
|
|
* This function gives access to the list of enums registered by libgimp.
|
|
* The returned array is static and must not be modified.
|
|
*
|
|
* Return value: an array with type names
|
|
*
|
|
* Since: 2.2
|
|
**/
|
|
const gchar **
|
|
gimp_enums_get_type_names (gint *n_type_names)
|
|
{
|
|
g_return_val_if_fail (n_type_names != NULL, NULL);
|
|
|
|
*n_type_names = G_N_ELEMENTS (type_names);
|
|
|
|
return (const gchar **) type_names;
|
|
}
|