Commit 63dc6ed3 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/fuzzy_select.c app/selection_options.h moved the "Threshold" scale

2000-04-20  Michael Natterer  <mitch@gimp.org>

	* app/fuzzy_select.c
	* app/selection_options.h
	* app/tool_options.c: moved the "Threshold" scale from the fuzzy
	select options to the selection options structure, so none of the
	selection tools needs it's own tools options structure.

	* app/bucket_fill.c: moved "Threshold" after "Sample Merged" as in
	the fuzzy select options.
parent 66e1b6f6
2000-04-20 Michael Natterer <mitch@gimp.org>
* app/fuzzy_select.c
* app/selection_options.h
* app/tool_options.c: moved the "Threshold" scale from the fuzzy
select options to the selection options structure, so none of the
selection tools needs it's own tools options structure.
* app/bucket_fill.c: moved "Threshold" after "Sample Merged" as in
the fuzzy select options.
2000-04-20 Michael Natterer <mitch@gimp.org>
* libgimp/gimpfileselection.[ch]: using the GimpPixmap here was a
......
......@@ -52,14 +52,14 @@ struct _BucketOptions
{
PaintOptions paint_options;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
gboolean sample_merged;
gboolean sample_merged_d;
GtkWidget *sample_merged_w;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
BucketFillMode fill_mode;
BucketFillMode fill_mode_d;
GtkWidget *fill_mode_w[3];
......@@ -121,6 +121,15 @@ bucket_options_new (void)
/* the main vbox */
vbox = ((ToolOptions *) options)->main_vbox;
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w);
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
......@@ -143,15 +152,6 @@ bucket_options_new (void)
gtk_widget_show (hbox);
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w);
/* fill type */
frame =
gimp_radio_group_new2 (TRUE, _("Fill Type"),
......
......@@ -166,6 +166,7 @@ selection_options_init (SelectionOptions *options,
options->feather_radius = options->feather_radius_d = 10.0;
options->antialias = options->antialias_d = TRUE;
options->sample_merged = options->sample_merged_d = FALSE;
options->threshold = default_threshold;
options->fixed_size = options->fixed_size_d = FALSE;
options->fixed_height = options->fixed_height_d = 1;
options->fixed_width = options->fixed_width_d = 1;
......@@ -175,6 +176,7 @@ selection_options_init (SelectionOptions *options,
options->feather_radius_w = NULL;
options->antialias_w = NULL;
options->sample_merged_w = NULL;
options->threshold_w = NULL;
options->fixed_size_w = NULL;
options->fixed_height_w = NULL;
options->fixed_width_w = NULL;
......@@ -258,17 +260,12 @@ selection_options_init (SelectionOptions *options,
break;
}
/* the sample merged option */
switch (tool_type)
/* selection tools which operate on contiguous regions */
if (tool_type == FUZZY_SELECT)
{
case RECT_SELECT:
case ELLIPSE_SELECT:
case FREE_SELECT:
case BEZIER_SELECT:
case ISCISSORS:
break;
case FUZZY_SELECT:
case BY_COLOR_SELECT:
GtkWidget *hbox;
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w,
......@@ -279,9 +276,27 @@ selection_options_init (SelectionOptions *options,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d);
gtk_widget_show (options->sample_merged_w);
break;
default:
break;
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new (_("Threshold:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 1);
gtk_widget_show (label);
options->threshold_w =
gtk_adjustment_new (default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0);
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);
gtk_widget_show (scale);
}
/* widgets for fixed size select */
......@@ -388,12 +403,19 @@ selection_options_reset (SelectionOptions *options)
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->feather_radius_w),
options->feather_radius_d);
}
if (options->antialias_w)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w),
options->antialias_d);
if (options->sample_merged_w)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d);
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d);
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->threshold_w),
default_threshold);
}
if (options->fixed_size_w)
{
GtkWidget *spinbutton;
......
......@@ -58,17 +58,8 @@ struct _FuzzySelect
};
typedef struct _FuzzySelectOptions FuzzySelectOptions;
struct _FuzzySelectOptions
{
SelectionOptions selection_options;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
};
/* the fuzzy selection tool options */
static FuzzySelectOptions *fuzzy_options = NULL;
static SelectionOptions *fuzzy_options = NULL;
/* XSegments which make up the fuzzy selection boundary */
static GdkSegment *segs = NULL;
......@@ -449,12 +440,12 @@ fuzzy_select_button_release (Tool *tool,
/* First take care of the case where the user "cancels" the action */
if (! (bevent->state & GDK_BUTTON3_MASK))
{
drawable = ((((SelectionOptions *)fuzzy_options)->sample_merged) ?
drawable = (fuzzy_options->sample_merged ?
NULL : gimage_active_drawable (gdisp->gimage));
fuzzy_select (gdisp->gimage, drawable, fuzzy_sel->op,
((SelectionOptions *)fuzzy_options)->feather,
((SelectionOptions *)fuzzy_options)->feather_radius);
fuzzy_options->feather,
fuzzy_options->feather_radius);
gdisplays_flush ();
}
......@@ -539,16 +530,15 @@ fuzzy_select_calculate (Tool *tool,
gimp_add_busy_cursors ();
use_offsets =
(((SelectionOptions *) fuzzy_options)->sample_merged) ? FALSE : TRUE;
use_offsets = fuzzy_options->sample_merged ? FALSE : TRUE;
gdisplay_untransform_coords (gdisp, fuzzy_sel->x,
fuzzy_sel->y, &x, &y, FALSE, use_offsets);
new = find_contiguous_region (gdisp->gimage, drawable,
((SelectionOptions *)fuzzy_options)->antialias,
fuzzy_options->antialias,
fuzzy_options->threshold, x, y,
((SelectionOptions *)fuzzy_options)->sample_merged);
fuzzy_options->sample_merged);
if (fuzzy_mask)
channel_delete (fuzzy_mask);
......@@ -557,14 +547,14 @@ fuzzy_select_calculate (Tool *tool,
/* calculate and allocate a new XSegment array which represents the boundary
* of the color-contiguous region
*/
pixel_region_init (&maskPR, drawable_data (GIMP_DRAWABLE(fuzzy_mask)), 0, 0,
drawable_width (GIMP_DRAWABLE(fuzzy_mask)),
drawable_height (GIMP_DRAWABLE(fuzzy_mask)),
pixel_region_init (&maskPR, drawable_data (GIMP_DRAWABLE (fuzzy_mask)), 0, 0,
drawable_width (GIMP_DRAWABLE (fuzzy_mask)),
drawable_height (GIMP_DRAWABLE (fuzzy_mask)),
FALSE);
bsegs = find_mask_boundary (&maskPR, nsegs, WithinBounds,
0, 0,
drawable_width (GIMP_DRAWABLE(fuzzy_mask)),
drawable_height (GIMP_DRAWABLE(fuzzy_mask)));
drawable_width (GIMP_DRAWABLE (fuzzy_mask)),
drawable_height (GIMP_DRAWABLE (fuzzy_mask)));
segs = g_new (GdkSegment, *nsegs);
......@@ -626,56 +616,7 @@ fuzzy_select_control (Tool *tool,
static void
fuzzy_select_options_reset (void)
{
FuzzySelectOptions *options = fuzzy_options;
selection_options_reset ((SelectionOptions *)options);
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->threshold_w),
default_threshold);
}
static FuzzySelectOptions *
fuzzy_select_options_new (void)
{
FuzzySelectOptions *options;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *scale;
options = g_new (FuzzySelectOptions, 1);
selection_options_init ((SelectionOptions *) options,
FUZZY_SELECT,
fuzzy_select_options_reset);
options->threshold = default_threshold;
/* the main vbox */
vbox = ((ToolOptions *) options)->main_vbox;
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Threshold:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 1);
gtk_widget_show (label);
options->threshold_w =
gtk_adjustment_new (default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0);
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);
gtk_widget_show (scale);
gtk_widget_show (hbox);
return options;
selection_options_reset (fuzzy_options);
}
Tool *
......@@ -687,7 +628,8 @@ tools_new_fuzzy_select (void)
/* The tool options */
if (! fuzzy_options)
{
fuzzy_options = fuzzy_select_options_new ();
fuzzy_options = selection_options_new (FUZZY_SELECT,
fuzzy_select_options_reset);
tools_register (FUZZY_SELECT, (ToolOptions *) fuzzy_options);
}
......
......@@ -49,6 +49,10 @@ struct _SelectionOptions
gboolean sample_merged_d;
GtkWidget *sample_merged_w;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
/* used by rect., ellipse selection */
gboolean fixed_size;
gboolean fixed_size_d;
......
......@@ -166,6 +166,7 @@ selection_options_init (SelectionOptions *options,
options->feather_radius = options->feather_radius_d = 10.0;
options->antialias = options->antialias_d = TRUE;
options->sample_merged = options->sample_merged_d = FALSE;
options->threshold = default_threshold;
options->fixed_size = options->fixed_size_d = FALSE;
options->fixed_height = options->fixed_height_d = 1;
options->fixed_width = options->fixed_width_d = 1;
......@@ -175,6 +176,7 @@ selection_options_init (SelectionOptions *options,
options->feather_radius_w = NULL;
options->antialias_w = NULL;
options->sample_merged_w = NULL;
options->threshold_w = NULL;
options->fixed_size_w = NULL;
options->fixed_height_w = NULL;
options->fixed_width_w = NULL;
......@@ -258,17 +260,12 @@ selection_options_init (SelectionOptions *options,
break;
}
/* the sample merged option */
switch (tool_type)
/* selection tools which operate on contiguous regions */
if (tool_type == FUZZY_SELECT)
{
case RECT_SELECT:
case ELLIPSE_SELECT:
case FREE_SELECT:
case BEZIER_SELECT:
case ISCISSORS:
break;
case FUZZY_SELECT:
case BY_COLOR_SELECT:
GtkWidget *hbox;
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w,
......@@ -279,9 +276,27 @@ selection_options_init (SelectionOptions *options,
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d);
gtk_widget_show (options->sample_merged_w);
break;
default:
break;
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);
label = gtk_label_new (_("Threshold:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 1);
gtk_widget_show (label);
options->threshold_w =
gtk_adjustment_new (default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0);
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);
gtk_widget_show (scale);
}
/* widgets for fixed size select */
......@@ -388,12 +403,19 @@ selection_options_reset (SelectionOptions *options)
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->feather_radius_w),
options->feather_radius_d);
}
if (options->antialias_w)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->antialias_w),
options->antialias_d);
if (options->sample_merged_w)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d);
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (options->sample_merged_w),
options->sample_merged_d);
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->threshold_w),
default_threshold);
}
if (options->fixed_size_w)
{
GtkWidget *spinbutton;
......
......@@ -52,14 +52,14 @@ struct _BucketOptions
{
PaintOptions paint_options;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
gboolean sample_merged;
gboolean sample_merged_d;
GtkWidget *sample_merged_w;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
BucketFillMode fill_mode;
BucketFillMode fill_mode_d;
GtkWidget *fill_mode_w[3];
......@@ -121,6 +121,15 @@ bucket_options_new (void)
/* the main vbox */
vbox = ((ToolOptions *) options)->main_vbox;
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w);
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
......@@ -143,15 +152,6 @@ bucket_options_new (void)
gtk_widget_show (hbox);
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w);
/* fill type */
frame =
gimp_radio_group_new2 (TRUE, _("Fill Type"),
......
......@@ -58,17 +58,8 @@ struct _FuzzySelect
};
typedef struct _FuzzySelectOptions FuzzySelectOptions;
struct _FuzzySelectOptions
{
SelectionOptions selection_options;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
};
/* the fuzzy selection tool options */
static FuzzySelectOptions *fuzzy_options = NULL;
static SelectionOptions *fuzzy_options = NULL;
/* XSegments which make up the fuzzy selection boundary */
static GdkSegment *segs = NULL;
......@@ -449,12 +440,12 @@ fuzzy_select_button_release (Tool *tool,
/* First take care of the case where the user "cancels" the action */
if (! (bevent->state & GDK_BUTTON3_MASK))
{
drawable = ((((SelectionOptions *)fuzzy_options)->sample_merged) ?
drawable = (fuzzy_options->sample_merged ?
NULL : gimage_active_drawable (gdisp->gimage));
fuzzy_select (gdisp->gimage, drawable, fuzzy_sel->op,
((SelectionOptions *)fuzzy_options)->feather,
((SelectionOptions *)fuzzy_options)->feather_radius);
fuzzy_options->feather,
fuzzy_options->feather_radius);
gdisplays_flush ();
}
......@@ -539,16 +530,15 @@ fuzzy_select_calculate (Tool *tool,
gimp_add_busy_cursors ();
use_offsets =
(((SelectionOptions *) fuzzy_options)->sample_merged) ? FALSE : TRUE;
use_offsets = fuzzy_options->sample_merged ? FALSE : TRUE;
gdisplay_untransform_coords (gdisp, fuzzy_sel->x,
fuzzy_sel->y, &x, &y, FALSE, use_offsets);
new = find_contiguous_region (gdisp->gimage, drawable,
((SelectionOptions *)fuzzy_options)->antialias,
fuzzy_options->antialias,
fuzzy_options->threshold, x, y,
((SelectionOptions *)fuzzy_options)->sample_merged);
fuzzy_options->sample_merged);
if (fuzzy_mask)
channel_delete (fuzzy_mask);
......@@ -557,14 +547,14 @@ fuzzy_select_calculate (Tool *tool,
/* calculate and allocate a new XSegment array which represents the boundary
* of the color-contiguous region
*/
pixel_region_init (&maskPR, drawable_data (GIMP_DRAWABLE(fuzzy_mask)), 0, 0,
drawable_width (GIMP_DRAWABLE(fuzzy_mask)),
drawable_height (GIMP_DRAWABLE(fuzzy_mask)),
pixel_region_init (&maskPR, drawable_data (GIMP_DRAWABLE (fuzzy_mask)), 0, 0,
drawable_width (GIMP_DRAWABLE (fuzzy_mask)),
drawable_height (GIMP_DRAWABLE (fuzzy_mask)),
FALSE);
bsegs = find_mask_boundary (&maskPR, nsegs, WithinBounds,
0, 0,
drawable_width (GIMP_DRAWABLE(fuzzy_mask)),
drawable_height (GIMP_DRAWABLE(fuzzy_mask)));
drawable_width (GIMP_DRAWABLE (fuzzy_mask)),
drawable_height (GIMP_DRAWABLE (fuzzy_mask)));
segs = g_new (GdkSegment, *nsegs);
......@@ -626,56 +616,7 @@ fuzzy_select_control (Tool *tool,
static void
fuzzy_select_options_reset (void)
{
FuzzySelectOptions *options = fuzzy_options;
selection_options_reset ((SelectionOptions *)options);
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->threshold_w),
default_threshold);
}
static FuzzySelectOptions *
fuzzy_select_options_new (void)
{
FuzzySelectOptions *options;
GtkWidget *vbox;
GtkWidget *hbox;
GtkWidget *label;
GtkWidget *scale;
options = g_new (FuzzySelectOptions, 1);
selection_options_init ((SelectionOptions *) options,
FUZZY_SELECT,
fuzzy_select_options_reset);
options->threshold = default_threshold;
/* the main vbox */
vbox = ((ToolOptions *) options)->main_vbox;
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 1);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
label = gtk_label_new (_("Threshold:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 1.0);
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 1);
gtk_widget_show (label);
options->threshold_w =
gtk_adjustment_new (default_threshold, 0.0, 255.0, 1.0, 1.0, 0.0);
scale = gtk_hscale_new (GTK_ADJUSTMENT (options->threshold_w));
gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);
gtk_signal_connect (GTK_OBJECT (options->threshold_w), "value_changed",
GTK_SIGNAL_FUNC (gimp_double_adjustment_update),
&options->threshold);
gtk_widget_show (scale);
gtk_widget_show (hbox);
return options;
selection_options_reset (fuzzy_options);
}
Tool *
......@@ -687,7 +628,8 @@ tools_new_fuzzy_select (void)
/* The tool options */
if (! fuzzy_options)
{
fuzzy_options = fuzzy_select_options_new ();
fuzzy_options = selection_options_new (FUZZY_SELECT,
fuzzy_select_options_reset);
tools_register (FUZZY_SELECT, (ToolOptions *) fuzzy_options);
}
......
......@@ -52,14 +52,14 @@ struct _BucketOptions
{
PaintOptions paint_options;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
gboolean sample_merged;
gboolean sample_merged_d;
GtkWidget *sample_merged_w;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
BucketFillMode fill_mode;
BucketFillMode fill_mode_d;
GtkWidget *fill_mode_w[3];
......@@ -121,6 +121,15 @@ bucket_options_new (void)
/* the main vbox */
vbox = ((ToolOptions *) options)->main_vbox;
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w);
/* the threshold scale */
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
......@@ -143,15 +152,6 @@ bucket_options_new (void)
gtk_widget_show (hbox);
/* the sample merged toggle */
options->sample_merged_w =
gtk_check_button_new_with_label (_("Sample Merged"));
gtk_signal_connect (GTK_OBJECT (options->sample_merged_w), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_update),
&options->sample_merged);
gtk_box_pack_start (GTK_BOX (vbox), options->sample_merged_w, FALSE, FALSE, 0);
gtk_widget_show (options->sample_merged_w);
/* fill type */
frame =
gimp_radio_group_new2 (TRUE, _("Fill Type"),
......
......@@ -58,17 +58,8 @@ struct _FuzzySelect
};
typedef struct _FuzzySelectOptions FuzzySelectOptions;
struct _FuzzySelectOptions
{
SelectionOptions selection_options;
gdouble threshold;
/* gdouble threshold_d; (from gimprc) */
GtkObject *threshold_w;
};
/* the fuzzy selection tool options */
static FuzzySelectOptions *fuzzy_options = NULL;
static SelectionOptions *fuzzy_options = NULL;
/* XSegments which make up the fuzzy selection boundary */
static GdkSegment *segs = NULL;
......@@ -449,12 +440,12 @@ fuzzy_select_button_release (Tool *tool,
/* First take care of the case where the user "cancels" the action */
if (! (bevent->state & GDK_BUTTON3_MASK))
{
drawable = ((((SelectionOptions *)fuzzy_options)->sample_merged) ?
drawable = (fuzzy_options->sample_merged ?
NULL : gimage_active_drawable (gdisp->gimage));
fuzzy_select (gdisp->gimage, drawable, fuzzy_sel->op,
((SelectionOptions *)fuzzy_options)->feather,
((SelectionOptions *)fuzzy_options)->feather_radius);
fuzzy_options->feather,
fuzzy_options->feather_radius);
gdisplays_flush ();
}
......@@ -539,16 +530,15 @@ fuzzy_select_calculate (Tool *tool,
gimp_add_busy_cursors ();
use_offsets =
(((SelectionOptions *) fuzzy_options)->sample_merged) ? FALSE : TRUE;
use_offsets = fuzzy_options->sample_merged ? FALSE : TRUE;
gdisplay_untransform_coords (gdisp, fuzzy_sel->x,
fuzzy_sel->y, &x, &y, FALSE, use_offsets);
new = find_contiguous_region (gdisp->gimage, drawable,
((SelectionOptions *)fuzzy_options)->antialias,
fuzzy_options->antialias,
fuzzy_options->threshold, x, y,
((SelectionOptions *)fuzzy_options)->sample_merged);
fuzzy_options->sample_merged);
if (fuzzy_mask)
channel_delete (fuzzy_mask);
......@@ -557,14 +547,14 @@ fuzzy_select_calculate (Tool *tool,
/* calculate and allocate a new XSegment array which represents the boundary
* of the color-contiguous region
*/
pixel_region_init (&maskPR, drawable_data (GIMP_DRAWABLE(fuzzy_mask)), 0, 0,
drawable_width (GIMP_DRAWABLE(fuzzy_mask)),
drawable_height (GIMP_DRAWABLE(fuzzy_mask)),
pixel_region_init (&maskPR, drawable_data (GIMP_DRAWABLE (fuzzy_mask)), 0, 0,
drawable_width (GIMP_DRAWABLE (fuzzy_mask)),
drawable_height (GIMP_DRAWABLE (fuzzy_mask)),
FALSE);
bsegs = find_mask_boundary (&maskPR, nsegs, WithinBounds,
0, 0,
drawable_width (GIMP_DRAWABLE(fuzzy_mask)),
drawable_height (GIMP_DRAWABLE(fuzzy_mask)));
drawable_width (GIMP_DRAWABLE (fuzzy_mask)),
drawable_height (GIMP_DRAWABLE (fuzzy_mask)));
segs = g_new (GdkSegment, *nsegs);
......@@ -626,56 +616,7 @@ fuzzy_select_control (Tool *tool,
static void
fuzzy_select_options_reset (void)
{
FuzzySelectOptions *options = fuzzy_options;
selection_options_reset ((SelectionOptions *)options);
gtk_adjustment_set_value (GTK_ADJUSTMENT (options->threshold_w),
default_threshold);
}
static FuzzySelectOptions *
fuzzy_select_options_new (void)
{
FuzzySelectOptions *options;
GtkWidget *vbox;