From 0b8f2b38a9ded048049a5098aaf6cf62f2fefb53 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Sun, 25 Mar 2007 08:08:51 +0000 Subject: [PATCH] RptReport with text, line, rect and image objects. Only few features implemented. git-svn-id: svn+ssh://saetta.homelinux.org/svn/libreptool/trunk@6 3191ed1d-3fce-41bb-ab4a-0cebc0943b59 --- data/reptool.dtd | 1 + src/Makefile.am | 6 + src/rptcommon.c | 2 +- src/rptcommon.h | 2 +- src/rptobject.c | 8 +- src/rptobject.h | 2 +- src/rptobjectimage.c | 241 ++++++++++++++++++++ src/rptobjectimage.h | 64 ++++++ src/rptobjectline.c | 220 ++++++++++++++++++ src/rptobjectline.h | 63 ++++++ src/rptobjectrect.c | 202 +++++++++++++++++ src/rptobjectrect.h | 63 ++++++ src/rptreport.c | 283 ++++++++++++++++++------ src/rptreport.h | 4 +- tests/Makefile.am | 4 +- tests/gnome-globe.png | Bin 0 -> 4780 bytes tests/test_report_db.rpt | 15 +- tests/{rptprint.c => test_rptprint.c} | 0 tests/{rptreport.c => test_rptreport.c} | 0 19 files changed, 1107 insertions(+), 73 deletions(-) create mode 100644 src/rptobjectimage.c create mode 100644 src/rptobjectimage.h create mode 100644 src/rptobjectline.c create mode 100644 src/rptobjectline.h create mode 100644 src/rptobjectrect.c create mode 100644 src/rptobjectrect.h create mode 100644 tests/gnome-globe.png rename tests/{rptprint.c => test_rptprint.c} (100%) rename tests/{rptreport.c => test_rptreport.c} (100%) diff --git a/data/reptool.dtd b/data/reptool.dtd index b1f192b..35a7f41 100644 --- a/data/reptool.dtd +++ b/data/reptool.dtd @@ -145,6 +145,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 572fee6..e8e4e29 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,9 @@ lib_LTLIBRARIES = libreptool.la libreptool_la_SOURCES = \ rptobject.c \ rptobjecttext.c \ + rptobjectline.c \ + rptobjectrect.c \ + rptobjectimage.c \ rptreport.c \ rptprint.c \ rptcommon.c @@ -14,6 +17,9 @@ libreptool_la_SOURCES = \ include_HEADERS = \ rptobject.h \ rptobjecttext.h \ + rptobjectline.h \ + rptobjectrect.h \ + rptobjectimage.h \ rptreport.h \ rptprint.h \ rptcommon.h diff --git a/src/rptcommon.c b/src/rptcommon.c index 54952a6..9c12935 100644 --- a/src/rptcommon.c +++ b/src/rptcommon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2007 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/rptcommon.h b/src/rptcommon.h index 167a1cb..4dce0bb 100644 --- a/src/rptcommon.h +++ b/src/rptcommon.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2007 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/rptobject.c b/src/rptobject.c index 938e9f5..2abcdfb 100644 --- a/src/rptobject.c +++ b/src/rptobject.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2007 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -125,6 +125,12 @@ RptObject return rpt_object; } +/** + * rpt_object_get_xml: + * @rpt_object: + * @xnode: + * + */ void rpt_object_get_xml (RptObject *rpt_object, xmlNode *xnode) { diff --git a/src/rptobject.h b/src/rptobject.h index fd52e56..2d14bf4 100644 --- a/src/rptobject.h +++ b/src/rptobject.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2007 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/rptobjectimage.c b/src/rptobjectimage.c new file mode 100644 index 0000000..8f201f8 --- /dev/null +++ b/src/rptobjectimage.c @@ -0,0 +1,241 @@ +/* + * Copyright (C) 2007 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "rptobjectimage.h" +#include "rptcommon.h" + +enum +{ + PROP_0, + PROP_SIZE, + PROP_SOURCE +}; + +static void rpt_obj_image_class_init (RptObjImageClass *klass); +static void rpt_obj_image_init (RptObjImage *rpt_obj_image); + +static void rpt_obj_image_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void rpt_obj_image_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + + +#define RPT_OBJ_IMAGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_RPT_OBJ_IMAGE, RptObjImagePrivate)) + +typedef struct _RptObjImagePrivate RptObjImagePrivate; +struct _RptObjImagePrivate + { + RptSize *size; + gchar *source; + }; + +GType +rpt_obj_image_get_type (void) +{ + static GType rpt_obj_image_type = 0; + + if (!rpt_obj_image_type) + { + static const GTypeInfo rpt_obj_image_info = + { + sizeof (RptObjImageClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) rpt_obj_image_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (RptObjImage), + 0, /* n_preallocs */ + (GInstanceInitFunc) rpt_obj_image_init, + NULL + }; + + rpt_obj_image_type = g_type_register_static (TYPE_RPT_OBJECT, "RptObjImage", + &rpt_obj_image_info, 0); + } + + return rpt_obj_image_type; +} + +static void +rpt_obj_image_class_init (RptObjImageClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + RptObjectClass *rptobject_class = RPT_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (RptObjImagePrivate)); + + object_class->set_property = rpt_obj_image_set_property; + object_class->get_property = rpt_obj_image_get_property; + + rptobject_class->get_xml = rpt_obj_image_get_xml; + + g_object_class_install_property (object_class, PROP_SIZE, + g_param_spec_pointer ("size", + "Size", + "The object's size.", + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_SOURCE, + g_param_spec_string ("source", + "Source", + "The image's source.", + "", + G_PARAM_READWRITE)); +} + +static void +rpt_obj_image_init (RptObjImage *rpt_obj_image) +{ + RptObjImagePrivate *priv = RPT_OBJ_IMAGE_GET_PRIVATE (rpt_obj_image); + + priv->size = (RptSize *)g_malloc0 (sizeof (RptSize)); + priv->size->width = 0.0; + priv->size->height = 0.0; + + priv->source = g_strdup (""); +} + +/** + * rpt_obj_image_new: + * @name: the #RptObjImage's name. + * @position: + * + * Returns: the newly created #RptObject object. + */ +RptObject +*rpt_obj_image_new (const gchar *name, RptPoint position) +{ + RptObject *rpt_obj_image = NULL; + + gchar *name_ = g_strstrip (g_strdup (name)); + + if (strcmp (name_, "") != 0) + { + rpt_obj_image = RPT_OBJECT (g_object_new (rpt_obj_image_get_type (), NULL)); + + g_object_set (G_OBJECT (rpt_obj_image), + "name", name_, + "position", &position, + NULL); + } + + return rpt_obj_image; +} + +/** + * rpt_obj_image_new_from_xml: + * @xnode: + * + * Returns: the newly created #RptObject object. + */ +RptObject +*rpt_obj_image_new_from_xml (xmlNode *xnode) +{ + gchar *name; + RptObject *rpt_obj_image = NULL; + + name = g_strdup ((gchar *)xmlGetProp (xnode, "name")); + if (name != NULL && strcmp (g_strstrip (name), "") != 0) + { + RptPoint position; + RptObjImagePrivate *priv; + + rpt_common_get_position (xnode, &position); + + rpt_obj_image = rpt_obj_image_new ((const gchar *)name, position); + + if (rpt_obj_image != NULL) + { + priv = RPT_OBJ_IMAGE_GET_PRIVATE (rpt_obj_image); + + rpt_common_get_size (xnode, priv->size); + + priv->source = (gchar *)xmlGetProp (xnode, "source"); + } + } + + return rpt_obj_image; +} + +/** + * rpt_obj_image_get_xml: + * @rpt_objimage: + * @xnode: + * + */ +void +rpt_obj_image_get_xml (RptObject *rpt_objimage, xmlNode *xnode) +{ + RptObjImagePrivate *priv = RPT_OBJ_IMAGE_GET_PRIVATE (rpt_objimage); + + xmlNodeSetName (xnode, "image"); + + xmlSetProp (xnode, "width", g_strdup_printf ("%f", priv->size->width)); + xmlSetProp (xnode, "height", g_strdup_printf ("%f", priv->size->height)); + xmlSetProp (xnode, "source", priv->source); +} + +static void +rpt_obj_image_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + RptObjImage *rpt_obj_image = RPT_OBJ_IMAGE (object); + + RptObjImagePrivate *priv = RPT_OBJ_IMAGE_GET_PRIVATE (rpt_obj_image); + + switch (property_id) + { + case PROP_SIZE: + priv->size = g_memdup (g_value_get_pointer (value), sizeof (RptSize)); + break; + + case PROP_SOURCE: + priv->source = g_strstrip (g_strdup (g_value_get_string (value))); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +rpt_obj_image_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + RptObjImage *rpt_obj_image = RPT_OBJ_IMAGE (object); + + RptObjImagePrivate *priv = RPT_OBJ_IMAGE_GET_PRIVATE (rpt_obj_image); + + switch (property_id) + { + case PROP_SIZE: + g_value_set_pointer (value, g_memdup (priv->size, sizeof (RptSize))); + break; + + case PROP_SOURCE: + g_value_set_string (value, priv->source); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} diff --git a/src/rptobjectimage.h b/src/rptobjectimage.h new file mode 100644 index 0000000..c30bf92 --- /dev/null +++ b/src/rptobjectimage.h @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2007 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __RPT_OBJ_IMAGE_H__ +#define __RPT_OBJ_IMAGE_H__ + +#include +#include +#include + +#include "rptobject.h" + +G_BEGIN_DECLS + + +#define TYPE_RPT_OBJ_IMAGE (rpt_obj_image_get_type ()) +#define RPT_OBJ_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RPT_OBJ_IMAGE, RptObjImage)) +#define RPT_OBJ_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RPT_OBJ_IMAGE, RptObjImageClass)) +#define IS_RPT_OBJ_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RPT_OBJ_IMAGE)) +#define IS_RPT_OBJ_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RPT_OBJ_IMAGE)) +#define RPT_OBJ_IMAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RPT_OBJ_IMAGE, RptObjImageClass)) + + +typedef struct _RptObjImage RptObjImage; +typedef struct _RptObjImageClass RptObjImageClass; + +struct _RptObjImage + { + RptObject parent; + }; + +struct _RptObjImageClass + { + RptObjectClass parent_class; + }; + +GType rpt_obj_image_get_type (void) G_GNUC_CONST; + + +RptObject *rpt_obj_image_new (const gchar *name, RptPoint position); +RptObject *rpt_obj_image_new_from_xml (xmlNode *xnode); + +void rpt_obj_image_get_xml (RptObject *rpt_objimage, xmlNode *xnode); + + +G_END_DECLS + +#endif /* __RPT_OBJ_IMAGE_H__ */ diff --git a/src/rptobjectline.c b/src/rptobjectline.c new file mode 100644 index 0000000..4bfc138 --- /dev/null +++ b/src/rptobjectline.c @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2007 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "rptobjectline.h" +#include "rptcommon.h" + +enum +{ + PROP_0, + PROP_SIZE +}; + +static void rpt_obj_line_class_init (RptObjLineClass *klass); +static void rpt_obj_line_init (RptObjLine *rpt_obj_line); + +static void rpt_obj_line_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void rpt_obj_line_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + + +#define RPT_OBJ_LINE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_RPT_OBJ_LINE, RptObjLinePrivate)) + +typedef struct _RptObjLinePrivate RptObjLinePrivate; +struct _RptObjLinePrivate + { + RptSize *size; + }; + +GType +rpt_obj_line_get_type (void) +{ + static GType rpt_obj_line_type = 0; + + if (!rpt_obj_line_type) + { + static const GTypeInfo rpt_obj_line_info = + { + sizeof (RptObjLineClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) rpt_obj_line_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (RptObjLine), + 0, /* n_preallocs */ + (GInstanceInitFunc) rpt_obj_line_init, + NULL + }; + + rpt_obj_line_type = g_type_register_static (TYPE_RPT_OBJECT, "RptObjLine", + &rpt_obj_line_info, 0); + } + + return rpt_obj_line_type; +} + +static void +rpt_obj_line_class_init (RptObjLineClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + RptObjectClass *rptobject_class = RPT_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (RptObjLinePrivate)); + + object_class->set_property = rpt_obj_line_set_property; + object_class->get_property = rpt_obj_line_get_property; + + rptobject_class->get_xml = rpt_obj_line_get_xml; + + g_object_class_install_property (object_class, PROP_SIZE, + g_param_spec_pointer ("size", + "Size", + "The object's size.", + G_PARAM_READWRITE)); +} + +static void +rpt_obj_line_init (RptObjLine *rpt_obj_line) +{ + RptObjLinePrivate *priv = RPT_OBJ_LINE_GET_PRIVATE (rpt_obj_line); + + priv->size = (RptSize *)g_malloc0 (sizeof (RptSize)); + priv->size->width = 0.0; + priv->size->height = 0.0; +} + +/** + * rpt_obj_line_new: + * @name: the #RptObjLine's name. + * @position: + * + * Returns: the newly created #RptObject object. + */ +RptObject +*rpt_obj_line_new (const gchar *name, RptPoint position) +{ + RptObject *rpt_obj_line = NULL; + + gchar *name_ = g_strstrip (g_strdup (name)); + + if (strcmp (name_, "") != 0) + { + rpt_obj_line = RPT_OBJECT (g_object_new (rpt_obj_line_get_type (), NULL)); + + g_object_set (G_OBJECT (rpt_obj_line), + "name", name_, + "position", &position, + NULL); + } + + return rpt_obj_line; +} + +/** + * rpt_obj_line_new_from_xml: + * @xnode: + * + * Returns: the newly created #RptObject object. + */ +RptObject +*rpt_obj_line_new_from_xml (xmlNode *xnode) +{ + gchar *name; + RptObject *rpt_obj_line = NULL; + + name = g_strdup ((gchar *)xmlGetProp (xnode, "name")); + if (name != NULL && strcmp (g_strstrip (name), "") != 0) + { + RptPoint position; + RptObjLinePrivate *priv; + + rpt_common_get_position (xnode, &position); + + rpt_obj_line = rpt_obj_line_new ((const gchar *)name, position); + + if (rpt_obj_line != NULL) + { + priv = RPT_OBJ_LINE_GET_PRIVATE (rpt_obj_line); + + rpt_common_get_size (xnode, priv->size); + } + } + + return rpt_obj_line; +} + +/** + * rpt_obj_line_get_xml: + * @rpt_objline: + * @xnode: + * + */ +void +rpt_obj_line_get_xml (RptObject *rpt_objline, xmlNode *xnode) +{ + RptObjLinePrivate *priv = RPT_OBJ_LINE_GET_PRIVATE (rpt_objline); + + xmlNodeSetName (xnode, "line"); + + xmlSetProp (xnode, "width", g_strdup_printf ("%f", priv->size->width)); + xmlSetProp (xnode, "height", g_strdup_printf ("%f", priv->size->height)); +} + +static void +rpt_obj_line_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + RptObjLine *rpt_obj_line = RPT_OBJ_LINE (object); + + RptObjLinePrivate *priv = RPT_OBJ_LINE_GET_PRIVATE (rpt_obj_line); + + switch (property_id) + { + case PROP_SIZE: + priv->size = g_memdup (g_value_get_pointer (value), sizeof (RptSize)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +rpt_obj_line_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + RptObjLine *rpt_obj_line = RPT_OBJ_LINE (object); + + RptObjLinePrivate *priv = RPT_OBJ_LINE_GET_PRIVATE (rpt_obj_line); + + switch (property_id) + { + case PROP_SIZE: + g_value_set_pointer (value, g_memdup (priv->size, sizeof (RptSize))); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} diff --git a/src/rptobjectline.h b/src/rptobjectline.h new file mode 100644 index 0000000..647a17b --- /dev/null +++ b/src/rptobjectline.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2007 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __RPT_OBJ_LINE_H__ +#define __RPT_OBJ_LINE_H__ + +#include +#include +#include + +#include "rptobject.h" + +G_BEGIN_DECLS + + +#define TYPE_RPT_OBJ_LINE (rpt_obj_line_get_type ()) +#define RPT_OBJ_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RPT_OBJ_LINE, RptObjLine)) +#define RPT_OBJ_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RPT_OBJ_LINE, RptObjLineClass)) +#define IS_RPT_OBJ_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RPT_OBJ_LINE)) +#define IS_RPT_OBJ_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RPT_OBJ_LINE)) +#define RPT_OBJ_LINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RPT_OBJ_LINE, RptObjLineClass)) + + +typedef struct _RptObjLine RptObjLine; +typedef struct _RptObjLineClass RptObjLineClass; + +struct _RptObjLine + { + RptObject parent; + }; + +struct _RptObjLineClass + { + RptObjectClass parent_class; + }; + +GType rpt_obj_line_get_type (void) G_GNUC_CONST; + + +RptObject *rpt_obj_line_new (const gchar *name, RptPoint position); +RptObject *rpt_obj_line_new_from_xml (xmlNode *xnode); + +void rpt_obj_line_get_xml (RptObject *rpt_objline, xmlNode *xnode); + +G_END_DECLS + +#endif /* __RPT_OBJ_LINE_H__ */ diff --git a/src/rptobjectrect.c b/src/rptobjectrect.c new file mode 100644 index 0000000..a47bc64 --- /dev/null +++ b/src/rptobjectrect.c @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2007 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "rptobjectrect.h" +#include "rptcommon.h" + +enum +{ + PROP_0 +}; + +static void rpt_obj_rect_class_init (RptObjRectClass *klass); +static void rpt_obj_rect_init (RptObjRect *rpt_obj_rect); + +static void rpt_obj_rect_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void rpt_obj_rect_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + + +#define RPT_OBJ_RECT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_RPT_OBJ_RECT, RptObjRectPrivate)) + +typedef struct _RptObjRectPrivate RptObjRectPrivate; +struct _RptObjRectPrivate + { + }; + +GType +rpt_obj_rect_get_type (void) +{ + static GType rpt_obj_rect_type = 0; + + if (!rpt_obj_rect_type) + { + static const GTypeInfo rpt_obj_rect_info = + { + sizeof (RptObjRectClass), + NULL, /* base_init */ + NULL, /* base_finalize */ + (GClassInitFunc) rpt_obj_rect_class_init, + NULL, /* class_finalize */ + NULL, /* class_data */ + sizeof (RptObjRect), + 0, /* n_preallocs */ + (GInstanceInitFunc) rpt_obj_rect_init, + NULL + }; + + rpt_obj_rect_type = g_type_register_static (TYPE_RPT_OBJ_LINE, "RptObjRect", + &rpt_obj_rect_info, 0); + } + + return rpt_obj_rect_type; +} + +static void +rpt_obj_rect_class_init (RptObjRectClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + RptObjectClass *rptobject_class = RPT_OBJECT_CLASS (klass); + + g_type_class_add_private (object_class, sizeof (RptObjRectPrivate)); + + object_class->set_property = rpt_obj_rect_set_property; + object_class->get_property = rpt_obj_rect_get_property; + + rptobject_class->get_xml = rpt_obj_rect_get_xml; +} + +static void +rpt_obj_rect_init (RptObjRect *rpt_obj_rect) +{ + RptObjRectPrivate *priv = RPT_OBJ_RECT_GET_PRIVATE (rpt_obj_rect); +} + +/** + * rpt_obj_rect_new: + * @name: the #RptObjRect's name. + * @position: + * + * Returns: the newly created #RptObject object. + */ +RptObject +*rpt_obj_rect_new (const gchar *name, RptPoint position) +{ + RptObject *rpt_obj_rect = NULL; + + gchar *name_ = g_strstrip (g_strdup (name)); + + if (strcmp (name_, "") != 0) + { + rpt_obj_rect = RPT_OBJECT (g_object_new (rpt_obj_rect_get_type (), NULL)); + + g_object_set (G_OBJECT (rpt_obj_rect), + "name", name_, + "position", &position, + NULL); + } + + return rpt_obj_rect; +} + +/** + * rpt_obj_rect_new_from_xml: + * @xnode: + * + * Returns: the newly created #RptObject object. + */ +RptObject +*rpt_obj_rect_new_from_xml (xmlNode *xnode) +{ + gchar *name; + RptObject *rpt_obj_rect = NULL; + + name = g_strdup ((gchar *)xmlGetProp (xnode, "name")); + if (name != NULL && strcmp (g_strstrip (name), "") != 0) + { + RptPoint position; + RptObjRectPrivate *priv; + + rpt_common_get_position (xnode, &position); + + rpt_obj_rect = rpt_obj_rect_new ((const gchar *)name, position); + + if (rpt_obj_rect != NULL) + { + RptSize size; + + priv = RPT_OBJ_RECT_GET_PRIVATE (rpt_obj_rect); + + rpt_common_get_size (xnode, &size); + g_object_set (G_OBJECT (rpt_obj_rect), "size", &size, NULL); + } + } + + return rpt_obj_rect; +} + +/** + * rpt_obj_rect_get_xml: + * @rpt_object: + * @xnode: + * + */ +void +rpt_obj_rect_get_xml (RptObject *rpt_object, xmlNode *xnode) +{ + RptObjRectPrivate *priv = RPT_OBJ_RECT_GET_PRIVATE (RPT_OBJ_RECT (rpt_object)); + + rpt_obj_line_get_xml (rpt_object, xnode); + + xmlNodeSetName (xnode, "rect"); +} + +static void +rpt_obj_rect_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec) +{ + RptObjRect *rpt_obj_rect = RPT_OBJ_RECT (object); + + RptObjRectPrivate *priv = RPT_OBJ_RECT_GET_PRIVATE (rpt_obj_rect); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} + +static void +rpt_obj_rect_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec) +{ + RptObjRect *rpt_obj_rect = RPT_OBJ_RECT (object); + + RptObjRectPrivate *priv = RPT_OBJ_RECT_GET_PRIVATE (rpt_obj_rect); + + switch (property_id) + { + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; + } +} diff --git a/src/rptobjectrect.h b/src/rptobjectrect.h new file mode 100644 index 0000000..89279a9 --- /dev/null +++ b/src/rptobjectrect.h @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2007 Andrea Zagli + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifndef __RPT_OBJ_RECT_H__ +#define __RPT_OBJ_RECT_H__ + +#include +#include +#include + +#include "rptobjectline.h" + +G_BEGIN_DECLS + + +#define TYPE_RPT_OBJ_RECT (rpt_obj_rect_get_type ()) +#define RPT_OBJ_RECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RPT_OBJ_RECT, RptObjRect)) +#define RPT_OBJ_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RPT_OBJ_RECT, RptObjRectClass)) +#define IS_RPT_OBJ_RECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RPT_OBJ_RECT)) +#define IS_RPT_OBJ_RECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RPT_OBJ_RECT)) +#define RPT_OBJ_RECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RPT_OBJ_RECT, RptObjRectClass)) + + +typedef struct _RptObjRect RptObjRect; +typedef struct _RptObjRectClass RptObjRectClass; + +struct _RptObjRect + { + RptObjLine parent; + }; + +struct _RptObjRectClass + { + RptObjLineClass parent_class; + }; + +GType rpt_obj_rect_get_type (void) G_GNUC_CONST; + + +RptObject *rpt_obj_rect_new (const gchar *name, RptPoint position); +RptObject *rpt_obj_rect_new_from_xml (xmlNode *xnode); + +void rpt_obj_rect_get_xml (RptObject *rpt_object, xmlNode *xnode); + +G_END_DECLS + +#endif /* __RPT_OBJ_RECT_H__ */ diff --git a/src/rptreport.c b/src/rptreport.c index d654ebc..8644f46 100644 --- a/src/rptreport.c +++ b/src/rptreport.c @@ -30,12 +30,34 @@ #include "rptcommon.h" #include "rptobject.h" #include "rptobjecttext.h" +#include "rptobjectline.h" +#include "rptobjectrect.h" +#include "rptobjectimage.h" + +typedef enum +{ + RPTREPORT_SECTION_PAGE_HEADER, + RPTREPORT_SECTION_PAGE_FOOTER, + RPTREPORT_SECTION_BODY +} RptReportSection; typedef struct { RptSize *size; } Page; +typedef struct +{ + gdouble height; + GList *objects; +} PageHeader; + +typedef struct +{ + gdouble height; + GList *objects; +} PageFooter; + typedef struct { gdouble height; @@ -59,17 +81,21 @@ static void rpt_report_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void rpt_report_xml_parse_body (RptReport *rpt_report, xmlNode *xnode); -static RptObject *rpt_report_get_object_from_name (GList *list, const gchar *name); +static void rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSection section); -static xmlNode *rpt_report_rptprint_new_page (RptReport *rptreport, +static RptObject *rpt_report_get_object_from_name (RptReport *rpt_report, const gchar *name); +static RptObject *rpt_report_get_object_from_name_in_list (GList *list, const gchar *name); + +static xmlNode *rpt_report_rptprint_new_page (RptReport *rpt_report, xmlNode *xroot); -static void rpt_report_rptprint_body (RptReport *rptreport, - xmlNode *xpage, - gdouble *cur_y); -static void rpt_report_rptprint_parse_source (RptReport *rptreport, - RptObject *rptobj, - xmlNode *xnode); +static void rpt_report_rptprint_section (RptReport *rpt_report, + xmlNode *xpage, + gdouble *cur_y, + RptReportSection section); + +static void rpt_report_rptprint_parse_text_source (RptReport *rpt_report, + RptObject *rptobj, + xmlNode *xnode); #define RPT_REPORT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_RPT_REPORT, RptReportPrivate)) @@ -82,6 +108,8 @@ struct _RptReportPrivate GdaDataModel *gda_datamodel; Page *page; + PageHeader *page_header; + PageFooter *page_footer; Body *body; }; @@ -138,8 +166,17 @@ rpt_report_init (RptReport *rpt_report) priv->page->size->width = 0.0; priv->page->size->height = 0.0; + priv->page_header = (PageHeader *)g_malloc0 (sizeof (PageHeader)); + priv->page_header->height = 0.0; + priv->page_header->objects = NULL; + + priv->page_footer = (PageFooter *)g_malloc0 (sizeof (PageFooter)); + priv->page_footer->height = 0.0; + priv->page_footer->objects = NULL; + priv->body = (Body *)g_malloc0 (sizeof (Body)); priv->body->height = 0.0; + priv->body->objects = NULL; } /** @@ -176,17 +213,11 @@ RptReport xnodeset = xpresult->nodesetval; if (xnodeset->nodeNr == 1) { - gchar *prop; - prop = xmlGetProp (xnodeset->nodeTab[0], (const xmlChar *)"width"); - if (prop != NULL) - { - priv->page->size->width = strtod (prop, NULL); - } - prop = xmlGetProp (xnodeset->nodeTab[0], (const xmlChar *)"height"); - if (prop != NULL) - { - priv->page->size->height = strtod (prop, NULL); - } + RptSize size; + + rpt_common_get_size (xnodeset->nodeTab[0], &size); + priv->page->size->width = size.width; + priv->page->size->height = size.height; } else { @@ -271,16 +302,33 @@ RptReport xnodeset = xpresult->nodesetval; if (xnodeset->nodeNr == 1) { + /* search for node "page-header" */ + xpcontext->node = xnodeset->nodeTab[0]; + xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::page-header", xpcontext); + if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval) && xpresult->nodesetval->nodeNr == 1) + { + rpt_report_xml_parse_section (rpt_report, xpresult->nodesetval->nodeTab[0], RPTREPORT_SECTION_PAGE_HEADER); + } + + /* search for node "page-footer" */ + xpcontext->node = xnodeset->nodeTab[0]; + xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::page-footer", xpcontext); + if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval) && xpresult->nodesetval->nodeNr == 1) + { + rpt_report_xml_parse_section (rpt_report, xpresult->nodesetval->nodeTab[0], RPTREPORT_SECTION_PAGE_FOOTER); + } + /* search for node "body" */ xpcontext->node = xnodeset->nodeTab[0]; xpresult = xmlXPathEvalExpression ((const xmlChar *)"child::body", xpcontext); - if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval)) + if (!xmlXPathNodeSetIsEmpty (xpresult->nodesetval) && xpresult->nodesetval->nodeNr == 1) { - xnodeset = xpresult->nodesetval; - if (xnodeset->nodeNr == 1) - { - rpt_report_xml_parse_body (rpt_report, xnodeset->nodeTab[0]); - } + rpt_report_xml_parse_section (rpt_report, xpresult->nodesetval->nodeTab[0], RPTREPORT_SECTION_BODY); + } + else + { + /* TO DO */ + /* return */ } } else @@ -326,15 +374,15 @@ RptReport /** * rpt_report_get_xml: - * @rptreport: an #RptReport object. + * @rpt_report: an #RptReport object. * */ xmlDoc -*rpt_report_get_xml (RptReport *rptreport) +*rpt_report_get_xml (RptReport *rpt_report) { - xmlDoc *xdoc; + xmlDoc *xdoc = NULL; - RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rptreport); + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); /* TO DO */ @@ -343,19 +391,19 @@ xmlDoc /** * rpt_report_get_xml_rptprint: - * @rptreport: an #RptReport object. + * @rpt_report: an #RptReport object. * */ xmlDoc -*rpt_report_get_xml_rptprint (RptReport *rptreport) +*rpt_report_get_xml_rptprint (RptReport *rpt_report) { xmlDoc *xdoc; xmlNode *xroot; xmlNode *xpage; - gint pages; + gint pages = 0; gdouble cur_y = 0.0; - RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rptreport); + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); xdoc = xmlNewDoc ("1.0"); xroot = xmlNewNode (NULL, "reptool_report"); @@ -370,21 +418,51 @@ xmlDoc for (row = 0; row < rows; row++) { - if (row == 0 || cur_y > priv->page->size->height) + if (row == 0 || + (priv->page_footer != NULL && (cur_y > priv->page->size->height - priv->page_footer->height)) || + cur_y > priv->page->size->height) { + if (pages > 0 && priv->page_footer != NULL) + { + cur_y = priv->page->size->height - priv->page_footer->height; + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_PAGE_FOOTER); + } + cur_y = 0.0; pages++; - xpage = rpt_report_rptprint_new_page (rptreport, xroot); + xpage = rpt_report_rptprint_new_page (rpt_report, xroot); + + if (priv->page_header != NULL) + { + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_PAGE_HEADER); + } } - rpt_report_rptprint_body (rptreport, xpage, &cur_y); + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_BODY); + } + + if (pages > 0 && priv->page_footer != NULL) + { + cur_y = priv->page->size->height - priv->page_footer->height; + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_PAGE_FOOTER); } } else { + if (priv->page_header != NULL) + { + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_PAGE_HEADER); + } + pages++; - xpage = rpt_report_rptprint_new_page (rptreport, xroot); - rpt_report_rptprint_body (rptreport, xpage, &cur_y); + xpage = rpt_report_rptprint_new_page (rpt_report, xroot); + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_BODY); + + if (priv->page_footer != NULL) + { + cur_y = priv->page->size->height - priv->page_footer->height; + rpt_report_rptprint_section (rpt_report, xpage, &cur_y, RPTREPORT_SECTION_PAGE_FOOTER); + } } return xdoc; @@ -421,9 +499,11 @@ rpt_report_get_property (GObject *object, guint property_id, GValue *value, GPar } static void -rpt_report_xml_parse_body (RptReport *rpt_report, xmlNode *xnode) +rpt_report_xml_parse_section (RptReport *rpt_report, xmlNode *xnode, RptReportSection section) { RptObject *rptobj; + GList *objects = NULL; + gdouble height; gchar *prop; gchar *objname; xmlNode *cur; @@ -433,7 +513,7 @@ rpt_report_xml_parse_body (RptReport *rpt_report, xmlNode *xnode) prop = (gchar *)xmlGetProp (xnode, "height"); if (prop != NULL) { - priv->body->height = strtod (g_strstrip (g_strdup (prop)), NULL); + height = strtod (g_strstrip (g_strdup (prop)), NULL); } cur = xnode->children; @@ -442,37 +522,79 @@ rpt_report_xml_parse_body (RptReport *rpt_report, xmlNode *xnode) if (strcmp (cur->name, "text") == 0) { rptobj = rpt_obj_text_new_from_xml (cur); - if (rptobj != NULL) - { - g_object_get (rptobj, "name", &objname, NULL); - - if (rpt_report_get_object_from_name (priv->body->objects, objname) == NULL) - { - priv->body->objects = g_list_append (priv->body->objects, rptobj); - } - else - { - /* TO DO */ - g_warning ("An object with name \"%s\" already exists.", objname); - } - } } else if (strcmp (cur->name, "line") == 0) { + rptobj = rpt_obj_line_new_from_xml (cur); } else if (strcmp (cur->name, "rect") == 0) { + rptobj = rpt_obj_rect_new_from_xml (cur); } else if (strcmp (cur->name, "image") == 0) { + rptobj = rpt_obj_image_new_from_xml (cur); + } + + if (rptobj != NULL) + { + g_object_get (rptobj, "name", &objname, NULL); + + if (rpt_report_get_object_from_name (rpt_report, objname) == NULL) + { + objects = g_list_append (objects, rptobj); + } + else + { + /* TO DO */ + g_warning ("An object with name \"%s\" already exists.", objname); + } } cur = cur->next; } + + switch (section) + { + case RPTREPORT_SECTION_PAGE_HEADER: + priv->page_header->height = height; + priv->page_header->objects = objects; + break; + + case RPTREPORT_SECTION_PAGE_FOOTER: + priv->page_footer->height = height; + priv->page_footer->objects = objects; + break; + + case RPTREPORT_SECTION_BODY: + priv->body->height = height; + priv->body->objects = objects; + break; + } +} + +static RptObject +*rpt_report_get_object_from_name (RptReport *rpt_report, const gchar *name) +{ + RptObject *obj = NULL; + + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + + if ((obj = rpt_report_get_object_from_name_in_list (priv->page_header->objects, name)) != NULL) + { + } + else if ((obj = rpt_report_get_object_from_name_in_list (priv->page_footer->objects, name)) != NULL) + { + } + else if ((obj = rpt_report_get_object_from_name_in_list (priv->body->objects, name)) != NULL) + { + } + + return obj; } static RptObject -*rpt_report_get_object_from_name (GList *list, const gchar *name) +*rpt_report_get_object_from_name_in_list (GList *list, const gchar *name) { gchar *objname; RptObject *obj = NULL; @@ -494,11 +616,11 @@ static RptObject } static xmlNode -*rpt_report_rptprint_new_page (RptReport *rptreport, xmlNode *xroot) +*rpt_report_rptprint_new_page (RptReport *rpt_report, xmlNode *xroot) { xmlNode *xnode; - RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rptreport); + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); xnode = xmlNewNode (NULL, "page"); xmlSetProp (xnode, "width", g_strdup_printf ("%f", priv->page->size->width)); @@ -509,7 +631,7 @@ static xmlNode } static void -rpt_report_rptprint_body (RptReport *rptreport, xmlNode *xpage, gdouble *cur_y) +rpt_report_rptprint_section (RptReport *rpt_report, xmlNode *xpage, gdouble *cur_y, RptReportSection section) { GList *objects; xmlAttrPtr attr; @@ -518,9 +640,23 @@ rpt_report_rptprint_body (RptReport *rptreport, xmlNode *xpage, gdouble *cur_y) RptObject *rptobj; - RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rptreport); + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + + switch (section) + { + case RPTREPORT_SECTION_PAGE_HEADER: + objects = g_list_first (priv->page_header->objects); + break; + + case RPTREPORT_SECTION_PAGE_FOOTER: + objects = g_list_first (priv->page_footer->objects); + break; + + case RPTREPORT_SECTION_BODY: + objects = g_list_first (priv->body->objects); + break; + } - objects = g_list_first (priv->body->objects); while (objects != NULL) { xnode = xmlNewNode (NULL, "node"); @@ -542,18 +678,37 @@ rpt_report_rptprint_body (RptReport *rptreport, xmlNode *xpage, gdouble *cur_y) if (IS_RPT_OBJ_TEXT (rptobj)) { - rpt_report_rptprint_parse_source (rptreport, rptobj, xnode); + rpt_report_rptprint_parse_text_source (rpt_report, rptobj, xnode); + } + else if (IS_RPT_OBJ_IMAGE (rptobj)) + { + /* TO DO */ + /* rpt_report_rptprint_parse_image_source (rpt_report, rptobj, xnode); */ } xmlAddChild (xpage, xnode); objects = g_list_next (objects); } - *cur_y += priv->body->height; + + switch (section) + { + case RPTREPORT_SECTION_PAGE_HEADER: + *cur_y += priv->page_header->height; + break; + + case RPTREPORT_SECTION_PAGE_FOOTER: + *cur_y += priv->page_footer->height; + break; + + case RPTREPORT_SECTION_BODY: + *cur_y += priv->body->height; + break; + } } static void -rpt_report_rptprint_parse_source (RptReport *rptreport, RptObject *rptobj, xmlNode *xnode) +rpt_report_rptprint_parse_text_source (RptReport *rpt_report, RptObject *rptobj, xmlNode *xnode) { /* TO DO */ gchar *source; diff --git a/src/rptreport.h b/src/rptreport.h index f909086..17a56cb 100644 --- a/src/rptreport.h +++ b/src/rptreport.h @@ -54,9 +54,9 @@ GType rpt_report_get_type (void) G_GNUC_CONST; RptReport *rpt_report_new_from_xml (xmlDoc *xdoc); RptReport *rpt_report_new_from_file (const gchar *filename); -xmlDoc *rpt_report_get_xml (RptReport *rptreport); +xmlDoc *rpt_report_get_xml (RptReport *rpt_report); -xmlDoc *rpt_report_get_xml_rptprint (RptReport *rptreport); +xmlDoc *rpt_report_get_xml_rptprint (RptReport *rpt_report); G_END_DECLS diff --git a/tests/Makefile.am b/tests/Makefile.am index bd83131..10c0cee 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(REPTOOL_CFLAGS) \ libreptool = $(top_builddir)/src/libreptool.la -noinst_PROGRAMS = rptprint \ - rptreport +noinst_PROGRAMS = test_rptprint \ + test_rptreport LDADD = $(libreptool) diff --git a/tests/gnome-globe.png b/tests/gnome-globe.png new file mode 100644 index 0000000000000000000000000000000000000000..c85ca9f475f2973ab7ae6809f27fd19ded285432 GIT binary patch literal 4780 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 - + + + + + + + + + + + + + + diff --git a/tests/rptprint.c b/tests/test_rptprint.c similarity index 100% rename from tests/rptprint.c rename to tests/test_rptprint.c diff --git a/tests/rptreport.c b/tests/test_rptreport.c similarity index 100% rename from tests/rptreport.c rename to tests/test_rptreport.c -- 2.49.0