From: Andrea Zagli Date: Mon, 31 Oct 2011 16:34:37 +0000 (+0100) Subject: Added visible property to objects (closes #36). X-Git-Tag: 0.5.0~17 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=298b2d8d7f1a7ef1782419a319889899f0575a2d;p=reptool%2Flibreptool Added visible property to objects (closes #36). --- diff --git a/data/reptool.dtd b/data/reptool.dtd index ba0534a..862255b 100644 --- a/data/reptool.dtd +++ b/data/reptool.dtd @@ -3,9 +3,10 @@ > + * Copyright (C) 2007-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,7 +22,8 @@ enum { PROP_0, PROP_NAME, - PROP_POSITION + PROP_POSITION, + PROP_VISIBLE }; static void rpt_object_class_init (RptObjectClass *klass); @@ -45,35 +46,10 @@ struct _RptObjectPrivate { gchar *name; RptPoint *position; + gboolean visibile; }; -GType -rpt_object_get_type (void) -{ - static GType rpt_object_type = 0; - - if (!rpt_object_type) - { - static const GTypeInfo rpt_object_info = - { - sizeof (RptObjectClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc) rpt_object_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (RptObject), - 0, /* n_preallocs */ - (GInstanceInitFunc) rpt_object_init, - NULL - }; - - rpt_object_type = g_type_register_static (G_TYPE_OBJECT, "RptObject", - &rpt_object_info, 0); - } - - return rpt_object_type; -} +G_DEFINE_TYPE (RptObject, rpt_object, G_TYPE_OBJECT) static void rpt_object_class_init (RptObjectClass *klass) @@ -98,6 +74,12 @@ rpt_object_class_init (RptObjectClass *klass) "Position", "The object's position.", G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_VISIBLE, + g_param_spec_boolean ("visible", + "Visibility", + "The object's visibility.", + TRUE, + G_PARAM_READWRITE)); } static void @@ -105,7 +87,9 @@ rpt_object_init (RptObject *rpt_object) { RptObjectPrivate *priv = RPT_OBJECT_GET_PRIVATE (rpt_object); + priv->name = NULL; priv->position = NULL; + priv->visibile = TRUE; } /** @@ -142,20 +126,40 @@ rpt_object_get_xml (RptObject *rpt_object, xmlNode *xnode) RptObjectPrivate *priv = RPT_OBJECT_GET_PRIVATE (rpt_object); xmlSetProp (xnode, "name", priv->name); + if (priv->position != NULL) { rpt_common_set_position (xnode, priv->position); } + xmlSetProp (xnode, "visible", priv->visibile ? "y" : "n"); + RPT_OBJECT_GET_CLASS (rpt_object)->get_xml (rpt_object, xnode); } } +/** + * rpt_object_set_from_xml: + * @rpt_object: + * @xnode: + * + */ +void +rpt_object_set_from_xml (RptObject *rpt_object, xmlNode *xnode) +{ + gchar *prop; + + g_return_if_fail (IS_RPT_OBJECT (rpt_object)); + + prop = (gchar *)xmlGetProp (xnode, "visible"); + g_object_set (rpt_object, "visible", g_strcmp0 (prop, "y") == 0, NULL); + if (prop != NULL) xmlFree (prop); +} + static void rpt_object_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) { RptObject *rpt_object = RPT_OBJECT (object); - RptObjectPrivate *priv = RPT_OBJECT_GET_PRIVATE (rpt_object); switch (property_id) @@ -168,6 +172,10 @@ rpt_object_set_property (GObject *object, guint property_id, const GValue *value priv->position = g_memdup (g_value_get_pointer (value), sizeof (RptPoint)); break; + case PROP_VISIBLE: + priv->visibile = g_value_get_boolean (value); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -178,7 +186,6 @@ static void rpt_object_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) { RptObject *rpt_object = RPT_OBJECT (object); - RptObjectPrivate *priv = RPT_OBJECT_GET_PRIVATE (rpt_object); switch (property_id) @@ -191,6 +198,10 @@ rpt_object_get_property (GObject *object, guint property_id, GValue *value, GPar g_value_set_pointer (value, g_memdup (priv->position, sizeof (RptPoint))); break; + case PROP_VISIBLE: + g_value_set_boolean (value, priv->visibile); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; diff --git a/src/rptobject.h b/src/rptobject.h index 5a3533a..d604f99 100644 --- a/src/rptobject.h +++ b/src/rptobject.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Andrea Zagli + * Copyright (C) 2007-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -58,6 +58,7 @@ GType rpt_object_get_type (void) G_GNUC_CONST; RptObject *rpt_object_new (const gchar *name, RptPoint position); void rpt_object_get_xml (RptObject *rpt_object, xmlNode *xnode); +void rpt_object_set_from_xml (RptObject *rpt_object, xmlNode *xnode); G_END_DECLS diff --git a/src/rptobjectellipse.c b/src/rptobjectellipse.c index 08b0464..42a5ebd 100644 --- a/src/rptobjectellipse.c +++ b/src/rptobjectellipse.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Andrea Zagli + * Copyright (C) 2007-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -150,6 +150,8 @@ RptObject RptSize *size; RptStroke *stroke; + rpt_object_set_from_xml (RPT_OBJECT (rpt_obj_ellipse), xnode); + priv = RPT_OBJ_ELLIPSE_GET_PRIVATE (rpt_obj_ellipse); size = rpt_common_get_size (xnode); diff --git a/src/rptobjectimage.c b/src/rptobjectimage.c index c9f0b88..c2a3224 100644 --- a/src/rptobjectimage.c +++ b/src/rptobjectimage.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Andrea Zagli + * Copyright (C) 2007-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -192,6 +192,8 @@ RptObject { priv = RPT_OBJ_IMAGE_GET_PRIVATE (rpt_obj_image); + rpt_object_set_from_xml (RPT_OBJECT (rpt_obj_image), xnode); + priv->size = rpt_common_get_size (xnode); priv->rotation = rpt_common_get_rotation (xnode); priv->border = rpt_common_get_border (xnode); diff --git a/src/rptobjectline.c b/src/rptobjectline.c index f734592..86d641f 100644 --- a/src/rptobjectline.c +++ b/src/rptobjectline.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Andrea Zagli + * Copyright (C) 2007-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -174,6 +174,8 @@ RptObject if (rpt_obj_line != NULL) { + rpt_object_set_from_xml (RPT_OBJECT (rpt_obj_line), xnode); + priv = RPT_OBJ_LINE_GET_PRIVATE (rpt_obj_line); priv->size = rpt_common_get_size (xnode); diff --git a/src/rptobjectrect.c b/src/rptobjectrect.c index 81db44d..5709217 100644 --- a/src/rptobjectrect.c +++ b/src/rptobjectrect.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Andrea Zagli + * Copyright (C) 2007-2011 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -160,6 +160,8 @@ RptObject RptRotation *rotation; RptStroke *stroke; + rpt_object_set_from_xml (RPT_OBJECT (rpt_obj_rect), xnode); + priv = RPT_OBJ_RECT_GET_PRIVATE (rpt_obj_rect); size = rpt_common_get_size (xnode); diff --git a/src/rptobjecttext.c b/src/rptobjecttext.c index d1eaf57..640cc1d 100644 --- a/src/rptobjecttext.c +++ b/src/rptobjecttext.c @@ -235,6 +235,8 @@ RptObject { gchar *prop; + rpt_object_set_from_xml (RPT_OBJECT (rpt_obj_text), xnode); + priv = RPT_OBJ_TEXT_GET_PRIVATE (rpt_obj_text); priv->size = rpt_common_get_size (xnode); diff --git a/src/rptprint.c b/src/rptprint.c index 89a3e6d..f7de315 100644 --- a/src/rptprint.c +++ b/src/rptprint.c @@ -708,6 +708,8 @@ rpt_print_get_xml_page_attributes (RptPrint *rpt_print, xmlNode *xml_page) static void rpt_print_page (RptPrint *rpt_print, xmlNode *xnode) { + gchar *prop; + RptPrintPrivate *priv = RPT_PRINT_GET_PRIVATE (rpt_print); xmlNode *cur = xnode->children; @@ -731,28 +733,38 @@ rpt_print_page (RptPrint *rpt_print, xmlNode *xnode) { if (!xmlNodeIsText (cur)) { - cairo_save (priv->cr); - if (g_strcmp0 (cur->name, "text") == 0) - { - rpt_print_text_xml (rpt_print, cur); - } - else if (g_strcmp0 (cur->name, "line") == 0) - { - rpt_print_line_xml (rpt_print, cur); - } - else if (g_strcmp0 (cur->name, "rect") == 0) - { - rpt_print_rect_xml (rpt_print, cur); - } - else if (g_strcmp0 (cur->name, "ellipse") == 0) + prop = (gchar *)xmlGetProp (cur, "visible"); + if (prop != NULL + && strcmp (g_strstrip (prop), "y") == 0) { - rpt_print_ellipse_xml (rpt_print, cur); + cairo_save (priv->cr); + if (g_strcmp0 (cur->name, "text") == 0) + { + rpt_print_text_xml (rpt_print, cur); + } + else if (g_strcmp0 (cur->name, "line") == 0) + { + rpt_print_line_xml (rpt_print, cur); + } + else if (g_strcmp0 (cur->name, "rect") == 0) + { + rpt_print_rect_xml (rpt_print, cur); + } + else if (g_strcmp0 (cur->name, "ellipse") == 0) + { + rpt_print_ellipse_xml (rpt_print, cur); + } + else if (g_strcmp0 (cur->name, "image") == 0) + { + rpt_print_image_xml (rpt_print, cur); + } + cairo_restore (priv->cr); } - else if (g_strcmp0 (cur->name, "image") == 0) + + if (prop != NULL) { - rpt_print_image_xml (rpt_print, cur); + xmlFree (prop); } - cairo_restore (priv->cr); } cur = cur->next; diff --git a/tests/test_rptreport.c b/tests/test_rptreport.c index 035ad3a..cb9066c 100644 --- a/tests/test_rptreport.c +++ b/tests/test_rptreport.c @@ -75,6 +75,10 @@ main (int argc, char **argv) rpt_print_set_output_filename (rptp, "test.pdf"); rpt_print_print (rptp, NULL); } + else + { + g_warning ("Error on creating RptPrint."); + } } return 0;