GNOME.org
 

[gnome-color-manager] Add a GcmXyz object for manipulating XYZ color tuples

commit c324f139d4efc8335ab2b00796c85a88b37f8615
Author: Richard Hughes <richard hughsie com>
Date:   Tue Dec 1 22:50:41 2009 +0000

    Add a GcmXyz object for manipulating XYZ color tuples

 src/Makefile.am     |    3 +
 src/gcm-self-test.c |    2 +
 src/gcm-xyz.c       |  309 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/gcm-xyz.h       |   68 +++++++++++
 4 files changed, 382 insertions(+), 0 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c3774d3..d2b36be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,6 +20,8 @@ noinst_LIBRARIES = libgcmshared.a
 libgcmshared_a_SOURCES =				\
 	egg-debug.c					\
 	egg-debug.h					\
+	gcm-xyz.c					\
+	gcm-xyz.h					\
 	gcm-utils.c					\
 	gcm-utils.h					\
 	gcm-clut.c					\
@@ -173,6 +175,7 @@ gcm_self_test_SOURCES =					\
 	gcm-brightness.c				\
 	gcm-clut.c					\
 	gcm-dmi.c					\
+	gcm-xyz.c					\
 	gcm-cie-widget.c				\
 	egg-test.h					\
 	egg-test.c					\
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index 015c781..1c2f1fc 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -32,6 +32,7 @@ void gcm_profile_test (EggTest *test);
 void gcm_brightness_test (EggTest *test);
 void gcm_clut_test (EggTest *test);
 void gcm_dmi_test (EggTest *test);
+void gcm_xyz_test (EggTest *test);
 void gcm_cie_widget_test (EggTest *test);
 
 int
@@ -54,6 +55,7 @@ main (int argc, char **argv)
 	gcm_brightness_test (test);
 	gcm_clut_test (test);
 	gcm_dmi_test (test);
+	gcm_xyz_test (test);
 	gcm_cie_widget_test (test);
 
 	return (egg_test_finish (test));
diff --git a/src/gcm-xyz.c b/src/gcm-xyz.c
new file mode 100644
index 0000000..0572adc
--- /dev/null
+++ b/src/gcm-xyz.c
@@ -0,0 +1,309 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * 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 xyz.
+ *
+ * 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.
+ */
+
+/**
+ * SECTION:gcm-xyz
+ * @short_description: XYZ color object
+ *
+ * This object represents a XYZ color block.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <math.h>
+
+#include "gcm-xyz.h"
+
+#include "egg-debug.h"
+
+static void     gcm_xyz_finalize	(GObject     *object);
+
+#define GCM_XYZ_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GCM_TYPE_XYZ, GcmXyzPrivate))
+
+/**
+ * GcmXyzPrivate:
+ *
+ * Private #GcmXyz data
+ **/
+struct _GcmXyzPrivate
+{
+	gfloat				 cie_x;
+	gfloat				 cie_y;
+	gfloat				 cie_z;
+};
+
+enum {
+	PROP_0,
+	PROP_CIE_X,
+	PROP_CIE_Y,
+	PROP_CIE_Z,
+	PROP_LAST
+};
+
+G_DEFINE_TYPE (GcmXyz, gcm_xyz, G_TYPE_OBJECT)
+
+/**
+ * gcm_xyz_print:
+ **/
+void
+gcm_xyz_print (GcmXyz *xyz)
+{
+	GcmXyzPrivate *priv = xyz->priv;
+	g_print ("xyz: %f,%f,%f\n", priv->cie_x, priv->cie_y, priv->cie_z);
+}
+
+/**
+ * gcm_xyz_clear:
+ **/
+void
+gcm_xyz_clear (GcmXyz *xyz)
+{
+	GcmXyzPrivate *priv = xyz->priv;
+	priv->cie_x = 0.0f;
+	priv->cie_y = 0.0f;
+	priv->cie_z = 0.0f;
+}
+
+/**
+ * gcm_xyz_get_x:
+ **/
+gfloat
+gcm_xyz_get_x (GcmXyz *xyz)
+{
+	GcmXyzPrivate *priv = xyz->priv;
+	if (priv->cie_x + priv->cie_y + priv->cie_z == 0)
+		return 0.0f;
+	return priv->cie_x / (priv->cie_x + priv->cie_y + priv->cie_z);
+}
+
+/**
+ * gcm_xyz_get_y:
+ **/
+gfloat
+gcm_xyz_get_y (GcmXyz *xyz)
+{
+	GcmXyzPrivate *priv = xyz->priv;
+	if (priv->cie_x + priv->cie_y + priv->cie_z == 0)
+		return 0.0f;
+	return priv->cie_y / (priv->cie_x + priv->cie_y + priv->cie_z);
+}
+
+/**
+ * gcm_xyz_get_z:
+ **/
+gfloat
+gcm_xyz_get_z (GcmXyz *xyz)
+{
+	GcmXyzPrivate *priv = xyz->priv;
+	if (priv->cie_x + priv->cie_y + priv->cie_z == 0)
+		return 0.0f;
+	return priv->cie_z / (priv->cie_x + priv->cie_y + priv->cie_z);
+}
+
+/**
+ * gcm_xyz_get_property:
+ **/
+static void
+gcm_xyz_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+	GcmXyz *xyz = GCM_XYZ (object);
+	GcmXyzPrivate *priv = xyz->priv;
+
+	switch (prop_id) {
+	case PROP_CIE_X:
+		g_value_set_float (value, priv->cie_x);
+		break;
+	case PROP_CIE_Y:
+		g_value_set_float (value, priv->cie_y);
+		break;
+	case PROP_CIE_Z:
+		g_value_set_float (value, priv->cie_z);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/**
+ * gcm_xyz_set_property:
+ **/
+static void
+gcm_xyz_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+	GcmXyz *xyz = GCM_XYZ (object);
+	GcmXyzPrivate *priv = xyz->priv;
+
+	switch (prop_id) {
+	case PROP_CIE_X:
+		priv->cie_x = g_value_get_float (value);
+		break;
+	case PROP_CIE_Y:
+		priv->cie_y = g_value_get_float (value);
+		break;
+	case PROP_CIE_Z:
+		priv->cie_z = g_value_get_float (value);
+		break;
+	default:
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		break;
+	}
+}
+
+/**
+ * gcm_xyz_class_init:
+ **/
+static void
+gcm_xyz_class_init (GcmXyzClass *klass)
+{
+	GParamSpec *pspec;
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	object_class->finalize = gcm_xyz_finalize;
+	object_class->get_property = gcm_xyz_get_property;
+	object_class->set_property = gcm_xyz_set_property;
+
+	/**
+	 * GcmXyz:cie-x:
+	 */
+	pspec = g_param_spec_float ("cie-x", NULL, NULL,
+				    0.0f, G_MAXFLOAT, 0.0f,
+				    G_PARAM_READWRITE);
+	g_object_class_install_property (object_class, PROP_CIE_X, pspec);
+
+	/**
+	 * GcmXyz:cie-y:
+	 */
+	pspec = g_param_spec_float ("cie-y", NULL, NULL,
+				    0.0f, G_MAXFLOAT, 0.0f,
+				    G_PARAM_READWRITE);
+	g_object_class_install_property (object_class, PROP_CIE_Y, pspec);
+
+	/**
+	 * GcmXyz:cie-z:
+	 */
+	pspec = g_param_spec_float ("cie-z", NULL, NULL,
+				    0.0f, G_MAXFLOAT, 0.0f,
+				    G_PARAM_READWRITE);
+	g_object_class_install_property (object_class, PROP_CIE_Z, pspec);
+
+	g_type_class_add_private (klass, sizeof (GcmXyzPrivate));
+}
+
+/**
+ * gcm_xyz_init:
+ **/
+static void
+gcm_xyz_init (GcmXyz *xyz)
+{
+	xyz->priv = GCM_XYZ_GET_PRIVATE (xyz);
+}
+
+/**
+ * gcm_xyz_finalize:
+ **/
+static void
+gcm_xyz_finalize (GObject *object)
+{
+//	GcmXyz *xyz = GCM_XYZ (object);
+//	GcmXyzPrivate *priv = xyz->priv;
+
+	G_OBJECT_CLASS (gcm_xyz_parent_class)->finalize (object);
+}
+
+/**
+ * gcm_xyz_new:
+ *
+ * Return value: a new GcmXyz object.
+ **/
+GcmXyz *
+gcm_xyz_new (void)
+{
+	GcmXyz *xyz;
+	xyz = g_object_new (GCM_TYPE_XYZ, NULL);
+	return GCM_XYZ (xyz);
+}
+
+/***************************************************************************
+ ***                          MAKE CHECK TESTS                           ***
+ ***************************************************************************/
+#ifdef EGG_TEST
+#include "egg-test.h"
+
+void
+gcm_xyz_test (EggTest *test)
+{
+	GcmXyz *xyz;
+	gfloat value;
+
+	if (!egg_test_start (test, "GcmXyz"))
+		return;
+
+	/************************************************************/
+	egg_test_title (test, "get a xyz object");
+	xyz = gcm_xyz_new ();
+	egg_test_assert (test, xyz != NULL);
+
+	/************************************************************/
+	egg_test_title (test, "get x value (when nothing set)");
+	value = gcm_xyz_get_x (xyz);
+	if (fabs (value - 0.0f) < 0.001f)
+		egg_test_success (test, NULL);
+	else
+		egg_test_failed (test, "failed to get value, got: %f", value);
+
+	/* set dummy values */
+	g_object_set (xyz,
+		      "cie-x", 0.125,
+		      "cie-y", 0.25,
+		      "cie-z", 0.5,
+		      NULL);
+
+	/************************************************************/
+	egg_test_title (test, "get x value");
+	value = gcm_xyz_get_x (xyz);
+	if (fabs (value - 0.142857143f) < 0.001f)
+		egg_test_success (test, NULL);
+	else
+		egg_test_failed (test, "failed to get value, got: %f", value);
+
+	/************************************************************/
+	egg_test_title (test, "get y value");
+	value = gcm_xyz_get_y (xyz);
+	if (fabs (value - 0.285714286f) < 0.001f)
+		egg_test_success (test, NULL);
+	else
+		egg_test_failed (test, "failed to get value, got: %f", value);
+
+	/************************************************************/
+	egg_test_title (test, "get z value");
+	value = gcm_xyz_get_z (xyz);
+	if (fabs (value - 0.571428571f) < 0.001f)
+		egg_test_success (test, NULL);
+	else
+		egg_test_failed (test, "failed to get value, got: %f", value);
+
+	g_object_unref (xyz);
+
+	egg_test_end (test);
+}
+#endif
+
diff --git a/src/gcm-xyz.h b/src/gcm-xyz.h
new file mode 100644
index 0000000..9d8c668
--- /dev/null
+++ b/src/gcm-xyz.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Richard Hughes <richard hughsie com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * 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 info.
+ *
+ * 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.
+ */
+
+#ifndef __GCM_XYZ_H
+#define __GCM_XYZ_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GCM_TYPE_XYZ		(gcm_xyz_get_type ())
+#define GCM_XYZ(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), GCM_TYPE_XYZ, GcmXyz))
+#define GCM_XYZ_CLASS(k)	(G_TYPE_CHECK_CLASS_CAST((k), GCM_TYPE_XYZ, GcmXyzClass))
+#define GCM_IS_XYZ(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), GCM_TYPE_XYZ))
+#define GCM_IS_XYZ_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), GCM_TYPE_XYZ))
+#define GCM_XYZ_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), GCM_TYPE_XYZ, GcmXyzClass))
+
+typedef struct _GcmXyzPrivate	GcmXyzPrivate;
+typedef struct _GcmXyz		GcmXyz;
+typedef struct _GcmXyzClass	GcmXyzClass;
+
+struct _GcmXyz
+{
+	 GObject		 parent;
+	 GcmXyzPrivate		*priv;
+};
+
+struct _GcmXyzClass
+{
+	GObjectClass	parent_class;
+	/* padding for future expansion */
+	void (*_gcm_reserved1) (void);
+	void (*_gcm_reserved2) (void);
+	void (*_gcm_reserved3) (void);
+	void (*_gcm_reserved4) (void);
+	void (*_gcm_reserved5) (void);
+};
+
+GType		 gcm_xyz_get_type		  	(void);
+GcmXyz		*gcm_xyz_new				(void);
+gfloat		 gcm_xyz_get_x				(GcmXyz		*xyz);
+gfloat		 gcm_xyz_get_y				(GcmXyz		*xyz);
+gfloat		 gcm_xyz_get_z				(GcmXyz		*xyz);
+void		 gcm_xyz_print				(GcmXyz		*xyz);
+void		 gcm_xyz_clear				(GcmXyz		*xyz);
+
+G_END_DECLS
+
+#endif /* __GCM_XYZ_H */
+
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]