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

app: add "spacing" parameter to warp tool; change "hardness" range 

The spacing parameter controls the stroke spacing of the warp op.
It's similar, but not identical, to the brush spacing parameter of
the paint tools.  It provides a tradeoff between speed and quality.

Change the UI range of the hardness parameter from [0, 1] to [0, 100],
to match the other parameters.
This commit is contained in:
Ell 2017-05-16 19:30:01 -04:00
parent f807cbe10b
commit 13e274d82e
3 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/tools/gimpwarpoptions.c
View File

@ -43,6 +43,7 @@ enum
PROP_EFFECT_STRENGTH,
PROP_EFFECT_SIZE,
PROP_EFFECT_HARDNESS,
PROP_STROKE_SPACING,
PROP_N_ANIMATION_FRAMES
};
@ -97,7 +98,14 @@ gimp_warp_options_class_init (GimpWarpOptionsClass *klass)
"effect-hardness",
_("Hardness"),
_("Effect Hardness"),
0.0, 1.0, 0.5,
0.0, 100.0, 50.0,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_STROKE_SPACING,
"stroke-spacing",
_("Spacing"),
_("Stroke Spacing"),
1.0, 100.0, 20.0,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_INT (object_class, PROP_N_ANIMATION_FRAMES,
@ -135,6 +143,9 @@ gimp_warp_options_set_property (GObject *object,
case PROP_EFFECT_HARDNESS:
options->effect_hardness = g_value_get_double (value);
break;
case PROP_STROKE_SPACING:
options->stroke_spacing = g_value_get_double (value);
break;
case PROP_N_ANIMATION_FRAMES:
options->n_animation_frames = g_value_get_int (value);
break;
@ -167,6 +178,9 @@ gimp_warp_options_get_property (GObject *object,
case PROP_EFFECT_HARDNESS:
g_value_set_double (value, options->effect_hardness);
break;
case PROP_STROKE_SPACING:
g_value_set_double (value, options->stroke_spacing);
break;
case PROP_N_ANIMATION_FRAMES:
g_value_set_int (value, options->n_animation_frames);
break;
@ -206,8 +220,14 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
gtk_widget_show (scale);
scale = gimp_prop_spin_scale_new (config, "effect-hardness", NULL,
0.01, 1.0, 2);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 1.0);
1, 10, 1);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 0.0, 100.0);
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
gtk_widget_show (scale);
scale = gimp_prop_spin_scale_new (config, "stroke-spacing", NULL,
1, 10, 1);
gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
gtk_widget_show (scale);

1
app/tools/gimpwarpoptions.h
View File

@ -43,6 +43,7 @@ struct _GimpWarpOptions
gdouble effect_strength;
gdouble effect_size;
gdouble effect_hardness;
gdouble stroke_spacing;
gint n_animation_frames;

3
app/tools/gimpwarptool.c
View File

@ -247,7 +247,8 @@ gimp_warp_tool_button_press (GimpTool *tool,
"behavior", options->behavior,
"strength", options->effect_strength,
"size", options->effect_size,
"hardness", options->effect_hardness,
"hardness", options->effect_hardness / 100.0,
"spacing", options->stroke_spacing / 100.0,
"stroke", wt->current_stroke,
NULL);