
2008-05-20 Michael Natterer <mitch@gimp.org> * app/core/Makefile.am * app/core/core-types.h * app/core/gimpimagemapconfig.[ch]: new GimpViewable subclass which has a "time" property. Sets the object's name to a date string if a time != 0 gets set. Has a compare function which first sorts the objects with a timestamp in MRU order and then the objects without timestamp by name. * app/gegl/gimpbrightnesscontrastconfig.[ch] * app/gegl/gimpcolorbalanceconfig.[ch] * app/gegl/gimpcolorizeconfig.[ch] * app/gegl/gimpcurvesconfig.[ch] * app/gegl/gimphuesaturationconfig.[ch] * app/gegl/gimplevelsconfig.[ch] * app/gegl/gimpposterizeconfig.[ch] * app/gegl/gimpthresholdconfig.[ch]: derive from GimpImageMapConfig. * app/tools/gimpimagemaptool.c: sort the settings container with above compare function. * app/tools/gimpimagemaptool-settings.c: add utility functions for loading and saving the settings container. In the settings combo, add a separator between MRU items and favorites. * app/Makefile.am: make the thing link. svn path=/trunk/; revision=25724
203 lines
6.1 KiB
C
203 lines
6.1 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpbrightnesscontrastconfig.c
|
|
* Copyright (C) 2007 Michael Natterer <mitch@gimp.org>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gegl.h>
|
|
|
|
#include "libgimpmath/gimpmath.h"
|
|
#include "libgimpconfig/gimpconfig.h"
|
|
|
|
#include "gegl-types.h"
|
|
|
|
#include "gimpbrightnesscontrastconfig.h"
|
|
#include "gimplevelsconfig.h"
|
|
|
|
|
|
enum
|
|
{
|
|
PROP_0,
|
|
PROP_BRIGHTNESS,
|
|
PROP_CONTRAST
|
|
};
|
|
|
|
|
|
static void gimp_brightness_contrast_config_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec);
|
|
static void gimp_brightness_contrast_config_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec);
|
|
|
|
|
|
G_DEFINE_TYPE_WITH_CODE (GimpBrightnessContrastConfig,
|
|
gimp_brightness_contrast_config,
|
|
GIMP_TYPE_IMAGE_MAP_CONFIG,
|
|
G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
|
|
|
|
#define parent_class gimp_brightness_contrast_config_parent_class
|
|
|
|
|
|
static void
|
|
gimp_brightness_contrast_config_class_init (GimpBrightnessContrastConfigClass *klass)
|
|
{
|
|
GObjectClass *object_class = G_OBJECT_CLASS (klass);
|
|
GimpViewableClass *viewable_class = GIMP_VIEWABLE_CLASS (klass);
|
|
|
|
object_class->set_property = gimp_brightness_contrast_config_set_property;
|
|
object_class->get_property = gimp_brightness_contrast_config_get_property;
|
|
|
|
viewable_class->default_stock_id = "gimp-tool-brightness-constrast";
|
|
|
|
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_BRIGHTNESS,
|
|
"brightness",
|
|
"Brightness",
|
|
-1.0, 1.0, 0.0, 0);
|
|
|
|
GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_CONTRAST,
|
|
"contrast",
|
|
"Contrast",
|
|
-1.0, 1.0, 0.0, 0);
|
|
}
|
|
|
|
static void
|
|
gimp_brightness_contrast_config_init (GimpBrightnessContrastConfig *self)
|
|
{
|
|
}
|
|
|
|
static void
|
|
gimp_brightness_contrast_config_get_property (GObject *object,
|
|
guint property_id,
|
|
GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpBrightnessContrastConfig *self = GIMP_BRIGHTNESS_CONTRAST_CONFIG (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_BRIGHTNESS:
|
|
g_value_set_double (value, self->brightness);
|
|
break;
|
|
|
|
case PROP_CONTRAST:
|
|
g_value_set_double (value, self->contrast);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void
|
|
gimp_brightness_contrast_config_set_property (GObject *object,
|
|
guint property_id,
|
|
const GValue *value,
|
|
GParamSpec *pspec)
|
|
{
|
|
GimpBrightnessContrastConfig *self = GIMP_BRIGHTNESS_CONTRAST_CONFIG (object);
|
|
|
|
switch (property_id)
|
|
{
|
|
case PROP_BRIGHTNESS:
|
|
self->brightness = g_value_get_double (value);
|
|
break;
|
|
|
|
case PROP_CONTRAST:
|
|
self->contrast = g_value_get_double (value);
|
|
break;
|
|
|
|
default:
|
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
gimp_brightness_contrast_config_set_node (GimpBrightnessContrastConfig *config,
|
|
GeglNode *node)
|
|
{
|
|
gdouble brightness;
|
|
gdouble contrast;
|
|
|
|
g_return_if_fail (GIMP_IS_BRIGHTNESS_CONTRAST_CONFIG (config));
|
|
g_return_if_fail (GEGL_IS_NODE (node));
|
|
|
|
brightness = config->brightness / 2.0;
|
|
contrast = (config->contrast < 0 ?
|
|
(config->contrast + 1.0) :
|
|
config->contrast * 4.0 + 1.0);
|
|
|
|
gegl_node_set (node,
|
|
"brightness", brightness,
|
|
"contrast", contrast,
|
|
NULL);
|
|
}
|
|
|
|
GimpLevelsConfig *
|
|
gimp_brightness_contrast_config_to_levels_config (GimpBrightnessContrastConfig *config)
|
|
{
|
|
GimpLevelsConfig *levels;
|
|
gdouble brightness;
|
|
gdouble contrast;
|
|
gdouble value;
|
|
|
|
g_return_val_if_fail (GIMP_IS_BRIGHTNESS_CONTRAST_CONFIG (config), NULL);
|
|
|
|
levels = g_object_new (GIMP_TYPE_LEVELS_CONFIG, NULL);
|
|
|
|
brightness = config->brightness / 2.0;
|
|
contrast = (config->contrast < 0 ?
|
|
(config->contrast + 1.0) :
|
|
config->contrast * 4.0 + 1.0);
|
|
|
|
value = -0.5 * contrast + brightness + 0.5;
|
|
|
|
if (value < 0.0)
|
|
{
|
|
value = 0.0;
|
|
|
|
levels->low_input[GIMP_HISTOGRAM_VALUE] =
|
|
(-0.5 - brightness) / contrast + 0.5;
|
|
}
|
|
|
|
levels->low_output[GIMP_HISTOGRAM_VALUE] = value;
|
|
|
|
value = 0.5 * contrast + brightness + 0.5;
|
|
|
|
if (value > 1.0)
|
|
{
|
|
value = 1.0;
|
|
|
|
levels->high_input[GIMP_HISTOGRAM_VALUE] =
|
|
(0.5 - brightness) / contrast + 0.5;
|
|
}
|
|
|
|
levels->high_output[GIMP_HISTOGRAM_VALUE] = value;
|
|
|
|
return levels;
|
|
}
|