Author: akv
Date: 2009-12-30 18:45:44 +0100 (Wed, 30 Dec 2009)
New Revision: 2894
Modified:
branches/rawstudio-ng-color/librawstudio/rs-lens-db.c
branches/rawstudio-ng-color/librawstudio/rs-lens.c
Log:
Added 'enabled' key on RSLens.
Modified: branches/rawstudio-ng-color/librawstudio/rs-lens-db.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens-db.c 2009-12-30
17:15:24 UTC (rev 2893)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens-db.c 2009-12-30
17:45:44 UTC (rev 2894)
@@ -131,6 +131,7 @@
gdouble min_focal, max_focal, min_aperture, max_aperture;
gchar *camera_make;
gchar *camera_model;
+ gboolean enabled;
RSLens *lens = list->data;
@@ -145,6 +146,7 @@
"max-aperture", &max_aperture,
"camera-make", &camera_make,
"camera-model", &camera_model,
+ "enabled", &enabled,
NULL);
xmlTextWriterStartElement(writer, BAD_CAST "lens");
@@ -166,6 +168,10 @@
xmlTextWriterWriteFormatElement(writer,
BAD_CAST "camera-make", "%s", camera_make);
if (camera_model)
xmlTextWriterWriteFormatElement(writer,
BAD_CAST "camera-model", "%s", camera_model);
+ if (enabled)
+ xmlTextWriterWriteFormatElement(writer,
BAD_CAST "enabled", "%s", "TRUE");
+ if (!enabled)
+ xmlTextWriterWriteFormatElement(writer,
BAD_CAST "enabled", "%s", "FALSE");
xmlTextWriterEndElement(writer);
g_free(identifier);
@@ -242,6 +248,13 @@
g_object_set(lens,
"camera-make", val, NULL);
else if ((!xmlStrcmp(entry->name,
BAD_CAST "camera-model")))
g_object_set(lens,
"camera-model", val, NULL);
+ else if ((!xmlStrcmp(entry->name,
BAD_CAST "enabled")))
+ {
+ gboolean enabled = FALSE;
+ if (g_strcmp0(val, "TRUE") == 0)
+ enabled = TRUE;
+ g_object_set(lens, "enabled",
enabled, NULL);
+ }
xmlFree(val);
entry = entry->next;
}
Modified: branches/rawstudio-ng-color/librawstudio/rs-lens.c
===================================================================
--- branches/rawstudio-ng-color/librawstudio/rs-lens.c 2009-12-30 17:15:24 UTC
(rev 2893)
+++ branches/rawstudio-ng-color/librawstudio/rs-lens.c 2009-12-30 17:45:44 UTC
(rev 2894)
@@ -33,6 +33,7 @@
gchar *lensfun_model;
gchar *camera_make;
gchar *camera_model;
+ gboolean enabled;
};
G_DEFINE_TYPE (RSLens, rs_lens, G_TYPE_OBJECT)
@@ -48,7 +49,8 @@
PROP_LENSFUN_MAKE,
PROP_LENSFUN_MODEL,
PROP_CAMERA_MAKE,
- PROP_CAMERA_MODEL
+ PROP_CAMERA_MODEL,
+ PROP_ENABLED
};
static void
@@ -88,6 +90,9 @@
case PROP_CAMERA_MODEL:
g_value_set_string(value, lens->camera_model);
break;
+ case PROP_ENABLED:
+ g_value_set_boolean(value, lens->enabled);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id,
pspec);
}
@@ -132,6 +137,9 @@
g_free(lens->camera_model);
lens->camera_model = g_value_dup_string(value);
break;
+ case PROP_ENABLED:
+ lens->enabled = g_value_get_boolean(value);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id,
pspec);
}
@@ -210,6 +218,11 @@
PROP_CAMERA_MODEL, g_param_spec_string(
"camera-model", "camera-model", "String helping Lensfun to
identify the camera model",
"", G_PARAM_READWRITE));
+
+ g_object_class_install_property(object_class,
+ PROP_ENABLED, g_param_spec_boolean(
+ "enabled", "enabled", "Specify whether the lens should be
corrected or not",
+ TRUE, G_PARAM_READWRITE));
}
static void
@@ -226,6 +239,7 @@
lens->lensfun_model = NULL;
lens->camera_make = NULL;
lens->camera_model = NULL;
+ lens->enabled = TRUE;
}
/**
_______________________________________________
Rawstudio-commit mailing list
[email protected]
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit
