[gnome-color-manager] Add an experimental user-calibrate wizard, which the user can use when there is no calibration hardw
- From: Richard Hughes <rhughes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-color-manager] Add an experimental user-calibrate wizard, which the user can use when there is no calibration hardw
- Date: Mon, 21 Dec 2009 18:24:30 +0000 (UTC)
commit a3e96ae888e33d1c12d8871aaa719477e7c95f3e
Author: Richard Hughes <richard hughsie com>
Date: Mon Dec 21 15:56:22 2009 +0000
Add an experimental user-calibrate wizard, which the user can use when there is no calibration hardware available
data/Makefile.am | 1 +
data/gcm-calibrate.ui | 438 ++++++++++++++++++++++++++++
src/Makefile.am | 2 +
src/gcm-calibrate-manual.c | 692 ++++++++++++++++++++++++++++++++++++++++++++
src/gcm-calibrate-manual.h | 67 +++++
src/gcm-self-test.c | 2 +
6 files changed, 1202 insertions(+), 0 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 16b0b13..7052a60 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,6 +27,7 @@ $(service_DATA): $(service_in_files) Makefile
@sed -e "s|\ servicedir\@|$(bindir)|" $< > $@
pkgdata_DATA = \
+ gcm-calibrate.ui \
gcm-spawn.ui \
gcm-prefs.ui
diff --git a/data/gcm-calibrate.ui b/data/gcm-calibrate.ui
new file mode 100644
index 0000000..4d74e86
--- /dev/null
+++ b/data/gcm-calibrate.ui
@@ -0,0 +1,438 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkDialog" id="dialog_calibrate">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes" comments="window title">Manual calibration wizar</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">normal</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkHBox" id="hbox11">
+ <property name="visible">True</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkImage" id="image_title">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon-size">6</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label_title">
+ <property name="visible">True</property>
+ <property name="label">This is the current title</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ <attribute name="scale" value="1.200000"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment8">
+ <property name="visible">True</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">18</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">9</property>
+ <child>
+ <object class="GtkHBox" id="hbox_text1">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label_text1">
+ <property name="visible">True</property>
+ <property name="label">This is a first line of text.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox_text2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label_text2">
+ <property name="visible">True</property>
+ <property name="label">This is a second line of text.</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAspectFrame" id="aspectframe_gamma">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAspectFrame" id="aspectframe_trc">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment9">
+ <property name="visible">True</property>
+ <property name="left_padding">18</property>
+ <property name="right_padding">18</property>
+ <child>
+ <object class="GtkTable" id="table_adjust">
+ <property name="visible">True</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkHScale" id="hscale_brightness">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="fill_level">0.5</property>
+ <property name="draw_value">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHScale" id="hscale_red">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="fill_level">0.5</property>
+ <property name="draw_value">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHScale" id="hscale_green">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="fill_level">0.5</property>
+ <property name="draw_value">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHScale" id="hscale_blue">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="restrict_to_fill_level">False</property>
+ <property name="fill_level">0.5</property>
+ <property name="draw_value">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Brightness:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Red:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Green:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox9">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Blue:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">18</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="expander_details">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <object class="GtkAlignment" id="alignment10">
+ <property name="visible">True</property>
+ <property name="left_padding">26</property>
+ <child>
+ <object class="GtkHBox" id="hbox12">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label_details">
+ <property name="visible">True</property>
+ <property name="label">Here be dragons...</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Details</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button_help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_prev">
+ <property name="label">gtk-media-previous</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_next">
+ <property name="label">gtk-media-next</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button_apply">
+ <property name="label">gtk-apply</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">button_help</action-widget>
+ <action-widget response="0">button_cancel</action-widget>
+ <action-widget response="0">button_prev</action-widget>
+ <action-widget response="0">button_next</action-widget>
+ <action-widget response="0">button_apply</action-widget>
+ </action-widgets>
+ </object>
+</interface>
diff --git a/src/Makefile.am b/src/Makefile.am
index 27dc148..51946be 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -207,6 +207,8 @@ gcm_self_test_SOURCES = \
gcm-cie-widget.c \
gcm-trc-widget.c \
gcm-gamma-widget.c \
+ gcm-calibrate-manual.c \
+ gcm-calibrate-manual.h \
egg-test.h \
egg-test.c \
$(NULL)
diff --git a/src/gcm-calibrate-manual.c b/src/gcm-calibrate-manual.c
new file mode 100644
index 0000000..2d0d366
--- /dev/null
+++ b/src/gcm-calibrate-manual.c
@@ -0,0 +1,692 @@
+/* -*- 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 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.
+ */
+
+/**
+ * SECTION:gcm-calibrate-manual
+ * @short_description: routines to manually create a color profile.
+ *
+ * This object can create an ICC file manually.
+ */
+
+#include "config.h"
+
+#include <glib-object.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <math.h>
+
+#include "egg-debug.h"
+
+#include "gcm-utils.h"
+#include "gcm-clut.h"
+#include "gcm-gamma-widget.h"
+#include "gcm-trc-widget.h"
+#include "gcm-calibrate-manual.h"
+
+#include "egg-debug.h"
+
+static void gcm_calibrate_manual_finalize (GObject *object);
+
+#define GCM_CALIBRATE_MANUAL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GCM_TYPE_CALIBRATE_MANUAL, GcmCalibrateManualPrivate))
+
+/**
+ * GcmCalibrateManualPrivate:
+ *
+ * Private #GcmCalibrateManual data
+ **/
+struct _GcmCalibrateManualPrivate
+{
+ guint calibration_steps;
+ GMainLoop *loop;
+ GtkBuilder *builder;
+ gboolean setting_up_colors;
+ GtkWidget *gamma_widget;
+ GtkWidget *trc_widget;
+ gdouble midpoint;
+ guint current_page;
+ guint current_gamma;
+ gdouble *profile_red;
+ gdouble *profile_green;
+ gdouble *profile_blue;
+ GError **error;
+ gboolean ret;
+};
+
+enum {
+ PROP_0,
+ PROP_CALIBRATION_STEPS,
+ PROP_LAST
+};
+
+enum {
+ GCM_CALIBRATE_MANUAL_PAGE_INTRO,
+ GCM_CALIBRATE_MANUAL_PAGE_GAMMA,
+ GCM_CALIBRATE_MANUAL_PAGE_LAST
+};
+
+G_DEFINE_TYPE (GcmCalibrateManual, gcm_calibrate_manual, G_TYPE_OBJECT)
+
+
+/**
+ * gcm_calibrate_manual_close_cb:
+ **/
+static void
+gcm_calibrate_manual_close_cb (GtkWidget *widget, GcmCalibrateManual *calibrate)
+{
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ /* we closed */
+ priv->ret = FALSE;
+ if (priv->error != NULL)
+ *(priv->error) = g_error_new (1, 0, "user closed window");
+
+ /* we're done */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_calibrate"));
+ gtk_widget_hide (widget);
+ g_main_loop_quit (priv->loop);
+}
+
+/**
+ * gcm_calibrate_manual_delete_event_cb:
+ **/
+static gboolean
+gcm_calibrate_manual_delete_event_cb (GtkWidget *widget, GdkEvent *event, GcmCalibrateManual *calibrate)
+{
+ gcm_calibrate_manual_close_cb (widget, calibrate);
+ return FALSE;
+}
+
+/**
+ * gcm_calibrate_manual_help_cb:
+ **/
+static void
+gcm_calibrate_manual_help_cb (GtkWidget *widget, GcmCalibrateManual *calibrate)
+{
+ gcm_gnome_help ("calibrate-manual");
+}
+
+/**
+ * gcm_calibrate_manual_slider_changed_cb:
+ **/
+static void
+gcm_calibrate_manual_slider_changed_cb (GtkRange *range, GcmCalibrateManual *calibrate)
+{
+ gdouble brightness;
+ gdouble red;
+ gdouble green;
+ gdouble blue;
+ GtkWidget *widget;
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ /* we're just setting up the colors, not moving the slider */
+ if (priv->setting_up_colors)
+ goto out;
+
+ /* get values */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_brightness"));
+ brightness = gtk_range_get_value (GTK_RANGE (widget));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_red"));
+ red = gtk_range_get_value (GTK_RANGE (widget));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_green"));
+ green = gtk_range_get_value (GTK_RANGE (widget));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_blue"));
+ blue = gtk_range_get_value (GTK_RANGE (widget));
+
+ /* offset */
+ red = priv->midpoint + red + brightness;
+ green = priv->midpoint + green + brightness;
+ blue = priv->midpoint + blue + brightness;
+
+ /* constrain */
+ red = CLAMP (red, 0.0f, 1.0f);
+ green = CLAMP (green, 0.0f, 1.0f);
+ blue = CLAMP (blue, 0.0f, 1.0f);
+
+ g_object_set (priv->gamma_widget,
+ "color-red", red,
+ "color-green", green,
+ "color-blue", blue,
+ NULL);
+
+ /* save in array */
+ priv->profile_red[priv->current_gamma] = red;
+ priv->profile_green[priv->current_gamma] = green;
+ priv->profile_blue[priv->current_gamma] = blue;
+
+ egg_debug ("@%i, (%f,%f,%f)", priv->current_gamma, red, green, blue);
+out:
+ return;
+}
+
+/**
+ * gcm_calibrate_manual_setup_page:
+ **/
+static void
+gcm_calibrate_manual_setup_page (GcmCalibrateManual *calibrate, guint page)
+{
+ GtkWidget *widget;
+ gdouble light = 1.0f;
+ gdouble dark = 0.0f;
+ gdouble ave;
+ gchar *title = NULL;
+ gdouble div;
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ if (page == GCM_CALIBRATE_MANUAL_PAGE_INTRO) {
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_title"));
+ /* TRANSLATORS: dialog title */
+ gtk_label_set_label (GTK_LABEL(widget), _("Introduction to display calibration"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_next"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_prev"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_apply"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "table_adjust"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "expander_details"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_gamma"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_trc"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_text1"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_text1"));
+ /* TRANSLATORS: message text */
+ gtk_label_set_label (GTK_LABEL(widget), _("This dialog will calibrate your display and create a custom ICC profile. "
+ "Display calibration will involve several steps so that an accurate profile can be obtained. "
+ "It should only take a few minutes."));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_text2"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_text2"));
+ /* TRANSLATORS: message text */
+ gtk_label_set_label (GTK_LABEL(widget), _("It may help to sit back from the screen or squint at the calibration widgets in order to accurately match the colors. "
+ "You can also repeat the calibration steps as many times as you want."));
+ goto out;
+ }
+
+ if (page == GCM_CALIBRATE_MANUAL_PAGE_GAMMA) {
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_title"));
+ /* TRANSLATORS: dialog title */
+ title = g_strdup_printf (_("Create first table point %i/%i"), priv->current_gamma+1, priv->calibration_steps);
+ gtk_label_set_label (GTK_LABEL(widget), title);
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_next"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_prev"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_apply"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "table_adjust"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "expander_details"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_gamma"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_trc"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_text1"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_text1"));
+ /* TRANSLATORS: message text */
+ gtk_label_set_label (GTK_LABEL(widget), _("Please try to match up the gray square with the surrounding alternating bars. "
+ "You should match the brightness first, and then if required change the color tint so it looks plain gray."));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_text2"));
+ gtk_widget_hide (widget);
+
+ /* calculate range */
+ div = 1.0f / (gfloat) priv->calibration_steps;
+ dark = div * priv->current_gamma;
+ light = (div * priv->current_gamma) + div;
+
+ /* save colors */
+ priv->midpoint = dark + ((light - dark) / 2.0f);
+
+ /* save default */
+ if (priv->profile_red[priv->current_gamma] > 1.0f) {
+ egg_debug ("resetting %i to %f", page, priv->midpoint);
+ priv->profile_red[priv->current_gamma] = priv->midpoint;
+ priv->profile_green[priv->current_gamma] = priv->midpoint;
+ priv->profile_blue[priv->current_gamma] = priv->midpoint;
+ }
+
+ /* dis-arm */
+ priv->setting_up_colors = TRUE;
+
+ /* brightness is average */
+ ave = (priv->profile_red[priv->current_gamma] + priv->profile_green[priv->current_gamma] + priv->profile_blue[priv->current_gamma]) / 3.0f;
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_brightness"));
+ gtk_range_set_value (GTK_RANGE(widget), ave - priv->midpoint);
+ egg_debug ("brightness compensation=%f", (ave - priv->midpoint));
+
+ /* color is offset */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_red"));
+ gtk_range_set_value (GTK_RANGE(widget), priv->profile_red[priv->current_gamma] - priv->midpoint - (priv->midpoint - ave));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_green"));
+ gtk_range_set_value (GTK_RANGE(widget), priv->profile_green[priv->current_gamma] - priv->midpoint - (priv->midpoint - ave));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_blue"));
+ gtk_range_set_value (GTK_RANGE(widget), priv->profile_blue[priv->current_gamma] - priv->midpoint - (priv->midpoint - ave));
+
+ /* arm, ready for launch */
+ priv->setting_up_colors = FALSE;
+
+ /* constrain */
+ priv->profile_red[priv->current_gamma] = CLAMP (priv->profile_red[priv->current_gamma], 0.0f, 1.0f);
+ priv->profile_green[priv->current_gamma] = CLAMP (priv->profile_green[priv->current_gamma], 0.0f, 1.0f);
+ priv->profile_blue[priv->current_gamma] = CLAMP (priv->profile_blue[priv->current_gamma], 0.0f, 1.0f);
+
+ egg_debug ("saving colours");
+ g_object_set (priv->gamma_widget,
+ "color-light", light,
+ "color-dark", dark,
+ "color-red", priv->profile_red[priv->current_gamma],
+ "color-green", priv->profile_green[priv->current_gamma],
+ "color-blue", priv->profile_blue[priv->current_gamma],
+ NULL);
+
+ goto out;
+ }
+
+ if (page == GCM_CALIBRATE_MANUAL_PAGE_LAST) {
+
+ GcmClut *clut;
+ GPtrArray *array;
+ GcmClutData *data;
+ guint i;
+
+ array = g_ptr_array_new_with_free_func (g_free);
+ for (i=0; i<priv->calibration_steps; i++) {
+ data = g_new0 (GcmClutData, 1);
+ data->red = priv->profile_red[i] * (gdouble) 0xffff;
+ data->green = priv->profile_green[i] * (gdouble) 0xffff;
+ data->blue = priv->profile_blue[i] * (gdouble) 0xffff;
+ g_ptr_array_add (array, data);
+ }
+
+ clut = gcm_clut_new ();
+ gcm_clut_set_source_array (clut, array);
+
+ g_object_set (priv->trc_widget, "clut", clut, NULL);
+ g_object_unref (clut);
+ g_ptr_array_unref (array);
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_title"));
+ /* TRANSLATORS: dialog title */
+ gtk_label_set_label (GTK_LABEL(widget), _("Summary"));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_next"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_prev"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_apply"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "table_adjust"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "expander_details"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_gamma"));
+ gtk_widget_hide (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_trc"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_text1"));
+ gtk_widget_show (widget);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_text1"));
+ /* TRANSLATORS: message text */
+ gtk_label_set_label (GTK_LABEL(widget), _("This display is now calibrated. You can change the currrent profile using the Color Profiles program."));
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hbox_text2"));
+ gtk_widget_hide (widget);
+ goto out;
+ }
+
+ egg_warning ("oops - no page");
+out:
+ g_free (title);
+ priv->current_page = page;
+}
+
+/**
+ * gcm_calibrate_manual_next_cb:
+ **/
+static void
+gcm_calibrate_manual_next_cb (GtkWidget *widget, GcmCalibrateManual *calibrate)
+{
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ if (priv->current_page == GCM_CALIBRATE_MANUAL_PAGE_INTRO) {
+ priv->current_gamma = 0;
+ gcm_calibrate_manual_setup_page (calibrate, priv->current_page+1);
+ return;
+ }
+ if (priv->current_page == GCM_CALIBRATE_MANUAL_PAGE_GAMMA) {
+ if (priv->current_gamma == priv->calibration_steps-1) {
+ gcm_calibrate_manual_setup_page (calibrate, priv->current_page+1);
+ return;
+ }
+ priv->current_gamma++;
+ gcm_calibrate_manual_setup_page (calibrate, priv->current_page);
+ return;
+ }
+}
+
+/**
+ * gcm_calibrate_manual_prev_cb:
+ **/
+static void
+gcm_calibrate_manual_prev_cb (GtkWidget *widget, GcmCalibrateManual *calibrate)
+{
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ if (priv->current_page == GCM_CALIBRATE_MANUAL_PAGE_LAST) {
+ gcm_calibrate_manual_setup_page (calibrate, priv->current_page-1);
+ priv->current_gamma = priv->calibration_steps-1;
+ return;
+ }
+ if (priv->current_page == GCM_CALIBRATE_MANUAL_PAGE_GAMMA) {
+ if (priv->current_gamma == 0) {
+ gcm_calibrate_manual_setup_page (calibrate, priv->current_page-1);
+ return;
+ }
+ priv->current_gamma--;
+ gcm_calibrate_manual_setup_page (calibrate, priv->current_page);
+ }
+}
+
+/**
+ * gcm_calibrate_manual_apply_cb:
+ **/
+static void
+gcm_calibrate_manual_apply_cb (GtkWidget *widget, GcmCalibrateManual *calibrate)
+{
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ guint i;
+ for (i=0; i<priv->calibration_steps; i++)
+ egg_debug ("@%i, %f, %f, %f", i, priv->profile_red[i], priv->profile_green[i], priv->profile_blue[i]);
+ egg_warning ("NOP: need to create profile with lcms!");
+ priv->ret = TRUE;
+
+ /* we're done */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_calibrate"));
+ gtk_widget_hide (widget);
+ g_main_loop_quit (priv->loop);
+}
+
+/**
+ * gcm_calibrate_manual_display:
+ **/
+gboolean
+gcm_calibrate_manual_display (GcmCalibrateManual *calibrate, GtkWindow *window, GError **error)
+{
+ GtkWidget *widget;
+ guint i;
+
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+ egg_debug ("calibrate_display in %i steps", priv->calibration_steps);
+
+ /* save error, which can be NULL */
+ priv->error = error;
+
+ /* create new array */
+ g_free (priv->profile_red);
+ g_free (priv->profile_green);
+ g_free (priv->profile_blue);
+ priv->profile_red = g_new (gdouble, priv->calibration_steps);
+ priv->profile_green = g_new (gdouble, priv->calibration_steps);
+ priv->profile_blue = g_new (gdouble, priv->calibration_steps);
+
+ /* set to something insane */
+ for (i=0; i<priv->calibration_steps; i++) {
+ priv->profile_red[i] = 2.0f;
+ priv->profile_green[i] = 2.0f;
+ priv->profile_blue[i] = 2.0f;
+ }
+
+ /* switch to the introduction */
+ gcm_calibrate_manual_setup_page (calibrate, GCM_CALIBRATE_MANUAL_PAGE_INTRO);
+
+ /* show main UI */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_calibrate"));
+ gtk_window_set_default_size (GTK_WINDOW (widget), 500, 280);
+ gtk_widget_show (widget);
+
+ /* wait */
+ g_main_loop_run (priv->loop);
+
+ return priv->ret;
+}
+
+/**
+ * gcm_calibrate_manual_get_property:
+ **/
+static void
+gcm_calibrate_manual_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+ GcmCalibrateManual *calibrate = GCM_CALIBRATE_MANUAL (object);
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ switch (prop_id) {
+ case PROP_CALIBRATION_STEPS:
+ g_value_set_uint (value, priv->calibration_steps);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+/**
+ * gcm_calibrate_manual_set_property:
+ **/
+static void
+gcm_calibrate_manual_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+{
+ GcmCalibrateManual *calibrate = GCM_CALIBRATE_MANUAL (object);
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ switch (prop_id) {
+ case PROP_CALIBRATION_STEPS:
+ priv->calibration_steps = g_value_get_uint (value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+/**
+ * gcm_calibrate_manual_class_init:
+ **/
+static void
+gcm_calibrate_manual_class_init (GcmCalibrateManualClass *klass)
+{
+ GParamSpec *pspec;
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+ object_class->finalize = gcm_calibrate_manual_finalize;
+ object_class->get_property = gcm_calibrate_manual_get_property;
+ object_class->set_property = gcm_calibrate_manual_set_property;
+
+ /**
+ * GcmCalibrateManual:calibration-steps:
+ */
+ pspec = g_param_spec_uint ("calibration-steps", NULL, NULL,
+ 0, G_MAXUINT, 5,
+ G_PARAM_READWRITE);
+ g_object_class_install_property (object_class, PROP_CALIBRATION_STEPS, pspec);
+
+ g_type_class_add_private (klass, sizeof (GcmCalibrateManualPrivate));
+}
+
+/**
+ * gcm_calibrate_manual_init:
+ **/
+static void
+gcm_calibrate_manual_init (GcmCalibrateManual *calibrate)
+{
+ GtkWidget *widget;
+ GError *error = NULL;
+ GcmCalibrateManualPrivate *priv;
+ guint i;
+ gint retval;
+
+ priv = calibrate->priv = GCM_CALIBRATE_MANUAL_GET_PRIVATE (calibrate);
+
+ /* good default precision */
+ priv->calibration_steps = 10;
+
+ /* block in a loop */
+ priv->loop = g_main_loop_new (NULL, FALSE);
+
+ /* get UI */
+ priv->builder = gtk_builder_new ();
+ retval = gtk_builder_add_from_file (priv->builder, GCM_DATA "/gcm-calibrate.ui", &error);
+ if (retval == 0) {
+ egg_error ("failed to load ui: %s", error->message);
+ g_error_free (error);
+ }
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "dialog_calibrate"));
+
+ /* Hide window first so that the dialogue resizes itself without redrawing */
+ gtk_widget_hide (widget);
+ gtk_window_set_icon_name (GTK_WINDOW (widget), GCM_STOCK_ICON);
+ g_signal_connect (widget, "delete_event",
+ G_CALLBACK (gcm_calibrate_manual_delete_event_cb), calibrate);
+
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_cancel"));
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (gcm_calibrate_manual_close_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_help"));
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (gcm_calibrate_manual_help_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_next"));
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (gcm_calibrate_manual_next_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_prev"));
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (gcm_calibrate_manual_prev_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "button_apply"));
+ g_signal_connect (widget, "clicked",
+ G_CALLBACK (gcm_calibrate_manual_apply_cb), calibrate);
+
+ /* set ranges */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_brightness"));
+ gtk_range_set_range (GTK_RANGE (widget), -0.25f, 0.25f);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_red"));
+ gtk_range_set_range (GTK_RANGE (widget), -0.25f, 0.25f);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_green"));
+ gtk_range_set_range (GTK_RANGE (widget), -0.25f, 0.25f);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_blue"));
+ gtk_range_set_range (GTK_RANGE (widget), -0.25f, 0.25f);
+
+ /* use gamma widget */
+ priv->gamma_widget = gcm_gamma_widget_new ();
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_gamma"));
+ gtk_container_add (GTK_CONTAINER(widget), priv->gamma_widget);
+ gtk_widget_set_size_request (priv->gamma_widget, 150, 150);
+ gtk_widget_show (priv->gamma_widget);
+
+ /* use trc widget */
+ priv->trc_widget = gcm_trc_widget_new ();
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "aspectframe_trc"));
+ gtk_container_add (GTK_CONTAINER(widget), priv->trc_widget);
+ gtk_widget_set_size_request (priv->trc_widget, 150, 150);
+ gtk_widget_show (priv->trc_widget);
+
+ /* connect up sliders */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_brightness"));
+ g_signal_connect (widget, "value-changed",
+ G_CALLBACK (gcm_calibrate_manual_slider_changed_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_red"));
+ g_signal_connect (widget, "value-changed",
+ G_CALLBACK (gcm_calibrate_manual_slider_changed_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_green"));
+ g_signal_connect (widget, "value-changed",
+ G_CALLBACK (gcm_calibrate_manual_slider_changed_cb), calibrate);
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "hscale_blue"));
+ g_signal_connect (widget, "value-changed",
+ G_CALLBACK (gcm_calibrate_manual_slider_changed_cb), calibrate);
+}
+
+/**
+ * gcm_calibrate_manual_finalize:
+ **/
+static void
+gcm_calibrate_manual_finalize (GObject *object)
+{
+ GcmCalibrateManual *calibrate = GCM_CALIBRATE_MANUAL (object);
+ GcmCalibrateManualPrivate *priv = calibrate->priv;
+
+ g_free (priv->profile_red);
+ g_free (priv->profile_green);
+ g_free (priv->profile_blue);
+
+ g_main_loop_unref (priv->loop);
+ g_object_unref (priv->builder);
+
+ G_OBJECT_CLASS (gcm_calibrate_manual_parent_class)->finalize (object);
+}
+
+/**
+ * gcm_calibrate_manual_new:
+ *
+ * Return value: a new GcmCalibrateManual object.
+ **/
+GcmCalibrateManual *
+gcm_calibrate_manual_new (void)
+{
+ GcmCalibrateManual *calibrate;
+ calibrate = g_object_new (GCM_TYPE_CALIBRATE_MANUAL, NULL);
+ return GCM_CALIBRATE_MANUAL (calibrate);
+}
+
+/***************************************************************************
+ *** MAKE CHECK TESTS ***
+ ***************************************************************************/
+#ifdef EGG_TEST
+#include "egg-test.h"
+
+void
+gcm_calibrate_manual_test (EggTest *test)
+{
+ GcmCalibrateManual *calibrate;
+ gboolean ret;
+ GError *error = NULL;
+
+ if (!egg_test_start (test, "GcmCalibrateManual"))
+ return;
+
+ /************************************************************/
+ egg_test_title (test, "get a calibrate_manual object");
+ calibrate = gcm_calibrate_manual_new ();
+ egg_test_assert (test, calibrate != NULL);
+
+ /************************************************************/
+ egg_test_title (test, "calibrate display manually");
+ ret = gcm_calibrate_manual_display (calibrate, NULL, &error);
+ egg_test_assert (test, ret);
+
+ g_object_unref (calibrate);
+
+ egg_test_end (test);
+}
+#endif
+
diff --git a/src/gcm-calibrate-manual.h b/src/gcm-calibrate-manual.h
new file mode 100644
index 0000000..f713bc2
--- /dev/null
+++ b/src/gcm-calibrate-manual.h
@@ -0,0 +1,67 @@
+/* -*- 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_CALIBRATE_MANUAL_H
+#define __GCM_CALIBRATE_MANUAL_H
+
+#include <glib-object.h>
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GCM_TYPE_CALIBRATE_MANUAL (gcm_calibrate_manual_get_type ())
+#define GCM_CALIBRATE_MANUAL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GCM_TYPE_CALIBRATE_MANUAL, GcmCalibrateManual))
+#define GCM_CALIBRATE_MANUAL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GCM_TYPE_CALIBRATE_MANUAL, GcmCalibrateManualClass))
+#define GCM_IS_CALIBRATE_MANUAL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GCM_TYPE_CALIBRATE_MANUAL))
+#define GCM_IS_CALIBRATE_MANUAL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GCM_TYPE_CALIBRATE_MANUAL))
+#define GCM_CALIBRATE_MANUAL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GCM_TYPE_CALIBRATE_MANUAL, GcmCalibrateManualClass))
+
+typedef struct _GcmCalibrateManualPrivate GcmCalibrateManualPrivate;
+typedef struct _GcmCalibrateManual GcmCalibrateManual;
+typedef struct _GcmCalibrateManualClass GcmCalibrateManualClass;
+
+struct _GcmCalibrateManual
+{
+ GObject parent;
+ GcmCalibrateManualPrivate *priv;
+};
+
+struct _GcmCalibrateManualClass
+{
+ 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_calibrate_manual_get_type (void);
+GcmCalibrateManual *gcm_calibrate_manual_new (void);
+gboolean gcm_calibrate_manual_display (GcmCalibrateManual *calibrate,
+ GtkWindow *window,
+ GError **error);
+
+G_END_DECLS
+
+#endif /* __GCM_CALIBRATE_MANUAL_H */
+
diff --git a/src/gcm-self-test.c b/src/gcm-self-test.c
index 8bfa455..f4fd42f 100644
--- a/src/gcm-self-test.c
+++ b/src/gcm-self-test.c
@@ -35,6 +35,7 @@ void gcm_dmi_test (EggTest *test);
void gcm_xyz_test (EggTest *test);
void gcm_cie_widget_test (EggTest *test);
void gcm_trc_widget_test (EggTest *test);
+void gcm_calibrate_manual_test (EggTest *test);
int
main (int argc, char **argv)
@@ -60,6 +61,7 @@ main (int argc, char **argv)
gcm_trc_widget_test (test);
gcm_cie_widget_test (test);
gcm_gamma_widget_test (test);
+ gcm_calibrate_manual_test (test);
return (egg_test_finish (test));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
