From fa35be719e6a08c154c309f04335881e44a559cb Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Wed, 3 Aug 2011 19:06:11 +0200 Subject: [PATCH] Many code adjustments. Added command line parameters to test_rptprint. --- AUTHORS | 2 +- configure.ac | 16 ++++++------- src/rptobject.c | 2 +- src/rptobjectellipse.c | 2 +- src/rptobjectimage.c | 2 +- src/rptobjectline.c | 2 +- src/rptobjectrect.c | 2 +- src/rptprint.c | 54 ++++++++++++++++++++++++++++++++++-------- src/rptreport_priv.h | 2 +- tests/test_rptprint.c | 33 ++++++++++++++++++++++---- 10 files changed, 88 insertions(+), 29 deletions(-) diff --git a/AUTHORS b/AUTHORS index 948556f..ad1de0f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1 @@ -Andrea Zagli +Andrea Zagli diff --git a/configure.ac b/configure.ac index 38ea2f4..919e9e9 100644 --- a/configure.ac +++ b/configure.ac @@ -63,13 +63,13 @@ AC_FUNC_STRTOD AC_CHECK_FUNCS([memset strcasecmp strstr strtol]) AC_CONFIG_FILES([ - libreptool.pc - Makefile - src/Makefile - tests/Makefile - docs/Makefile - docs/reference/Makefile - docs/reference/version.xml - data/Makefile + libreptool.pc + Makefile + src/Makefile + tests/Makefile + docs/Makefile + docs/reference/Makefile + docs/reference/version.xml + data/Makefile ]) AC_OUTPUT diff --git a/src/rptobject.c b/src/rptobject.c index 70f9a2f..4ccf8fb 100644 --- a/src/rptobject.c +++ b/src/rptobject.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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/rptobjectellipse.c b/src/rptobjectellipse.c index 280a628..08b0464 100644 --- a/src/rptobjectellipse.c +++ b/src/rptobjectellipse.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2010 Andrea Zagli + * Copyright (C) 2007-2010 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 index 7170b17..c9f0b88 100644 --- a/src/rptobjectimage.c +++ b/src/rptobjectimage.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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/rptobjectline.c b/src/rptobjectline.c index 27e4312..f734592 100644 --- a/src/rptobjectline.c +++ b/src/rptobjectline.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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/rptobjectrect.c b/src/rptobjectrect.c index 9998017..81db44d 100644 --- a/src/rptobjectrect.c +++ b/src/rptobjectrect.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 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/rptprint.c b/src/rptprint.c index c1b21cf..4c74c4c 100644 --- a/src/rptprint.c +++ b/src/rptprint.c @@ -81,8 +81,12 @@ static void rpt_print_border (RptPrint *rpt_print, const RptRotation *rotation); -static gchar *rpt_print_new_numbered_filename (const gchar *filename, int number); -static void rpt_print_rotate (RptPrint *rpt_print, const RptPoint *position, const RptSize *size, gdouble angle); +static gchar *rpt_print_new_numbered_filename (const gchar *filename, + int number); +static void rpt_print_rotate (RptPrint *rpt_print, + const RptPoint *position, + const RptSize *size, + gdouble angle); static void rpt_print_gtk_begin_print (GtkPrintOperation *operation, @@ -201,7 +205,9 @@ rpt_print_init (RptPrint *rpt_print) RptPrint *rpt_print_new_from_xml (xmlDoc *xdoc) { - RptPrint *rpt_print = NULL; + RptPrint *rpt_print; + + rpt_print = NULL; xmlNode *cur = xmlDocGetRootElement (xdoc); if (cur != NULL) @@ -222,6 +228,10 @@ RptPrint g_warning ("Not a valid RepTool print report format."); } } + else + { + g_warning ("No root element on xmlDoc."); + } return rpt_print; } @@ -237,7 +247,9 @@ RptPrint RptPrint *rpt_print_new_from_file (const gchar *filename) { - RptPrint *rpt_print = NULL; + RptPrint *rpt_print; + + rpt_print = NULL; xmlDoc *xdoc = xmlParseFile (filename); if (xdoc != NULL) @@ -280,7 +292,7 @@ rpt_print_set_output_filename (RptPrint *rpt_print, const gchar *output_filename priv->output_filename = g_strdup (output_filename); if (g_strcmp0 (priv->output_filename, "") == 0) { - g_warning ("It's not possible to set an empty output filename."); + g_warning ("It's not possible to set an empty output filename; default to rptreport.pdf."); priv->output_filename = g_strdup ("rptreport.pdf"); } } @@ -654,31 +666,37 @@ rpt_print_get_xml_page_attributes (RptPrint *rpt_print, xmlNode *xml_page) if (prop != NULL) { priv->width = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xml_page, (const xmlChar *)"height"); if (prop != NULL) { priv->height = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xml_page, (const xmlChar *)"margin-top"); if (prop != NULL) { priv->margin_top = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xml_page, (const xmlChar *)"margin-right"); if (prop != NULL) { priv->margin_right = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xml_page, (const xmlChar *)"margin-bottom"); if (prop != NULL) { priv->margin_bottom = g_strtod (prop, NULL); + xmlFree (prop); } prop = xmlGetProp (xml_page, (const xmlChar *)"margin-left"); if (prop != NULL) { priv->margin_left = g_strtod (prop, NULL); + xmlFree (prop); } } @@ -780,22 +798,26 @@ rpt_print_text_xml (RptPrint *rpt_print, xmlNode *xnode) prop = xmlGetProp (xnode, (const xmlChar *)"padding-top"); if (prop != NULL) { - padding_top = rpt_common_value_to_points (priv->unit, atof (prop)); + padding_top = rpt_common_value_to_points (priv->unit, g_strtod (prop, NULL)); + xmlFree (prop); } prop = xmlGetProp (xnode, (const xmlChar *)"padding-right"); if (prop != NULL) { - padding_right = rpt_common_value_to_points (priv->unit, atof (prop)); + padding_right = rpt_common_value_to_points (priv->unit, g_strtod (prop, NULL)); + xmlFree (prop); } prop = xmlGetProp (xnode, (const xmlChar *)"padding-bottom"); if (prop != NULL) { - padding_bottom = rpt_common_value_to_points (priv->unit, atof (prop)); + padding_bottom = rpt_common_value_to_points (priv->unit, g_strtod (prop, NULL)); + xmlFree (prop); } prop = xmlGetProp (xnode, (const xmlChar *)"padding-left"); if (prop != NULL) { - padding_left = rpt_common_value_to_points (priv->unit, atof (prop)); + padding_left = rpt_common_value_to_points (priv->unit, g_strtod (prop, NULL)); + xmlFree (prop); } /* creating pango layout */ @@ -965,6 +987,13 @@ rpt_print_text_xml (RptPrint *rpt_print, xmlNode *xnode) { cairo_reset_clip (priv->cr); } + + g_free (position); + g_free (size); + g_free (rotation); + g_free (align); + g_free (border); + g_free (font); } static void @@ -1032,6 +1061,7 @@ rpt_print_rect_xml (RptPrint *rpt_print, xmlNode *xnode) if (prop != NULL) { fill_color = rpt_common_parse_color (prop); + xmlFree (prop); } if (rotation != NULL) @@ -1288,7 +1318,11 @@ rpt_print_line (RptPrint *rpt_print, } static void -rpt_print_border (RptPrint *rpt_print, const RptPoint *position, const RptSize *size, const RptBorder *border, const RptRotation *rotation) +rpt_print_border (RptPrint *rpt_print, + const RptPoint *position, + const RptSize *size, + const RptBorder *border, + const RptRotation *rotation) { RptPrintPrivate *priv = RPT_PRINT_GET_PRIVATE (rpt_print); diff --git a/src/rptreport_priv.h b/src/rptreport_priv.h index bc2d36f..22e0c55 100644 --- a/src/rptreport_priv.h +++ b/src/rptreport_priv.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 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/tests/test_rptprint.c b/tests/test_rptprint.c index 549ed01..d0c1fbe 100644 --- a/tests/test_rptprint.c +++ b/tests/test_rptprint.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Andrea Zagli + * Copyright (C) 2006-2011 Andrea Zagli * * 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 @@ -18,19 +18,44 @@ #include +static gchar *rptr_file_name = NULL; +static gchar *output_type = NULL; +static gchar *output_file_name = NULL; + +static GOptionEntry entries[] = +{ + { "rptr-file-name", 'r', 0, G_OPTION_ARG_STRING, &rptr_file_name, "RptPrint definition file name", "RPTR_FILE_NAME" }, + { "output-type", 'o', 0, G_OPTION_ARG_STRING, &output_type, "Output type (png | pdf | ps | svg | gtk | gtk-default)", "OUTPUT-TYPE" }, + { "output-file-name", 'f', 0, G_OPTION_ARG_FILENAME, &output_file_name, "Output file name", "FILE-NAME" }, + { NULL } +}; + int main (int argc, char **argv) { + GError *error; + GOptionContext *context; + RptPrint *rptp; g_type_init (); - rptp = rpt_print_new_from_file (argv[1]); + context = g_option_context_new ("- test rptprint"); + g_option_context_add_main_entries (context, entries, NULL); + + error = NULL; + if (!g_option_context_parse (context, &argc, &argv, &error)) + { + g_error ("option parsing failed: %s\n", error->message); + return 0; + } + + rptp = rpt_print_new_from_file (rptr_file_name); if (rptp != NULL) { - rpt_print_set_output_type (rptp, RPT_OUTPUT_PNG); - rpt_print_set_output_filename (rptp, "test.png"); + rpt_print_set_output_type (rptp, rpt_common_stroutputtype_to_enum (output_type)); + rpt_print_set_output_filename (rptp, output_file_name == NULL ? "test.out" : output_file_name); rpt_print_print (rptp, NULL); } -- 2.49.0