From 144ed1498c39d50150d157bbc29c270fc874acc7 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 8 Nov 2011 13:39:19 +0100 Subject: [PATCH] Added and managed property translation (closes #199). --- data/reptool.dtd | 7 ++- data/reptool_report.dtd | 17 +++++- src/rptcommon.c | 112 ++++++++++++++++++++++++++++++++++++++++ src/rptcommon.h | 13 +++++ src/rptprint.c | 52 +++++++++++++++++++ src/rptprint.h | 1 + src/rptreport.c | 90 +++++++++++++++++++++++++++++--- src/rptreport.h | 2 + 8 files changed, 283 insertions(+), 11 deletions(-) diff --git a/data/reptool.dtd b/data/reptool.dtd index 7e916a4..6897fd0 100644 --- a/data/reptool.dtd +++ b/data/reptool.dtd @@ -115,13 +115,18 @@ - + + + diff --git a/data/reptool_report.dtd b/data/reptool_report.dtd index 3256898..4cca308 100644 --- a/data/reptool_report.dtd +++ b/data/reptool_report.dtd @@ -2,10 +2,13 @@ "text*, line*, rect*, ellipse*, image*" > + + - + + + x = 0.0; + translation->y = 0.0; + + return translation; +} + +/** + * rpt_common_rpttranslation_new_with_values: + * @x: + * @y: + * + * Returns: an new allocated #RptTranslation struct. + */ +RptTranslation +*rpt_common_rpttranslation_new_with_values (gdouble x, gdouble y) +{ + RptTranslation *translation; + + translation = rpt_common_rpttranslation_new (); + translation->x = x; + translation->y = y; + + return translation; +} + +/** + * rpt_common_get_translation: + * @xnode: an #xmlNode. + * + * Returns: an #RptTranslation struct that represent the object's rotation + * specified on @xnode. + */ +RptTranslation +*rpt_common_get_translation (xmlNode *xnode) +{ + gchar *prop; + RptTranslation *translation = NULL; + + gdouble x; + gdouble y; + + /* TODO try the first level of children */ + if (xmlStrcmp (xnode->name, "translation") == 0) + { + x = 0.0; + y = 0.0; + + prop = xmlGetProp (xnode, "x"); + if (prop != NULL) + { + translation = rpt_common_rpttranslation_new (); + translation->x = g_strtod (prop, NULL); + xmlFree (prop); + } + prop = xmlGetProp (xnode, "y"); + if (prop != NULL) + { + if (translation == NULL) + { + translation = rpt_common_rpttranslation_new (); + } + translation->y = g_strtod (prop, NULL); + xmlFree (prop); + } + } + + return translation; +} + +/** + * rpt_common_set_translation: + * @xnode: an #xmlNode. + * @rotation: + * + */ +void +rpt_common_set_translation (xmlNode *xnode, const RptTranslation *translation) +{ + xmlNode *_node; + + if (translation != NULL) + { + _node = NULL; + if (xmlStrcmp (xnode->name, "translation") == 0) + { + _node = xnode; + } + else + { + _node = xmlNewNode (NULL, "translation"); + xmlAddChild (xnode, _node); + } + + if (_node != NULL) + { + xmlSetProp (_node, "x", g_strdup_printf ("%f", translation->x)); + xmlSetProp (_node, "y", g_strdup_printf ("%f", translation->y)); + } + } +} + /** * rpt_common_rptrotation_new: * diff --git a/src/rptcommon.h b/src/rptcommon.h index 5239878..5fd8609 100644 --- a/src/rptcommon.h +++ b/src/rptcommon.h @@ -78,6 +78,13 @@ struct _RptSize }; typedef struct _RptSize RptSize; +struct _RptTranslation +{ + gdouble x; + gdouble y; +}; +typedef struct _RptTranslation RptTranslation; + struct _RptRotation { gdouble angle; @@ -216,6 +223,12 @@ RptSize *rpt_common_get_size (xmlNode *xnode); void rpt_common_set_size (xmlNode *xnode, const RptSize *size); +RptTranslation *rpt_common_rpttranslation_new (void); +RptTranslation *rpt_common_rpttranslation_new_with_values (gdouble x, gdouble y); +RptTranslation *rpt_common_get_translation (xmlNode *xnode); +void rpt_common_set_translation (xmlNode *xnode, + const RptTranslation *translation); + RptRotation *rpt_common_rptrotation_new (void); RptRotation *rpt_common_rptrotation_new_with_values (gdouble angle); RptRotation *rpt_common_get_rotation (xmlNode *xnode); diff --git a/src/rptprint.c b/src/rptprint.c index 27dec1a..9eac7d9 100644 --- a/src/rptprint.c +++ b/src/rptprint.c @@ -39,6 +39,7 @@ enum PROP_OUTPUT_TYPE, PROP_OUTPUT_FILENAME, PROP_COPIES, + PROP_TRANSLATION, PROP_PATH_RELATIVES_TO }; @@ -115,6 +116,8 @@ struct _RptPrintPrivate GtkPrintSettings *gtk_print_settings; + RptTranslation *translation; + gchar *path_relatives_to; gdouble width; @@ -176,6 +179,12 @@ rpt_print_class_init (RptPrintClass *klass) 1, G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_TRANSLATION, + g_param_spec_pointer ("translation", + "Translation", + "Translation of the entire report.", + G_PARAM_READWRITE)); + g_object_class_install_property (object_class, PROP_PATH_RELATIVES_TO, g_param_spec_string ("path-relatives-to", "Path are relatives to", @@ -194,6 +203,7 @@ rpt_print_init (RptPrint *rpt_print) priv->output_filename = NULL; priv->gtk_print_settings = NULL; priv->path_relatives_to = g_strdup (""); + priv->translation = NULL; priv->surface = NULL; priv->cr = NULL; @@ -345,6 +355,30 @@ rpt_print_set_copies (RptPrint *rpt_print, guint copies) gtk_print_settings_set_n_copies (priv->gtk_print_settings, copies); } +/** + * rpt_print_set_translation: + * @rpt_print: an #RptPrint object. + * @translation: an #RptTranslation struct. + * + */ +void +rpt_print_set_translation (RptPrint *rpt_print, RptTranslation *translation) +{ + g_return_if_fail (IS_RPT_PRINT (rpt_print)); + + RptPrintPrivate *priv = RPT_PRINT_GET_PRIVATE (rpt_print); + + if (priv->translation != NULL) + { + g_free (priv->translation); + priv->translation = NULL; + } + if (translation != NULL) + { + priv->translation = rpt_common_rpttranslation_new_with_values (translation->x, translation->y); + } +} + /** * rpt_print_print: * @rpt_print: an #RptPrint object. @@ -418,6 +452,11 @@ rpt_print_print (RptPrint *rpt_print, GtkWindow *transient) { rpt_print_set_copies (rpt_print, strtol ((const gchar *)xmlNodeGetContent (cur_property), NULL, 10)); } + else if (g_strcmp0 (cur_property->name, "translation") == 0 + && priv->translation == NULL) + { + rpt_print_set_translation (rpt_print, rpt_common_get_translation (cur_property)); + } cur_property = cur_property->next; } @@ -648,6 +687,10 @@ rpt_print_set_property (GObject *object, guint property_id, const GValue *value, rpt_print_set_copies (rpt_print, g_value_get_uint (value)); break; + case PROP_TRANSLATION: + rpt_print_set_translation (rpt_print, g_value_get_pointer (value)); + break; + case PROP_PATH_RELATIVES_TO: priv->path_relatives_to = g_strstrip (g_strdup (g_value_get_string (value))); break; @@ -689,6 +732,10 @@ rpt_print_get_property (GObject *object, guint property_id, GValue *value, GPara } break; + case PROP_TRANSLATION: + g_value_set_pointer (value, priv->translation); + break; + case PROP_PATH_RELATIVES_TO: g_value_set_string (value, priv->path_relatives_to); break; @@ -1656,6 +1703,11 @@ rpt_print_gtk_draw_page (GtkPrintOperation *operation, gtk_print_context_get_width (priv->gtk_print_context) / rpt_common_value_to_points (priv->unit, priv->width), gtk_print_context_get_height (priv->gtk_print_context) / rpt_common_value_to_points (priv->unit, priv->height)); + if (priv->translation != NULL) + { + cairo_translate (priv->cr, priv->translation->x, priv->translation->y); + } + if (priv->width != 0 && priv->height != 0) { rpt_print_page (rpt_print, priv->pages->nodeTab[page_nr]); diff --git a/src/rptprint.h b/src/rptprint.h index 434f4c7..e76b530 100644 --- a/src/rptprint.h +++ b/src/rptprint.h @@ -62,6 +62,7 @@ void rpt_print_set_output_filename (RptPrint *rpt_print, const gchar *output_fil void rpt_print_set_gtkprintsettings (RptPrint *rpt_print, GtkPrintSettings *settings); void rpt_print_set_copies (RptPrint *rpt_print, guint copies); +void rpt_print_set_translation (RptPrint *rpt_print, RptTranslation *translation); void rpt_print_print (RptPrint *rpt_print, GtkWindow *transient); diff --git a/src/rptreport.c b/src/rptreport.c index 1e19845..abc8920 100644 --- a/src/rptreport.c +++ b/src/rptreport.c @@ -102,7 +102,8 @@ enum PROP_0, PROP_UNIT_LENGTH, PROP_NAME, - PROP_DESCRIPTION + PROP_DESCRIPTION, + PROP_TRANSLATION }; static void rpt_report_class_init (RptReportClass *klass); @@ -148,6 +149,9 @@ static void rpt_report_change_specials (RptReport *rpt_report, xmlDoc *xdoc); typedef struct _RptReportPrivate RptReportPrivate; struct _RptReportPrivate { + gchar *name; + gchar *description; + eRptUnitLength unit; eRptOutputType output_type; @@ -155,6 +159,8 @@ struct _RptReportPrivate guint copies; + RptTranslation *translation; + Database *db; Page *page; @@ -164,9 +170,6 @@ struct _RptReportPrivate PageFooter *page_footer; Body *body; - gchar *name; - gchar *description; - guint cur_page; gint cur_row; GtkTreeIter *cur_iter; @@ -203,6 +206,11 @@ rpt_report_class_init (RptReportClass *klass) "Report's description.", "", G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, PROP_TRANSLATION, + g_param_spec_pointer ("translation", + "Translation", + "Translation of the entire report.", + G_PARAM_READWRITE)); /** * RptReport::field-request: @@ -237,6 +245,11 @@ rpt_report_init (RptReport *rpt_report) { RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + priv->output_type = RPT_OUTPUT_PDF; + priv->output_filename = g_strdup ("rptreport.pdf"); + priv->copies = 1; + priv->translation = NULL; + priv->db = NULL; priv->page = (Page *)g_malloc0 (sizeof (Page)); @@ -254,10 +267,6 @@ rpt_report_init (RptReport *rpt_report) priv->body->objects = NULL; priv->body->new_page_after = FALSE; - priv->output_type = RPT_OUTPUT_PDF; - priv->output_filename = g_strdup ("rptreport.pdf"); - priv->copies = 1; - priv->cur_row = -1; priv->cur_iter = NULL; } @@ -355,6 +364,10 @@ RptReport { rpt_report_set_copies (rpt_report, strtol ((const gchar *)xmlNodeGetContent (cur_property), NULL, 10)); } + else if (g_strcmp0 (cur_property->name, "translation") == 0) + { + rpt_report_set_translation (rpt_report, rpt_common_get_translation (cur_property)); + } cur_property = cur_property->next; } @@ -810,6 +823,30 @@ rpt_report_set_copies (RptReport *rpt_report, guint copies) priv->copies = copies; } +/** + * rpt_report_set_translation: + * @rpt_report: + * @translation: + * + */ +void +rpt_report_set_translation (RptReport *rpt_report, RptTranslation *translation) +{ + g_return_if_fail (IS_RPT_REPORT (rpt_report)); + + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + + if (priv->translation != NULL) + { + g_free (priv->translation); + priv->translation = NULL; + } + if (translation != NULL) + { + priv->translation = rpt_common_rpttranslation_new_with_values (translation->x, translation->y); + } +} + /** * rpt_report_database_get_provider: * @rpt_report: @@ -1510,6 +1547,11 @@ xmlDoc xmlNodeSetContent (xnode, g_strdup_printf ("%d", priv->copies)); xmlAddChild (xnodeprop, xnode); + if (priv->translation != NULL) + { + rpt_common_set_translation (xnodeprop, priv->translation); + } + if (priv->db != NULL) { xmlNode *xnodedb = xmlNewNode (NULL, "database"); @@ -1611,6 +1653,10 @@ xmlDoc rpt_report_rptprint_set_output_type (xdoc, priv->output_type); rpt_report_rptprint_set_output_filename (xdoc, priv->output_filename); rpt_report_rptprint_set_copies (xdoc, priv->copies); + if (priv->translation != NULL) + { + rpt_report_rptprint_set_translation (xdoc, priv->translation); + } if (priv->db != NULL) { @@ -2010,6 +2056,26 @@ rpt_report_rptprint_set_copies (xmlDoc *xdoc, guint copies) xmlAddChild (xnodeprop, xnode); } +void +rpt_report_rptprint_set_translation (xmlDoc *xdoc, RptTranslation *translation) +{ + xmlNode *xnodeprop; + xmlNode *xnode; + xmlNode *xroot; + + xnodeprop = rpt_report_rptprint_get_properties_node (xdoc); + if (xnodeprop == NULL) + { + xroot = xmlDocGetRootElement (xdoc); + xnodeprop = xmlNewNode (NULL, "properties"); + xmlAddChild (xroot, xnodeprop); + } + + /* TODO + * replace eventually already present node */ + rpt_common_set_translation (xnodeprop, translation); +} + xmlNode *rpt_report_rptprint_page_new (xmlDoc *xdoc, RptSize *size, RptMargin *margin) { @@ -2247,6 +2313,10 @@ rpt_report_set_property (GObject *object, guint property_id, const GValue *value priv->unit = g_value_get_int (value); break; + case PROP_TRANSLATION: + priv->translation = g_value_get_pointer (value); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -2273,6 +2343,10 @@ rpt_report_get_property (GObject *object, guint property_id, GValue *value, GPar g_value_set_int (value, priv->unit); break; + case PROP_TRANSLATION: + g_value_set_pointer (value, priv->translation); + break; + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; diff --git a/src/rptreport.h b/src/rptreport.h index d31131f..3abefa8 100644 --- a/src/rptreport.h +++ b/src/rptreport.h @@ -78,6 +78,7 @@ void rpt_report_set_output_type (RptReport *rpt_report, eRptOutputType output_ty void rpt_report_set_output_filename (RptReport *rpt_report, const gchar *output_filename); void rpt_report_set_copies (RptReport *rpt_report, guint copies); +void rpt_report_set_translation (RptReport *rpt_report, RptTranslation *translation); const gchar *rpt_report_database_get_provider (RptReport *rpt_report); const gchar *rpt_report_database_get_connection_string (RptReport *rpt_report); @@ -169,6 +170,7 @@ void rpt_report_rptprint_set_unit_length (xmlDoc *xdoc, eRptUnitLength unit); void rpt_report_rptprint_set_output_type (xmlDoc *xdoc, eRptOutputType output_type); void rpt_report_rptprint_set_output_filename (xmlDoc *xdoc, const gchar *output_filename); void rpt_report_rptprint_set_copies (xmlDoc *xdoc, guint copies); +void rpt_report_rptprint_set_translation (xmlDoc *xdoc, RptTranslation *translation); xmlNode *rpt_report_rptprint_page_new (xmlDoc *xdoc, RptSize *size, RptMargin *margin); void rpt_report_rptprint_page_add_object (xmlNode *xnodepage, RptObject *rpt_object); -- 2.49.0