callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: use gimp_wait() to wait for histogram in threshold and levels tools

Browse Source 
In the threshold and levels tools, use gimp_wait() to wait for
histogram calculation to complete before applying auto-adjustment,
so that a message is displayed in the meantime.  Allow the
operation to be canceled, in which case we simply abort the auto-
adjustment, but let the histogram calculation continue.
This commit is contained in:
Ell
2018-05-29 12:42:02 -04:00
parent 0d5b09bb4b
commit c7779b51b0
2 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/tools/gimpthresholdtool.c
View File

@ -25,11 +25,15 @@
#include "tools-types.h"
#include "core/gimp-gui.h"
#include "core/gimpasync.h"
#include "core/gimpcancelable.h"
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-histogram.h"
#include "core/gimphistogram.h"
#include "core/gimpimage.h"
#include "core/gimptoolinfo.h"
#include "core/gimptriviallycancelablewaitable.h"
#include "core/gimpwaitable.h"
#include "widgets/gimphelp-ids.h"
@ -399,22 +403,34 @@ static void
gimp_threshold_tool_auto_clicked (GtkWidget *button,
GimpThresholdTool *t_tool)
{
GimpHistogramChannel channel;
gint n_bins;
gdouble low;
GimpTool *tool = GIMP_TOOL (t_tool);
GimpWaitable *waitable;
gimp_waitable_wait (GIMP_WAITABLE (t_tool->histogram_async));
waitable = gimp_trivially_cancelable_waitable_new (
GIMP_WAITABLE (t_tool->histogram_async));
g_object_get (GIMP_FILTER_TOOL (t_tool)->config,
"channel", &channel,
NULL);
gimp_wait (tool->tool_info->gimp, waitable, _("Calculating histogram..."));
n_bins = gimp_histogram_n_bins (t_tool->histogram);
g_object_unref (waitable);
low = gimp_histogram_get_threshold (t_tool->histogram,
channel,
0, n_bins - 1);
if (gimp_async_is_synced (t_tool->histogram_async) &&
gimp_async_is_finished (t_tool->histogram_async))
{
GimpHistogramChannel channel;
gint n_bins;
gdouble low;
gimp_histogram_view_set_range (t_tool->histogram_box->view,
low, n_bins - 1);
g_object_get (GIMP_FILTER_TOOL (t_tool)->config,
"channel", &channel,
NULL);
n_bins = gimp_histogram_n_bins (t_tool->histogram);
low = gimp_histogram_get_threshold (t_tool->histogram,
channel,
0, n_bins - 1);
gimp_histogram_view_set_range (t_tool->histogram_box->view,
low, n_bins - 1);
}
}