From fdc4eded2214bcb1c6653d0ba20336dcedc0f266 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 24 Jan 2008 09:06:50 +0000 Subject: [PATCH] added reset() and to_cruft() functions. 2008-01-24 Michael Natterer * app/gegl/gimpcolorizeconfig.[ch]: added reset() and to_cruft() functions. * app/tools/gimpcolorizetool.c: use them. svn path=/trunk/; revision=24698 --- ChangeLog | 7 +++++++ app/gegl/gimpcolorizeconfig.c | 33 +++++++++++++++++++++++++++++++++ app/gegl/gimpcolorizeconfig.h | 6 ++++++ app/tools/gimpcolorizetool.c | 20 +++----------------- 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index e098c66924..731d96c796 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-24 Michael Natterer + + * app/gegl/gimpcolorizeconfig.[ch]: added reset() and to_cruft() + functions. + + * app/tools/gimpcolorizetool.c: use them. + 2008-01-23 Martin Nordholts * app/tools/gimprectangleselecttool.c diff --git a/app/gegl/gimpcolorizeconfig.c b/app/gegl/gimpcolorizeconfig.c index fa0b76980e..5e6a817541 100644 --- a/app/gegl/gimpcolorizeconfig.c +++ b/app/gegl/gimpcolorizeconfig.c @@ -25,6 +25,9 @@ #include "gegl-types.h" +/* temp cruft */ +#include "base/colorize.h" + #include "gimpcolorizeconfig.h" @@ -145,3 +148,33 @@ gimp_colorize_config_set_property (GObject *object, break; } } + + +/* public functions */ + +void +gimp_colorize_config_reset (GimpColorizeConfig *config) +{ + g_return_if_fail (GIMP_IS_COLORIZE_CONFIG (config)); + + config->hue = 0.5; + config->saturation = 0.5; + config->lightness = 0.0; +} + + +/* temp cruft */ + +void +gimp_colorize_config_to_cruft (GimpColorizeConfig *config, + Colorize *cruft) +{ + g_return_if_fail (GIMP_IS_COLORIZE_CONFIG (config)); + g_return_if_fail (cruft != NULL); + + cruft->hue = config->hue * 360.0; + cruft->saturation = config->saturation * 100.0; + cruft->lightness = config->lightness * 100.0; + + colorize_calculate (cruft); +} diff --git a/app/gegl/gimpcolorizeconfig.h b/app/gegl/gimpcolorizeconfig.h index b453df67c6..659ade03e6 100644 --- a/app/gegl/gimpcolorizeconfig.h +++ b/app/gegl/gimpcolorizeconfig.h @@ -50,5 +50,11 @@ struct _GimpColorizeConfigClass GType gimp_colorize_config_get_type (void) G_GNUC_CONST; +void gimp_colorize_config_reset (GimpColorizeConfig *config); + +/* temp cruft */ +void gimp_colorize_config_to_cruft (GimpColorizeConfig *config, + Colorize *cruft); + #endif /* __GIMP_COLORIZE_CONFIG_H__ */ diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c index f89fb8c471..49dc2ed56e 100644 --- a/app/tools/gimpcolorizetool.c +++ b/app/tools/gimpcolorizetool.c @@ -155,11 +155,7 @@ gimp_colorize_tool_initialize (GimpTool *tool, return FALSE; } - g_object_set (col_tool->config, - "hue", 0.5, - "saturation", 0.5, - "lightness", 0.0, - NULL); + gimp_colorize_config_reset (col_tool->config); GIMP_TOOL_CLASS (parent_class)->initialize (tool, display, error); @@ -193,14 +189,8 @@ static void gimp_colorize_tool_map (GimpImageMapTool *image_map_tool) { GimpColorizeTool *col_tool = GIMP_COLORIZE_TOOL (image_map_tool); - GimpColorizeConfig *config = col_tool->config; - Colorize *colorize = col_tool->colorize; - colorize->hue = config->hue * 360.0; - colorize->saturation = config->saturation * 100.0; - colorize->lightness = config->lightness * 100.0; - - colorize_calculate (colorize); + gimp_colorize_config_to_cruft (col_tool->config, col_tool->colorize); } @@ -282,11 +272,7 @@ gimp_colorize_tool_reset (GimpImageMapTool *image_map_tool) { GimpColorizeTool *col_tool = GIMP_COLORIZE_TOOL (image_map_tool); - g_object_set (col_tool->config, - "hue", 0.5, - "saturation", 0.5, - "lightness", 0.0, - NULL); + gimp_colorize_config_reset (col_tool->config); colorize_update_sliders (col_tool); }