GNOME.org
 

[dia] [cleanup] less usage of message_*() in render plug-ins

commit 4304cfbe6f9225c3364bf63ce1ccd27734a1657c
Author: Hans Breuer <hans breuer org>
Date:   Sat Sep 15 11:33:19 2012 +0200

    [cleanup] less usage of message_*() in render plug-ins
    
    by using Renderer::ctx more messages are redirected.
    Only plug-ins with own GUI are now still using the
    dialog functions.

 plug-ins/cgm/cgm.c                  |   10 ++++++----
 plug-ins/libart/dialibartrenderer.c |    3 +--
 plug-ins/libart/dialibartrenderer.h |    1 +
 plug-ins/metapost/render_metapost.c |    6 ++----
 plug-ins/metapost/render_metapost.h |    2 ++
 plug-ins/pgf/render_pgf.c           |    8 ++++----
 plug-ins/pgf/render_pgf.h           |    2 ++
 plug-ins/postscript/diapsrenderer.c |    9 ++++-----
 plug-ins/postscript/diapsrenderer.h |    1 +
 plug-ins/postscript/render_eps.c    |    2 ++
 plug-ins/pstricks/render_pstricks.c |    9 +++++----
 plug-ins/pstricks/render_pstricks.h |    2 ++
 plug-ins/wmf/wmf.cpp                |    9 ++++++---
 plug-ins/wpg/wpg.c                  |    8 +++++---
 14 files changed, 43 insertions(+), 29 deletions(-)
---
diff --git a/plug-ins/cgm/cgm.c b/plug-ins/cgm/cgm.c
index fd2009a..fc13c79 100644
--- a/plug-ins/cgm/cgm.c
+++ b/plug-ins/cgm/cgm.c
@@ -34,7 +34,6 @@
 #include <glib/gstdio.h>
 
 #include "intl.h"
-#include "message.h"
 #include "geometry.h"
 #include "filter.h"
 #include "plug-ins.h"
@@ -242,6 +241,7 @@ struct _CgmRenderer
 
     TextAttrCGM    tcurrent, tinfile;
 
+    DiaContext *ctx;
 };
 
 
@@ -1115,14 +1115,15 @@ draw_image(DiaRenderer *self,
     guint8 *pImg, *ptr;
 
     if (rowlen > maxlen) {
-	message_error(_("Image row length larger than maximum cell array.\n"
-			"Image not exported to CGM."));
+	dia_context_add_message(renderer->ctx, 
+				_("Image row length larger than maximum cell array.\n"
+				  "Image not exported to CGM."));
 	return;
     }
 
     ptr = pImg = dia_image_rgb_data(image);
     if (!pImg) {
-      message_warning (_("Not enough memory for image drawing."));
+      dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
       return;
     }
 
@@ -1176,6 +1177,7 @@ export_cgm(DiagramData *data, DiaContext *ctx,
     renderer = g_object_new(CGM_TYPE_RENDERER, NULL);
 
     renderer->file = file;
+    renderer->ctx = ctx;
 
     /* write BEGMF */
     len = strlen(dia_version_string);
diff --git a/plug-ins/libart/dialibartrenderer.c b/plug-ins/libart/dialibartrenderer.c
index 55ecb89..6b86464 100644
--- a/plug-ins/libart/dialibartrenderer.c
+++ b/plug-ins/libart/dialibartrenderer.c
@@ -23,7 +23,6 @@
 
 #include "dialibartrenderer.h"
 
-#include "message.h"
 #include "color.h"
 #include "font.h"
 #include "intl.h"
@@ -1323,7 +1322,7 @@ draw_image(DiaRenderer *self,
       guint8 *img_data = dia_image_rgb_data(image);
 
       if (!img_data) {
-        message_warning (_("Not enough memory for image drawing."));
+        dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
         return;
       }
       art_rgb_affine(renderer->rgb_buffer,
diff --git a/plug-ins/libart/dialibartrenderer.h b/plug-ins/libart/dialibartrenderer.h
index 7363433..d204873 100644
--- a/plug-ins/libart/dialibartrenderer.h
+++ b/plug-ins/libart/dialibartrenderer.h
@@ -50,6 +50,7 @@ struct _DiaLibartRenderer
   double dot_length;
   Color *highlight_color;
 #endif
+  DiaContext *ctx;
 };
 
 struct _DiaLibartRendererClass
diff --git a/plug-ins/metapost/render_metapost.c b/plug-ins/metapost/render_metapost.c
index fd61a3c..04fae41 100644
--- a/plug-ins/metapost/render_metapost.c
+++ b/plug-ins/metapost/render_metapost.c
@@ -22,8 +22,6 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-
-
 /*
  * This was basically borrowed from the pstricks plug-in.
  *
@@ -47,7 +45,6 @@
 
 #include "intl.h"
 #include "render_metapost.h"
-#include "message.h"
 #include "diagramdata.h"
 #include "filter.h"
 #include "dia_image.h"
@@ -1108,7 +1105,7 @@ draw_image(DiaRenderer *self,
 
     rgb_data = dia_image_rgb_data(image);
     if (!rgb_data) {
-        message_warning (_("Not enough memory for image drawing."));
+        dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
         return;
     }
     mask_data = dia_image_mask_data(image);
@@ -1187,6 +1184,7 @@ export_metapost(DiagramData *data, DiaContext *ctx,
     renderer = g_object_new(METAPOST_TYPE_RENDERER, NULL);
 
     renderer->file = file;
+    renderer->ctx = ctx;
 
     renderer->dash_length = 1.0;
     renderer->dot_length = 0.2;
diff --git a/plug-ins/metapost/render_metapost.h b/plug-ins/metapost/render_metapost.h
index 1790b71..7758d8f 100644
--- a/plug-ins/metapost/render_metapost.h
+++ b/plug-ins/metapost/render_metapost.h
@@ -63,6 +63,8 @@ struct _MetapostRenderer
   char *mp_weight;
   char *mp_slant;
   real mp_font_height;
+
+  DiaContext *ctx;
 };
 
 struct _MetapostRendererClass
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index 545b0a5..aaa17c7 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -66,7 +66,6 @@ TODO:
 
 #include "intl.h"
 #include "render_pgf.h"
-#include "message.h"
 #include "diagramdata.h"
 #include "dia_image.h"
 #include "filter.h"
@@ -1104,13 +1103,13 @@ draw_bezier_with_arrows(DiaRenderer *self, BezPoint *points, int num_points,
  * shouldn't produce broken output either ...
  */
 static gchar *
-tex_escape_string(const gchar *src)
+tex_escape_string(const gchar *src, DiaContext *ctx)
 {
     GString *dest = g_string_sized_new(g_utf8_strlen(src, -1));
     gchar *p;
 
     if (!g_utf8_validate(src, -1, NULL)) {
-	message_error(_("Not valid UTF-8"));
+	dia_context_add_message(ctx, _("Not valid UTF-8"));
 	return g_strdup(src);
     }
 
@@ -1148,7 +1147,7 @@ draw_string(DiaRenderer *self,
 	    Color *color)
 {
     PgfRenderer *renderer = PGF_RENDERER(self);
-    gchar *escaped = tex_escape_string(text);
+    gchar *escaped = tex_escape_string(text, renderer->ctx);
     gchar px_buf[DTOSTR_BUF_SIZE];
     gchar py_buf[DTOSTR_BUF_SIZE];
 
@@ -1211,6 +1210,7 @@ export_pgf(DiagramData *data, DiaContext *ctx,
 
     renderer->pagenum = 1;
     renderer->file = file;
+    renderer->ctx = ctx;
 
     renderer->dash_length = 1.0;
     renderer->dot_length = 0.2;
diff --git a/plug-ins/pgf/render_pgf.h b/plug-ins/pgf/render_pgf.h
index 8f688a9..d5b9ce5 100644
--- a/plug-ins/pgf/render_pgf.h
+++ b/plug-ins/pgf/render_pgf.h
@@ -58,6 +58,8 @@ struct _PgfRenderer
     LineStyle saved_line_style;
     real dash_length;
     real dot_length;
+
+    DiaContext *ctx;
 };
 
 extern DiaExportFilter pgf_export_filter;
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index 9fe7876..cd098d0 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -28,7 +28,6 @@
 #include <time.h>
 
 #include "diapsrenderer.h"
-#include "message.h"
 #include "dia_image.h"
 #include "font.h"
 #include "textline.h"
@@ -608,7 +607,7 @@ fill_bezier(DiaRenderer *self,
 }
 
 static char*
-ps_convert_string(const char *text)
+ps_convert_string(const char *text, DiaContext *ctx)
 {
   char *buffer;
   gchar *localestr;
@@ -619,7 +618,7 @@ ps_convert_string(const char *text)
   localestr = g_convert(text, -1, "LATIN1", "UTF-8", NULL, NULL, &error);
 
   if (localestr == NULL) {
-    message_error("Can't convert string %s: %s\n", text, error->message);
+    dia_context_add_message(ctx, "Can't convert string %s: %s\n", text, error->message);
     localestr = g_strdup(text);
   }
 
@@ -683,7 +682,7 @@ draw_string(DiaRenderer *self,
 
   lazy_setcolor(renderer,color);
 
-  buffer = ps_convert_string(text);
+  buffer = ps_convert_string(text, renderer->ctx);
 
   fprintf(renderer->file, "(%s) ", buffer);
   g_free(buffer);
@@ -716,7 +715,7 @@ draw_image(DiaRenderer *self,
 
   rgb_data = dia_image_rgb_data(image);
   if (!rgb_data) {
-    message_warning (_("Not enough memory for image drawing."));
+    dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
     return;
   }
   mask_data = dia_image_mask_data(image);
diff --git a/plug-ins/postscript/diapsrenderer.h b/plug-ins/postscript/diapsrenderer.h
index 546796a..f7edb62 100644
--- a/plug-ins/postscript/diapsrenderer.h
+++ b/plug-ins/postscript/diapsrenderer.h
@@ -49,6 +49,7 @@ struct _DiaPsRenderer
   double scale;
   Rectangle extent;
 
+  DiaContext *ctx;
 };
 
 struct _DiaPsRendererClass
diff --git a/plug-ins/postscript/render_eps.c b/plug-ins/postscript/render_eps.c
index a4dd100..5cd8a58 100644
--- a/plug-ins/postscript/render_eps.c
+++ b/plug-ins/postscript/render_eps.c
@@ -87,6 +87,7 @@ export_ft2_eps(DiagramData *data, DiaContext *ctx,
   gboolean ret;
   DiaPsRenderer *renderer = g_object_new (DIA_TYPE_PS_FT2_RENDERER, NULL);
 
+  renderer->ctx = ctx;
   ret = export_render_eps(renderer, data, ctx, filename, diafilename, user_data);
   g_object_unref (renderer);
 
@@ -102,6 +103,7 @@ export_eps(DiagramData *data, DiaContext *ctx,
   gboolean ret;
   DiaPsRenderer *renderer = g_object_new (DIA_TYPE_PS_RENDERER, NULL);
 
+  renderer->ctx = ctx;
   ret = export_render_eps(renderer, data, ctx, filename, diafilename, user_data);
   g_object_unref (renderer);
 
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index 01ae990..27148d9 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -724,13 +724,13 @@ fill_bezier(DiaRenderer *self,
  * shouldn't produce broken output either ...
  */
 static gchar *
-tex_escape_string(const gchar *src)
+tex_escape_string(const gchar *src, DiaContext *ctx)
 {
     GString *dest = g_string_sized_new(g_utf8_strlen(src, -1));
     gchar *p;
 
     if (!g_utf8_validate(src, -1, NULL)) {
-	message_error(_("Not valid UTF-8"));
+	dia_context_add_message(ctx, _("Not valid UTF-8"));
 	return g_strdup(src);
     }
 
@@ -774,7 +774,7 @@ draw_string(DiaRenderer *self,
 
     /* only escape the string if it is not starting with \tex */
     if (strncmp (text, "\\tex", 4) != 0)
-      escaped = tex_escape_string(text);
+      escaped = tex_escape_string(text, renderer->ctx);
 
     set_line_color(renderer,color);
 
@@ -823,7 +823,7 @@ draw_image(DiaRenderer *self,
 
     rgb_data = dia_image_rgb_data(image);
     if (!rgb_data) {
-        message_warning (_("Not enough memory for image drawing."));
+        dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
         return;
     }
     ratio = height/width;
@@ -926,6 +926,7 @@ export_pstricks(DiagramData *data, DiaContext *ctx,
 
     renderer->pagenum = 1;
     renderer->file = file;
+    renderer->ctx = ctx;
 
     renderer->dash_length = 1.0;
     renderer->dot_length = 0.2;
diff --git a/plug-ins/pstricks/render_pstricks.h b/plug-ins/pstricks/render_pstricks.h
index 5eef4f6..3cdb1a5 100644
--- a/plug-ins/pstricks/render_pstricks.h
+++ b/plug-ins/pstricks/render_pstricks.h
@@ -58,6 +58,8 @@ struct _PstricksRenderer
     LineStyle saved_line_style;
     real dash_length;
     real dot_length;
+
+    DiaContext *ctx;
 };
 
 extern DiaExportFilter pstricks_export_filter;
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index f629ce3..1fa5589 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -29,7 +29,6 @@
 #include <glib/gstdio.h>
 
 #include "intl.h"
-#include "message.h"
 #include "geometry.h"
 #include "diarenderer.h"
 #include "filter.h"
@@ -132,6 +131,8 @@ struct _WmfRenderer
 
     gboolean use_pango;
     PangoContext* pango_context;
+
+    DiaContext* ctx;
 };
 
 struct _WmfRendererClass
@@ -312,7 +313,8 @@ end_render(DiaRenderer *self)
 
 	/* write file */
 	if (fwrite(pData,1,nSize,f) != nSize)
-	  message_error (_("Couldn't write file %s\n%s"), renderer->sFileName, strerror(errno)); 
+	  dia_context_add_message_with_errno(renderer->ctx, errno, _("Couldn't write file %s\n%s"),
+					     dia_context_get_filename (renderer->ctx)); 
 	fclose(f);
     
 	g_free(pData);
@@ -561,7 +563,7 @@ set_font(DiaRenderer *self, DiaFont *font, real height)
 	else
 	{
 	    gchar *desc = pango_font_description_to_string (dia_font_get_description (font));
-	    message_warning (_("Cannot render unknown font:\n%s"), desc);
+	    dia_context_add_message(renderer->ctx, _("Cannot render unknown font:\n%s"), desc);
 	    g_free (desc);
 	}
 #else
@@ -1378,6 +1380,7 @@ export_data(DiagramData *data, DiaContext *ctx,
 
     renderer->hFileDC = file;
     renderer->sFileName = g_strdup(filename);
+    renderer->ctx = ctx;
     if (user_data == (void*)1) {
 	renderer->target_emf = TRUE;
 	renderer->hPrintDC = 0;
diff --git a/plug-ins/wpg/wpg.c b/plug-ins/wpg/wpg.c
index bbdaea3..8d8c54d 100644
--- a/plug-ins/wpg/wpg.c
+++ b/plug-ins/wpg/wpg.c
@@ -43,7 +43,6 @@
 #include <glib/gstdio.h>
 
 #include "intl.h"
-#include "message.h"
 #include "geometry.h"
 #include "dia_image.h"
 #include "diarenderer.h"
@@ -101,6 +100,8 @@ struct _WpgRenderer
   WPGTextStyle TextStyle;
 
   WPGColorRGB* pPal;
+
+  DiaContext* ctx;
 };
 
 struct _WpgRendererClass
@@ -888,7 +889,7 @@ draw_image(DiaRenderer *self,
 
   pDiaImg = dia_image_rgb_data(image);
   if (!pDiaImg) {
-    message_warning (_("Not enough memory for image drawing."));
+    dia_context_add_message(renderer->ctx, _("Not enough memory for image drawing."));
     return;
   }
   stride = dia_image_rowstride(image);
@@ -935,7 +936,7 @@ draw_image(DiaRenderer *self,
 	      bmp.Width * bmp.Height, p - pOut));
 
   if ((p - pOut) > 32767) {
-    message_warning("WmfRenderer : Bitmap size exceeds blocksize. Ignored.");
+    dia_context_add_message(renderer->ctx, "Bitmap size exceeds blocksize. Ignored.");
   }
   else {
     WriteRecHead(renderer, WPG_BITMAP2, sizeof(WPGBitmap2) + (p - pOut));
@@ -1082,6 +1083,7 @@ export_data(DiagramData *data, DiaContext *ctx,
   renderer = g_object_new (WPG_TYPE_RENDERER, NULL);
 
   renderer->file = file;
+  renderer->ctx = ctx;
 
   extent = &data->extents;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]