gimp r27945 - in trunk: . app/core app/tools
- From: mitch svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r27945 - in trunk: . app/core app/tools
- Date: Sun, 25 Jan 2009 18:01:47 +0000 (UTC)
Author: mitch
Date: Sun Jan 25 18:01:47 2009
New Revision: 27945
URL: http://svn.gnome.org/viewvc/gimp?rev=27945&view=rev
Log:
2009-01-25 Michael Natterer <mitch gimp org>
* app/core/Makefile.am
* app/core/gimpparamspecs-duplicate.[ch]: new files implementing
gimp_param_spec_duplicate() which is supposed to duplicate any
gimp or gegl GParamSpec (but doesn't do this yet).
* app/tools/gimpgegltool.c: remove the code form here.
Added:
trunk/app/core/gimpparamspecs-duplicate.c
trunk/app/core/gimpparamspecs-duplicate.h
Modified:
trunk/ChangeLog
trunk/app/core/Makefile.am
trunk/app/tools/gimpgegltool.c
Modified: trunk/app/core/Makefile.am
==============================================================================
--- trunk/app/core/Makefile.am (original)
+++ trunk/app/core/Makefile.am Sun Jan 25 18:01:47 2009
@@ -297,6 +297,8 @@
gimpparamspecs.h \
gimpparamspecs-desc.c \
gimpparamspecs-desc.h \
+ gimpparamspecs-duplicate.c \
+ gimpparamspecs-duplicate.h \
gimpparasitelist.c \
gimpparasitelist.h \
gimppdbprogress.c \
Added: trunk/app/core/gimpparamspecs-duplicate.c
==============================================================================
--- (empty file)
+++ trunk/app/core/gimpparamspecs-duplicate.c Sun Jan 25 18:01:47 2009
@@ -0,0 +1,188 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpparamspecs-duplicate.c
+ * Copyright (C) 2008-2009 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gegl-paramspecs.h>
+
+#include "libgimpcolor/gimpcolor.h"
+#include "libgimpconfig/gimpconfig.h"
+
+#include "core-types.h"
+
+#include "gimpparamspecs.h"
+#include "gimpparamspecs-duplicate.h"
+
+
+#ifdef __GNUC__
+#warning FIXME: this code is not yet general as it should be (gegl tool only atm)
+#endif
+
+GParamSpec *
+gimp_param_spec_duplicate (GParamSpec *pspec)
+{
+ g_return_val_if_fail (pspec != NULL, NULL);
+
+ if (G_IS_PARAM_SPEC_STRING (pspec))
+ {
+ GParamSpecString *spec = G_PARAM_SPEC_STRING (pspec);
+
+ if (GEGL_IS_PARAM_SPEC_FILE_PATH (pspec))
+ {
+ return gimp_param_spec_config_path (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ GIMP_CONFIG_PATH_FILE,
+ spec->default_value,
+ pspec->flags);
+ }
+ else
+ {
+ static GQuark multiline_quark = 0;
+ GParamSpec *new;
+
+ if (! multiline_quark)
+ multiline_quark = g_quark_from_static_string ("multiline");
+
+ new = g_param_spec_string (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->default_value,
+ pspec->flags);
+
+ if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
+ {
+ g_param_spec_set_qdata (new, multiline_quark,
+ GINT_TO_POINTER (TRUE));
+ }
+
+ return new;
+ }
+ }
+ else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
+ {
+ GParamSpecBoolean *spec = G_PARAM_SPEC_BOOLEAN (pspec);
+
+ return g_param_spec_boolean (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->default_value,
+ pspec->flags);
+ }
+ else if (G_IS_PARAM_SPEC_ENUM (pspec))
+ {
+ GParamSpecEnum *spec = G_PARAM_SPEC_ENUM (pspec);
+
+ return g_param_spec_enum (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ G_TYPE_FROM_CLASS (spec->enum_class),
+ spec->default_value,
+ pspec->flags);
+ }
+ else if (G_IS_PARAM_SPEC_DOUBLE (pspec))
+ {
+ GParamSpecDouble *spec = G_PARAM_SPEC_DOUBLE (pspec);
+
+ return g_param_spec_double (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->minimum,
+ spec->maximum,
+ spec->default_value,
+ pspec->flags);
+ }
+ else if (G_IS_PARAM_SPEC_FLOAT (pspec))
+ {
+ GParamSpecFloat *spec = G_PARAM_SPEC_FLOAT (pspec);
+
+ return g_param_spec_float (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->minimum,
+ spec->maximum,
+ spec->default_value,
+ pspec->flags);
+ }
+ else if (G_IS_PARAM_SPEC_INT (pspec))
+ {
+ GParamSpecInt *spec = G_PARAM_SPEC_INT (pspec);
+
+ return g_param_spec_int (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->minimum,
+ spec->maximum,
+ spec->default_value,
+ pspec->flags);
+ }
+ else if (G_IS_PARAM_SPEC_UINT (pspec))
+ {
+ GParamSpecUInt *spec = G_PARAM_SPEC_UINT (pspec);
+
+ return g_param_spec_uint (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ spec->minimum,
+ spec->maximum,
+ spec->default_value,
+ pspec->flags);
+ }
+ else if (GEGL_IS_PARAM_SPEC_COLOR (pspec))
+ {
+ GeglColor *gegl_color;
+ GimpRGB gimp_color;
+ gdouble r = 0.0;
+ gdouble g = 0.0;
+ gdouble b = 0.0;
+ gdouble a = 1.0;
+ GValue value = { 0, };
+
+ g_value_init (&value, GEGL_TYPE_COLOR);
+ g_param_value_set_default (pspec, &value);
+
+ gegl_color = g_value_get_object (&value);
+ if (gegl_color)
+ gegl_color_get_rgba (gegl_color, &r, &g, &b, &a);
+
+ gimp_rgba_set (&gimp_color, r, g, b, a);
+
+ g_value_unset (&value);
+
+ return gimp_param_spec_rgb (pspec->name,
+ g_param_spec_get_nick (pspec),
+ g_param_spec_get_blurb (pspec),
+ TRUE,
+ &gimp_color,
+ pspec->flags);
+ }
+ else if (G_IS_PARAM_SPEC_OBJECT (pspec) ||
+ G_IS_PARAM_SPEC_POINTER (pspec))
+ {
+ /* ignore object properties */
+ return NULL;
+ }
+
+ g_warning ("%s: not supported: %s (%s)\n", G_STRFUNC,
+ g_type_name (G_TYPE_FROM_INSTANCE (pspec)), pspec->name);
+
+ return NULL;
+}
Added: trunk/app/core/gimpparamspecs-duplicate.h
==============================================================================
--- (empty file)
+++ trunk/app/core/gimpparamspecs-duplicate.h Sun Jan 25 18:01:47 2009
@@ -0,0 +1,28 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpparamspecs-duplicate.h
+ * Copyright (C) 2008-2009 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_PARAM_SPECS_DUPLICATE_H__
+#define __GIMP_PARAM_SPECS_DUPLICATE_H__
+
+
+GParamSpec * gimp_param_spec_duplicate (GParamSpec *pspec);
+
+
+#endif /* __GIMP_PARAM_SPECS_DUPLICATE_H__ */
Modified: trunk/app/tools/gimpgegltool.c
==============================================================================
--- trunk/app/tools/gimpgegltool.c (original)
+++ trunk/app/tools/gimpgegltool.c Sun Jan 25 18:01:47 2009
@@ -21,7 +21,6 @@
#include <gegl.h>
#include <gegl-plugin.h>
-#include <gegl-paramspecs.h>
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
@@ -34,6 +33,7 @@
#include "core/gimperror.h"
#include "core/gimpimage.h"
#include "core/gimpimagemap.h"
+#include "core/gimpparamspecs-duplicate.h"
#include "widgets/gimppropwidgets.h"
@@ -434,155 +434,6 @@
gimp_image_map_tool_preview (GIMP_IMAGE_MAP_TOOL (tool));
}
-static GParamSpec *
-gimp_param_spec_duplicate (GParamSpec *pspec)
-{
- if (G_IS_PARAM_SPEC_STRING (pspec))
- {
- GParamSpecString *spec = G_PARAM_SPEC_STRING (pspec);
-
- if (GEGL_IS_PARAM_SPEC_FILE_PATH (pspec))
- {
- return gimp_param_spec_config_path (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- GIMP_CONFIG_PATH_FILE,
- spec->default_value,
- pspec->flags);
- }
- else
- {
- static GQuark multiline_quark = 0;
- GParamSpec *new;
-
- if (! multiline_quark)
- multiline_quark = g_quark_from_static_string ("multiline");
-
- new = g_param_spec_string (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->default_value,
- pspec->flags);
-
- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec))
- {
- g_param_spec_set_qdata (new, multiline_quark,
- GINT_TO_POINTER (TRUE));
- }
-
- return new;
- }
- }
- else if (G_IS_PARAM_SPEC_BOOLEAN (pspec))
- {
- GParamSpecBoolean *spec = G_PARAM_SPEC_BOOLEAN (pspec);
-
- return g_param_spec_boolean (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->default_value,
- pspec->flags);
- }
- else if (G_IS_PARAM_SPEC_ENUM (pspec))
- {
- GParamSpecEnum *spec = G_PARAM_SPEC_ENUM (pspec);
-
- return g_param_spec_enum (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- G_TYPE_FROM_CLASS (spec->enum_class),
- spec->default_value,
- pspec->flags);
- }
- else if (G_IS_PARAM_SPEC_DOUBLE (pspec))
- {
- GParamSpecDouble *spec = G_PARAM_SPEC_DOUBLE (pspec);
-
- return g_param_spec_double (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->minimum,
- spec->maximum,
- spec->default_value,
- pspec->flags);
- }
- else if (G_IS_PARAM_SPEC_FLOAT (pspec))
- {
- GParamSpecFloat *spec = G_PARAM_SPEC_FLOAT (pspec);
-
- return g_param_spec_float (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->minimum,
- spec->maximum,
- spec->default_value,
- pspec->flags);
- }
- else if (G_IS_PARAM_SPEC_INT (pspec))
- {
- GParamSpecInt *spec = G_PARAM_SPEC_INT (pspec);
-
- return g_param_spec_int (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->minimum,
- spec->maximum,
- spec->default_value,
- pspec->flags);
- }
- else if (G_IS_PARAM_SPEC_UINT (pspec))
- {
- GParamSpecUInt *spec = G_PARAM_SPEC_UINT (pspec);
-
- return g_param_spec_uint (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- spec->minimum,
- spec->maximum,
- spec->default_value,
- pspec->flags);
- }
- else if (GEGL_IS_PARAM_SPEC_COLOR (pspec))
- {
- GeglColor *gegl_color;
- GimpRGB gimp_color;
- gdouble r = 0.0;
- gdouble g = 0.0;
- gdouble b = 0.0;
- gdouble a = 1.0;
- GValue value = { 0, };
-
- g_value_init (&value, GEGL_TYPE_COLOR);
- g_param_value_set_default (pspec, &value);
-
- gegl_color = g_value_get_object (&value);
- if (gegl_color)
- gegl_color_get_rgba (gegl_color, &r, &g, &b, &a);
-
- gimp_rgba_set (&gimp_color, r, g, b, a);
-
- g_value_unset (&value);
-
- return gimp_param_spec_rgb (pspec->name,
- g_param_spec_get_nick (pspec),
- g_param_spec_get_blurb (pspec),
- TRUE,
- &gimp_color,
- pspec->flags);
- }
- else if (G_IS_PARAM_SPEC_OBJECT (pspec) ||
- G_IS_PARAM_SPEC_POINTER (pspec))
- {
- /* ignore object properties */
- return NULL;
- }
-
- g_warning ("%s: not supported: %s (%s)\n", G_STRFUNC,
- g_type_name (G_TYPE_FROM_INSTANCE (pspec)), pspec->name);
-
- return NULL;
-}
-
static GValue *
gimp_gegl_tool_config_value_new (GParamSpec *pspec)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
