[dia/zbrown/test-build: 2/7] enums: move LineJoin into the Dia namespace
- From: Zander Brown <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/zbrown/test-build: 2/7] enums: move LineJoin into the Dia namespace
- Date: Mon, 27 Sep 2021 08:21:40 +0000 (UTC)
commit 3ef06bae28368453013b4f78fd69f02bfa1c1dab
Author: Zander Brown <zbrown gnome org>
Date: Sun Sep 26 16:00:46 2021 +0100
enums: move LineJoin into the Dia namespace
GTypes for everyone
app/handle_ops.c | 2 +-
lib/arrows.c | 42 +++++++++++++++----------------
lib/bezier-common.c | 2 +-
lib/boundingbox.c | 2 +-
lib/dia-enums.h | 12 ++++-----
lib/dia-line-cell-renderer.c | 4 +--
lib/dia_svg.c | 22 +++++++++-------
lib/dia_svg.h | 2 +-
lib/diaimportrenderer.c | 9 ++++---
lib/diaimportrenderer.h | 2 +-
lib/diapathrenderer.c | 4 ++-
lib/diarenderer.c | 13 +++++-----
lib/diarenderer.h | 4 +--
lib/diasvgrenderer.c | 16 ++++++------
lib/diatransformrenderer.c | 8 +++---
lib/properties.c | 6 ++---
lib/properties.h | 6 ++---
lib/renderer/diacairo-renderer.c | 15 +++++------
lib/standard-path.c | 2 +-
objects/AADL/aadlport.c | 18 ++++++-------
objects/AADL/aadlprocess.c | 5 ++--
objects/Database/reference.c | 2 +-
objects/Database/table.c | 2 +-
objects/ER/entity.c | 4 +--
objects/ER/participation.c | 2 +-
objects/ER/relationship.c | 2 +-
objects/GRAFCET/step.c | 2 +-
objects/GRAFCET/vector.c | 2 +-
objects/Istar/actor.c | 2 +-
objects/Istar/goal.c | 2 +-
objects/Istar/other.c | 2 +-
objects/Jackson/domain.c | 2 +-
objects/KAOS/goal.c | 2 +-
objects/KAOS/other.c | 2 +-
objects/Misc/analog_clock.c | 2 +-
objects/Misc/grid_object.c | 2 +-
objects/Misc/measure.c | 2 +-
objects/Misc/n_gon.c | 2 +-
objects/SADT/box.c | 2 +-
objects/UML/association.c | 2 +-
objects/UML/dependency.c | 2 +-
objects/UML/generalization.c | 2 +-
objects/UML/realizes.c | 2 +-
objects/chronogram/chronoline.c | 4 +--
objects/chronogram/chronoref.c | 2 +-
objects/custom/custom_object.c | 23 +++++++++--------
objects/custom/shape_info.c | 2 +-
objects/flowchart/box.c | 2 +-
objects/flowchart/diamond.c | 2 +-
objects/flowchart/ellipse.c | 2 +-
objects/flowchart/parallelogram.c | 2 +-
objects/network/basestation.c | 2 +-
objects/network/radiocell.c | 2 +-
objects/network/wanlink.c | 2 +-
objects/standard/arc.c | 2 +-
objects/standard/bezier.c | 30 +++++++++++++---------
objects/standard/beziergon.c | 25 ++++++++++--------
objects/standard/box.c | 25 ++++++++++--------
objects/standard/image.c | 2 +-
objects/standard/outline.c | 2 +-
objects/standard/polygon.c | 25 ++++++++++--------
objects/standard/polyline.c | 26 +++++++++++--------
objects/standard/zigzagline.c | 26 +++++++++++--------
plug-ins/cgm/cgm.c | 39 ++++++++++++++--------------
plug-ins/drs/dia-render-script-import.c | 26 ++++++++++++-------
plug-ins/drs/dia-render-script-renderer.c | 12 ++++-----
plug-ins/dxf/dxf-export.c | 3 ++-
plug-ins/hpgl/hpgl.c | 25 +++++++++---------
plug-ins/metapost/render_metapost.c | 38 +++++++++++++++-------------
plug-ins/metapost/render_metapost.h | 2 +-
plug-ins/pdf/pdf-import.cpp | 21 +++++++++-------
plug-ins/pgf/render_pgf.c | 24 +++++++++---------
plug-ins/postscript/diapsrenderer.c | 33 ++++++++++++------------
plug-ins/pstricks/render_pstricks.c | 37 ++++++++++++++-------------
plug-ins/python/pydia-render.c | 12 ++++-----
plug-ins/svg/svg-import.c | 2 +-
plug-ins/vdx/vdx-export.c | 13 +++++-----
plug-ins/wmf/wmf.cpp | 27 +++++++++++---------
plug-ins/wpg/wpg.c | 25 +++++++++---------
plug-ins/xfig/xfig-export.c | 4 +--
80 files changed, 425 insertions(+), 368 deletions(-)
---
diff --git a/app/handle_ops.c b/app/handle_ops.c
index a5656f162..0b1a72792 100644
--- a/app/handle_ops.c
+++ b/app/handle_ops.c
@@ -68,7 +68,7 @@ handle_draw (Handle *handle, DDisplay *ddisp)
dia_renderer_set_linewidth (renderer, 0.0);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
diff --git a/lib/arrows.c b/lib/arrows.c
index 1c6c6491f..9581adc40 100644
--- a/lib/arrows.c
+++ b/lib/arrows.c
@@ -515,7 +515,7 @@ draw_none_or_many (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
draw_empty_ellipse (renderer,
@@ -619,7 +619,7 @@ draw_one_or_many (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0], &poly[2], fg_color);
@@ -703,7 +703,7 @@ draw_crow_foot (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_line (renderer, &poly[0], &poly[1], fg_color);
dia_renderer_draw_line (renderer, &poly[0], &poly[2], fg_color);
@@ -737,7 +737,7 @@ draw_lines (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_polyline (renderer, poly, 3, fg_color);
@@ -783,7 +783,7 @@ draw_fill_ellipse (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
if (!bg_color) {
@@ -864,7 +864,7 @@ draw_empty_ellipse (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
point_copy (&vl,from);
@@ -974,7 +974,7 @@ draw_fill_box (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
if (fg_color == bg_color) {
@@ -1039,7 +1039,7 @@ draw_fill_dot (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
if (fg_color == bg_color) {
@@ -1133,7 +1133,7 @@ draw_integral (DiaRenderer *renderer,
Point bs,be, bs2,be2;
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
point_copy (&vl,from); point_sub (&vl,to);
@@ -1236,7 +1236,7 @@ draw_slashed (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0], &poly[1], fg_color);
@@ -1325,7 +1325,7 @@ draw_halfhead (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_polyline (renderer, poly, 3, fg_color);
@@ -1359,7 +1359,7 @@ draw_triangle (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer, poly, 3, bg_color, fg_color);
}
@@ -1448,7 +1448,7 @@ draw_diamond (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_polygon (renderer, poly, 4, fill, stroke);
@@ -1482,7 +1482,7 @@ draw_half_diamond (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_polyline (renderer, poly+1, 3, fg_color);
@@ -1573,7 +1573,7 @@ draw_slashed_cross (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0],&poly[1], fg_color);
@@ -1650,7 +1650,7 @@ draw_backslash (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0], &poly[1], fg_color);
@@ -1684,7 +1684,7 @@ draw_cross (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_line (renderer, &poly[0],&poly[2], fg_color);
@@ -1854,7 +1854,7 @@ draw_concave_triangle (DiaRenderer *renderer,
calculate_concave (poly, to, from, length, width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
if (fg_color == bg_color) {
@@ -1895,7 +1895,7 @@ draw_rounded (DiaRenderer *renderer,
dia_renderer_set_linewidth (renderer, linewidth);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
delta = *from;
@@ -1955,7 +1955,7 @@ draw_open_rounded (DiaRenderer *renderer,
real angle_start;
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
delta = *from;
@@ -2012,7 +2012,7 @@ draw_filled_dot_n_triangle (DiaRenderer *renderer,
Point poly[3];
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linewidth (renderer, linewidth);
diff --git a/lib/bezier-common.c b/lib/bezier-common.c
index 6ee06d620..c1f43a5c9 100644
--- a/lib/bezier-common.c
+++ b/lib/bezier-common.c
@@ -177,7 +177,7 @@ bezier_draw_control_lines (int num_points,
/* setup renderer ... */
dia_renderer_set_linewidth (renderer, 0);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DOTTED, 1);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
startpoint = points[0].p1;
diff --git a/lib/boundingbox.c b/lib/boundingbox.c
index 8853fff69..86870804d 100644
--- a/lib/boundingbox.c
+++ b/lib/boundingbox.c
@@ -597,7 +597,7 @@ polybezier_bbox (const BezPoint *pts,
rectangle_union (rect, &rt);
/* The following code enlarges a little the bounding box (if necessary) to
- account with the "pointy corners" X (and PS) add when LINEJOIN_MITER mode is
+ account with the "pointy corners" X (and PS) add when DIA_LINE_JOIN_MITER mode is
in force. */
if (!end) { /* only the last segment might not produce overshoot. */
diff --git a/lib/dia-enums.h b/lib/dia-enums.h
index e60df4188..5475e97fa 100644
--- a/lib/dia-enums.h
+++ b/lib/dia-enums.h
@@ -31,12 +31,12 @@ typedef enum {
LINECAPS_PROJECTING
} LineCaps;
-typedef enum {
- LINEJOIN_DEFAULT = -1, /* default usually miter, this is unset */
- LINEJOIN_MITER = 0,
- LINEJOIN_ROUND,
- LINEJOIN_BEVEL
-} LineJoin;
+typedef enum /*< enum >*/ {
+ DIA_LINE_JOIN_DEFAULT = -1, /* default usually miter, this is unset */
+ DIA_LINE_JOIN_MITER = 0,
+ DIA_LINE_JOIN_ROUND,
+ DIA_LINE_JOIN_BEVEL
+} DiaLineJoin;
typedef enum /*< enum >*/ {
DIA_LINE_STYLE_DEFAULT = -1, /* default usually solid, this is unset */
diff --git a/lib/dia-line-cell-renderer.c b/lib/dia-line-cell-renderer.c
index db6c49c33..54cc62a30 100644
--- a/lib/dia-line-cell-renderer.c
+++ b/lib/dia-line-cell-renderer.c
@@ -64,7 +64,7 @@ dia_line_cell_renderer_get_property (GObject *object,
break;
case PROP_LINE:
- g_value_set_int (value, priv->line);
+ g_value_set_enum (value, priv->line);
break;
default:
@@ -90,7 +90,7 @@ dia_line_cell_renderer_set_property (GObject *object,
break;
case PROP_LINE:
- priv->line = g_value_get_int (value);
+ priv->line = g_value_get_enum (value);
break;
default:
diff --git a/lib/dia_svg.c b/lib/dia_svg.c
index 7e43312e3..23e6abef0 100644
--- a/lib/dia_svg.c
+++ b/lib/dia_svg.c
@@ -69,7 +69,7 @@ dia_svg_style_init(DiaSvgStyle *gs, DiaSvgStyle *parent_style)
gs->fill = parent_style ? parent_style->fill : DIA_SVG_COLOUR_DEFAULT;
gs->fill_opacity = parent_style ? parent_style->fill_opacity : 1.0;
gs->linecap = parent_style ? parent_style->linecap : LINECAPS_DEFAULT;
- gs->linejoin = parent_style ? parent_style->linejoin : LINEJOIN_DEFAULT;
+ gs->linejoin = parent_style ? parent_style->linejoin : DIA_LINE_JOIN_DEFAULT;
gs->linestyle = parent_style ? parent_style->linestyle : DIA_LINE_STYLE_DEFAULT;
gs->font = (parent_style && parent_style->font) ? g_object_ref (parent_style->font) : NULL;
gs->font_height = parent_style ? parent_style->font_height : 0.8;
@@ -483,18 +483,22 @@ _parse_dasharray (DiaSvgStyle *s, double user_scale, char *str, char **end)
*end = ptr;
}
+
static void
_parse_linejoin (DiaSvgStyle *s, const char *val)
{
- if (!strncmp(val, "miter", 5))
- s->linejoin = LINEJOIN_MITER;
- else if (!strncmp(val, "round", 5))
- s->linejoin = LINEJOIN_ROUND;
- else if (!strncmp(val, "bevel", 5))
- s->linejoin = LINEJOIN_BEVEL;
- else if (!strncmp(val, "default", 7))
- s->linejoin = LINEJOIN_DEFAULT;
+ if (!strncmp (val, "miter", 5)) {
+ s->linejoin = DIA_LINE_JOIN_MITER;
+ } else if (!strncmp (val, "round", 5)) {
+ s->linejoin = DIA_LINE_JOIN_ROUND;
+ } else if (!strncmp (val, "bevel", 5)) {
+ s->linejoin = DIA_LINE_JOIN_BEVEL;
+ } else if (!strncmp (val, "default", 7)) {
+ s->linejoin = DIA_LINE_JOIN_DEFAULT;
+ }
}
+
+
static void
_parse_linecap (DiaSvgStyle *s, const char *val)
{
diff --git a/lib/dia_svg.h b/lib/dia_svg.h
index 8a33b526b..bcc5945eb 100644
--- a/lib/dia_svg.h
+++ b/lib/dia_svg.h
@@ -42,7 +42,7 @@ struct _DiaSvgStyle {
double fill_opacity;
LineCaps linecap;
- LineJoin linejoin;
+ DiaLineJoin linejoin;
DiaLineStyle linestyle;
double dashlength;
diff --git a/lib/diaimportrenderer.c b/lib/diaimportrenderer.c
index 338285ce5..06615ace5 100644
--- a/lib/diaimportrenderer.c
+++ b/lib/diaimportrenderer.c
@@ -35,7 +35,7 @@ static void end_render (DiaRenderer *);
static void set_linewidth (DiaRenderer *renderer, real linewidth);
static void set_linecaps (DiaRenderer *renderer, LineCaps mode);
-static void set_linejoin (DiaRenderer *renderer, LineJoin mode);
+static void set_linejoin (DiaRenderer *renderer, DiaLineJoin mode);
static void set_linestyle (DiaRenderer *renderer, DiaLineStyle mode, double dash_length);
static void set_fillstyle (DiaRenderer *renderer, FillStyle mode);
@@ -199,6 +199,7 @@ dia_import_renderer_class_init (DiaImportRendererClass *klass)
renderer_class->set_pattern = set_pattern;
}
+
static void
dia_import_renderer_init (DiaImportRenderer *self)
{
@@ -206,11 +207,12 @@ dia_import_renderer_init (DiaImportRenderer *self)
self->line_style = DIA_LINE_STYLE_SOLID;
self->dash_length = 1.0;
self->line_caps = LINECAPS_BUTT;
- self->line_join = LINEJOIN_MITER;
+ self->line_join = DIA_LINE_JOIN_MITER;
self->objects = NULL;
}
+
static void
begin_render (DiaRenderer *renderer, const DiaRectangle *update)
{
@@ -239,8 +241,9 @@ set_linecaps (DiaRenderer *renderer, LineCaps mode)
self->line_caps = mode;
}
+
static void
-set_linejoin (DiaRenderer *renderer, LineJoin mode)
+set_linejoin (DiaRenderer *renderer, DiaLineJoin mode)
{
DiaImportRenderer *self = DIA_IMPORT_RENDERER (renderer);
self->line_join = mode;
diff --git a/lib/diaimportrenderer.h b/lib/diaimportrenderer.h
index fa3333410..8fbca0990 100644
--- a/lib/diaimportrenderer.h
+++ b/lib/diaimportrenderer.h
@@ -36,7 +36,7 @@ struct _DiaImportRenderer {
double line_width;
LineCaps line_caps;
- LineJoin line_join;
+ DiaLineJoin line_join;
/*! \private */
/*! \private pattern set by set_pattern */
diff --git a/lib/diapathrenderer.c b/lib/diapathrenderer.c
index 683541e7b..40f3589de 100644
--- a/lib/diapathrenderer.c
+++ b/lib/diapathrenderer.c
@@ -212,8 +212,10 @@ static void
set_linecaps(DiaRenderer *self, LineCaps mode)
{
}
+
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
}
diff --git a/lib/diarenderer.c b/lib/diarenderer.c
index 3e489fc0e..58298115f 100644
--- a/lib/diarenderer.c
+++ b/lib/diarenderer.c
@@ -78,7 +78,8 @@ static void end_render (DiaRenderer *);
static void set_linewidth (DiaRenderer *renderer, real linewidth);
static void set_linecaps (DiaRenderer *renderer, LineCaps mode);
-static void set_linejoin (DiaRenderer *renderer, LineJoin mode);
+static void set_linejoin (DiaRenderer *renderer,
+ DiaLineJoin mode);
static void set_linestyle (DiaRenderer *renderer,
DiaLineStyle mode,
double length);
@@ -477,12 +478,12 @@ set_linecaps (DiaRenderer *object, LineCaps mode)
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (object)));
}
-/*!
- * \brief Change the line join mode for the strokes to come
- * \memberof _DiaRenderer \pure
+
+/*
+ * Change the line join mode for the strokes to come
*/
static void
-set_linejoin (DiaRenderer *renderer, LineJoin mode)
+set_linejoin (DiaRenderer *renderer, DiaLineJoin mode)
{
g_warning ("%s::set_line_join not implemented!",
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (renderer)));
@@ -2235,7 +2236,7 @@ dia_renderer_set_linecaps (DiaRenderer *self,
void
dia_renderer_set_linejoin (DiaRenderer *self,
- LineJoin mode)
+ DiaLineJoin mode)
{
g_return_if_fail (DIA_IS_RENDERER (self));
diff --git a/lib/diarenderer.h b/lib/diarenderer.h
index 1f617c89b..e45350b84 100644
--- a/lib/diarenderer.h
+++ b/lib/diarenderer.h
@@ -135,7 +135,7 @@ struct _DiaRendererClass
void (*set_linecaps) (DiaRenderer *renderer,
LineCaps mode);
void (*set_linejoin) (DiaRenderer *renderer,
- LineJoin mode);
+ DiaLineJoin mode);
void (*set_linestyle) (DiaRenderer *renderer,
DiaLineStyle mode,
double length);
@@ -298,7 +298,7 @@ void dia_renderer_set_linewidth (DiaRenderer *self,
void dia_renderer_set_linecaps (DiaRenderer *self,
LineCaps mode);
void dia_renderer_set_linejoin (DiaRenderer *self,
- LineJoin mode);
+ DiaLineJoin mode);
void dia_renderer_set_linestyle (DiaRenderer *self,
DiaLineStyle mode,
double length);
diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
index e3b28cefb..7a2d99e10 100644
--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -253,23 +253,23 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
}
}
-/*!
- * \brief Set line join
- * \memberof _DiaSvgRenderer
+
+/*
+ * Set line join
*/
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
DiaSvgRenderer *renderer = DIA_SVG_RENDERER (self);
- switch(mode) {
- case LINEJOIN_MITER:
+ switch (mode) {
+ case DIA_LINE_JOIN_MITER:
renderer->linejoin = "miter";
break;
- case LINEJOIN_ROUND:
+ case DIA_LINE_JOIN_ROUND:
renderer->linejoin = "round";
break;
- case LINEJOIN_BEVEL:
+ case DIA_LINE_JOIN_BEVEL:
renderer->linejoin = "bevel";
break;
case LINECAPS_DEFAULT:
diff --git a/lib/diatransformrenderer.c b/lib/diatransformrenderer.c
index fb9af4fd1..4e8a0775d 100644
--- a/lib/diatransformrenderer.c
+++ b/lib/diatransformrenderer.c
@@ -164,12 +164,12 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
dia_renderer_set_linecaps (renderer->worker, mode);
}
-/*!
- * \brief Pass through line join
- * \memberof _DiaTransformRenderer
+
+/*
+ * Pass through line join
*/
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
DiaTransformRenderer *renderer = DIA_TRANSFORM_RENDERER (self);
diff --git a/lib/properties.c b/lib/properties.c
index 249557e84..c280d0f8d 100644
--- a/lib/properties.c
+++ b/lib/properties.c
@@ -70,9 +70,9 @@ PropEnumData prop_std_text_fitting_data[] = {
{ NULL, 0 }
};
PropEnumData prop_std_line_join_data[] = {
- { NC_("LineJoin", "Miter"), LINEJOIN_MITER },
- { NC_("LineJoin", "Round"), LINEJOIN_ROUND },
- { NC_("LineJoin", "Bevel"), LINEJOIN_BEVEL },
+ { NC_("LineJoin", "Miter"), DIA_LINE_JOIN_MITER },
+ { NC_("LineJoin", "Round"), DIA_LINE_JOIN_ROUND },
+ { NC_("LineJoin", "Bevel"), DIA_LINE_JOIN_BEVEL },
{ NULL, 0 }
};
PropEnumData prop_std_line_caps_data[] = {
diff --git a/lib/properties.h b/lib/properties.h
index 535979a9a..49d17c0ca 100644
--- a/lib/properties.h
+++ b/lib/properties.h
@@ -621,9 +621,9 @@ static PropEnumData prop_std_text_fitting_data[] = {
{ NULL, 0 }
};
static PropEnumData prop_std_line_join_data[] = {
- { NC_("LineJoin", "Miter"), LINEJOIN_MITER },
- { NC_("LineJoin", "Round"), LINEJOIN_ROUND },
- { NC_("LineJoin", "Bevel"), LINEJOIN_BEVEL },
+ { NC_("LineJoin", "Miter"), DIA_LINE_JOIN_MITER },
+ { NC_("LineJoin", "Round"), DIA_LINE_JOIN_ROUND },
+ { NC_("LineJoin", "Bevel"), DIA_LINE_JOIN_BEVEL },
{ NULL, 0 }
};
static PropEnumData prop_std_line_caps_data[] = {
diff --git a/lib/renderer/diacairo-renderer.c b/lib/renderer/diacairo-renderer.c
index 3065c7f9a..88e05e9df 100644
--- a/lib/renderer/diacairo-renderer.c
+++ b/lib/renderer/diacairo-renderer.c
@@ -433,26 +433,27 @@ dia_cairo_renderer_set_linecaps (DiaRenderer *self, LineCaps mode)
DIAG_STATE (renderer->cr)
}
+
static void
-dia_cairo_renderer_set_linejoin (DiaRenderer *self, LineJoin mode)
+dia_cairo_renderer_set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (self);
DIAG_NOTE (g_message ("set_join %d", mode));
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
cairo_set_line_join (renderer->cr, CAIRO_LINE_JOIN_MITER);
break;
- case LINEJOIN_ROUND:
+ case DIA_LINE_JOIN_ROUND:
cairo_set_line_join (renderer->cr, CAIRO_LINE_JOIN_ROUND);
break;
- case LINEJOIN_BEVEL:
+ case DIA_LINE_JOIN_BEVEL:
cairo_set_line_join (renderer->cr, CAIRO_LINE_JOIN_BEVEL);
break;
default:
- g_warning("DiaCairoRenderer : Unsupported join mode specified!\n");
+ g_warning ("DiaCairoRenderer : Unsupported join mode specified!\n");
}
DIAG_STATE (renderer->cr)
diff --git a/lib/standard-path.c b/lib/standard-path.c
index f3ed693d6..12ddba9f9 100644
--- a/lib/standard-path.c
+++ b/lib/standard-path.c
@@ -81,7 +81,7 @@ struct _StdPath {
double line_width;
DiaLineStyle line_style;
double dashlength;
- LineJoin line_join;
+ DiaLineJoin line_join;
LineCaps line_caps;
Color fill_color;
diff --git a/objects/AADL/aadlport.c b/objects/AADL/aadlport.c
index db133a21e..b59f1f354 100644
--- a/objects/AADL/aadlport.c
+++ b/objects/AADL/aadlport.c
@@ -91,7 +91,7 @@ rotate_around_origin (Point *p, real angle) /* FIXME: no namespace */
point_add(p+2, &port->handle->pos); \
\
dia_renderer_set_linewidth(renderer, AADL_PORT_LINEWIDTH); \
- dia_renderer_set_linejoin(renderer, LINEJOIN_MITER); \
+ dia_renderer_set_linejoin(renderer, DIA_LINE_JOIN_MITER); \
dia_renderer_set_linestyle(renderer, DIA_LINE_STYLE_SOLID, 0.0); \
\
dia_renderer_draw_polygon(renderer, p, 3, &color_black, &color_black);
@@ -115,7 +115,7 @@ rotate_around_origin (Point *p, real angle) /* FIXME: no namespace */
point_add(p+2, &port->handle->pos); \
\
dia_renderer_set_linewidth(renderer, AADL_PORT_LINEWIDTH); \
- dia_renderer_set_linejoin(renderer, LINEJOIN_MITER); \
+ dia_renderer_set_linejoin(renderer, DIA_LINE_JOIN_MITER); \
dia_renderer_set_linestyle(renderer, DIA_LINE_STYLE_SOLID, 0.0); \
\
dia_renderer_draw_polyline(renderer, p, 3, &color_black);
@@ -139,7 +139,7 @@ rotate_around_origin (Point *p, real angle) /* FIXME: no namespace */
point_add(p+2, &port->handle->pos); \
\
dia_renderer_set_linewidth(renderer, AADL_PORT_LINEWIDTH); \
- dia_renderer_set_linejoin(renderer, LINEJOIN_MITER); \
+ dia_renderer_set_linejoin(renderer, DIA_LINE_JOIN_MITER); \
dia_renderer_set_linestyle(renderer, DIA_LINE_STYLE_SOLID, 0.0); \
\
dia_renderer_draw_polygon(renderer, p, 3, &color_black, &color_black);
@@ -163,7 +163,7 @@ rotate_around_origin (Point *p, real angle) /* FIXME: no namespace */
point_add(p+2, &port->handle->pos); \
\
dia_renderer_set_linewidth(renderer, AADL_PORT_LINEWIDTH); \
- dia_renderer_set_linejoin(renderer, LINEJOIN_MITER); \
+ dia_renderer_set_linejoin(renderer, DIA_LINE_JOIN_MITER); \
dia_renderer_set_linestyle(renderer, DIA_LINE_STYLE_SOLID, 0.0); \
\
dia_renderer_draw_polyline(renderer, p, 3, &color_black);
@@ -192,7 +192,7 @@ rotate_around_origin (Point *p, real angle) /* FIXME: no namespace */
point_add(p+3, &port->handle->pos); \
\
dia_renderer_set_linewidth(renderer, AADL_PORT_LINEWIDTH); \
- dia_renderer_set_linejoin(renderer, LINEJOIN_MITER); \
+ dia_renderer_set_linejoin(renderer, DIA_LINE_JOIN_MITER); \
dia_renderer_set_linestyle(renderer, DIA_LINE_STYLE_SOLID, 0.0); \
\
dia_renderer_draw_polygon(renderer, p, 4, &color_black, &color_black);
@@ -221,7 +221,7 @@ rotate_around_origin (Point *p, real angle) /* FIXME: no namespace */
point_add(p+3, &port->handle->pos); \
\
dia_renderer_set_linewidth(renderer, AADL_PORT_LINEWIDTH); \
- dia_renderer_set_linejoin(renderer, LINEJOIN_MITER); \
+ dia_renderer_set_linejoin(renderer, DIA_LINE_JOIN_MITER); \
dia_renderer_set_linestyle(renderer, DIA_LINE_STYLE_SOLID, 0.0); \
\
dia_renderer_draw_polygon(renderer, p, 4, NULL, &color_black);
@@ -268,7 +268,7 @@ aadlbox_draw_port (Aadlport *port, DiaRenderer *renderer)
point_add (p+4, &port->handle->pos);
dia_renderer_set_linewidth (renderer, AADL_PORT_LINEWIDTH);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_draw_polygon (renderer, p, 5, &color_white, &color_black);
@@ -304,7 +304,7 @@ aadlbox_draw_port (Aadlport *port, DiaRenderer *renderer)
point_add (p+4, &port->handle->pos);
dia_renderer_set_linewidth (renderer, AADL_PORT_LINEWIDTH);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_draw_polygon (renderer, p, 5, &color_white, &color_black);
@@ -363,7 +363,7 @@ aadlbox_draw_port (Aadlport *port, DiaRenderer *renderer)
point_add (p, &port->handle->pos);
dia_renderer_set_linewidth (renderer, AADL_PORT_LINEWIDTH);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_draw_ellipse (renderer,
diff --git a/objects/AADL/aadlprocess.c b/objects/AADL/aadlprocess.c
index fdcb833c1..46d04b3d5 100644
--- a/objects/AADL/aadlprocess.c
+++ b/objects/AADL/aadlprocess.c
@@ -66,9 +66,10 @@ aadlbox_draw_inclined_box (Aadlbox *aadlbox,
}
-static void aadlprocess_draw_borders(Aadlbox *aadlbox, DiaRenderer *renderer)
+static void
+aadlprocess_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
{
- aadlbox_draw_inclined_box(aadlbox, renderer, DIA_LINE_STYLE_SOLID);
+ aadlbox_draw_inclined_box (aadlbox, renderer, DIA_LINE_STYLE_SOLID);
}
diff --git a/objects/Database/reference.c b/objects/Database/reference.c
index 7a15e80d7..34fa18518 100644
--- a/objects/Database/reference.c
+++ b/objects/Database/reference.c
@@ -236,7 +236,7 @@ reference_draw (TableReference *ref, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ref->line_width);
dia_renderer_set_linestyle (renderer, ref->line_style, ref->dashlength);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_rounded_polyline_with_arrows (renderer,
diff --git a/objects/Database/table.c b/objects/Database/table.c
index 5b4628988..3af711beb 100644
--- a/objects/Database/table.c
+++ b/objects/Database/table.c
@@ -691,7 +691,7 @@ fill_diamond (DiaRenderer *renderer,
poly[3].y = lower_midpoint->y - half_height;
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer, poly, 4, color, NULL);
}
diff --git a/objects/ER/entity.c b/objects/ER/entity.c
index 7fbd841ca..ac0367c62 100644
--- a/objects/ER/entity.c
+++ b/objects/ER/entity.c
@@ -247,7 +247,7 @@ entity_draw (Entity *entity, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, entity->border_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_rect (renderer,
&ul_corner,
@@ -281,7 +281,7 @@ entity_draw (Entity *entity, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, entity->border_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer, corners, 4,
&entity->inner_color,
diff --git a/objects/ER/participation.c b/objects/ER/participation.c
index 723b4de27..85e778def 100644
--- a/objects/ER/participation.c
+++ b/objects/ER/participation.c
@@ -217,7 +217,7 @@ participation_draw (Participation *participation, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, PARTICIPATION_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
if (participation->total) {
diff --git a/objects/ER/relationship.c b/objects/ER/relationship.c
index 982e0258c..fdc95b588 100644
--- a/objects/ER/relationship.c
+++ b/objects/ER/relationship.c
@@ -276,7 +276,7 @@ relationship_draw (Relationship *relationship, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, relationship->border_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer,
corners,
diff --git a/objects/GRAFCET/step.c b/objects/GRAFCET/step.c
index b0a13e345..cd378fc4d 100644
--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -396,7 +396,7 @@ step_draw (Step *step, DiaRenderer *renderer)
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
dia_renderer_set_linewidth (renderer, STEP_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
pts[0] = step->north.pos;
pts[1] = step->NU1;
diff --git a/objects/GRAFCET/vector.c b/objects/GRAFCET/vector.c
index 2cca52ca6..d5ea758fc 100644
--- a/objects/GRAFCET/vector.c
+++ b/objects/GRAFCET/vector.c
@@ -217,7 +217,7 @@ arc_draw (Arc *arc, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ARC_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_polyline (renderer, points, n, &color_black);
diff --git a/objects/Istar/actor.c b/objects/Istar/actor.c
index 85c83ef04..815f9c100 100644
--- a/objects/Istar/actor.c
+++ b/objects/Istar/actor.c
@@ -305,7 +305,7 @@ actor_draw (Actor *actor, DiaRenderer *renderer)
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
/* foreground */
dia_renderer_set_linewidth (renderer, ACTOR_BORDER_WIDTH);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_ellipse (renderer,
¢er,
elem->width,
diff --git a/objects/Istar/goal.c b/objects/Istar/goal.c
index 1644207f6..11fca1de8 100644
--- a/objects/Istar/goal.c
+++ b/objects/Istar/goal.c
@@ -354,7 +354,7 @@ goal_draw (Goal *goal, DiaRenderer *renderer)
elem = &goal->element;
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linewidth (renderer, GOAL_LINE_WIDTH);
if (goal->type==GOAL) { /* goal */
diff --git a/objects/Istar/other.c b/objects/Istar/other.c
index 351af1cba..ff95f872c 100644
--- a/objects/Istar/other.c
+++ b/objects/Istar/other.c
@@ -339,7 +339,7 @@ other_draw (Other *other, DiaRenderer *renderer)
elem = &other->element;
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
switch (other->type) {
case RESOURCE:
diff --git a/objects/Jackson/domain.c b/objects/Jackson/domain.c
index 8f6da3fe6..3dc84ffa5 100644
--- a/objects/Jackson/domain.c
+++ b/objects/Jackson/domain.c
@@ -393,7 +393,7 @@ jackson_box_draw (Box *box, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, JACKSON_BOX_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_rect (renderer, &b0, &b1,
&JACKSON_BOX_BG_COLOR, &JACKSON_BOX_FG_COLOR);
diff --git a/objects/KAOS/goal.c b/objects/KAOS/goal.c
index fd62b0917..3facef8b6 100644
--- a/objects/KAOS/goal.c
+++ b/objects/KAOS/goal.c
@@ -459,7 +459,7 @@ goal_draw (Goal *goal, DiaRenderer *renderer)
}
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
if (goal->type != SOFTGOAL) {
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
diff --git a/objects/KAOS/other.c b/objects/KAOS/other.c
index ce4e20122..478f8efb5 100644
--- a/objects/KAOS/other.c
+++ b/objects/KAOS/other.c
@@ -390,7 +390,7 @@ other_draw (Other *other, DiaRenderer *renderer)
assert(renderer != NULL);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
if (other->type==AGENT) {
compute_agent (other,pl);
diff --git a/objects/Misc/analog_clock.c b/objects/Misc/analog_clock.c
index 3559500e8..dffcdc7db 100644
--- a/objects/Misc/analog_clock.c
+++ b/objects/Misc/analog_clock.c
@@ -314,7 +314,7 @@ analog_clock_draw (Analog_Clock *analog_clock, DiaRenderer *renderer)
g_assert(analog_clock != NULL);
g_assert(renderer != NULL);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
dia_renderer_set_linewidth (renderer, analog_clock->border_line_width);
diff --git a/objects/Misc/grid_object.c b/objects/Misc/grid_object.c
index 6b47d15dd..6a081b5dd 100644
--- a/objects/Misc/grid_object.c
+++ b/objects/Misc/grid_object.c
@@ -328,7 +328,7 @@ grid_object_draw (Grid_Object *grid_object, DiaRenderer *renderer)
lr_corner.x = elem->corner.x + elem->width;
lr_corner.y = elem->corner.y + elem->height;
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
/* draw gridlines */
diff --git a/objects/Misc/measure.c b/objects/Misc/measure.c
index 93b8c1a56..eb96e63af 100644
--- a/objects/Misc/measure.c
+++ b/objects/Misc/measure.c
@@ -267,7 +267,7 @@ measure_draw (Measure *measure, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, measure->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_ROUND);
dia_renderer_draw_line_with_arrows (renderer,
diff --git a/objects/Misc/n_gon.c b/objects/Misc/n_gon.c
index 4fd2599d5..3277f09b3 100644
--- a/objects/Misc/n_gon.c
+++ b/objects/Misc/n_gon.c
@@ -60,7 +60,7 @@ struct _Ngon {
int last_density; /*!< last value to decide direction */
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
double dashlength;
double line_width;
Color stroke;
diff --git a/objects/SADT/box.c b/objects/SADT/box.c
index 2de44562e..f8ae93f7d 100644
--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -308,7 +308,7 @@ sadtbox_draw (Box *box, DiaRenderer *renderer)
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
dia_renderer_set_linewidth (renderer, SADTBOX_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_rect (renderer,
&elem->corner,
diff --git a/objects/UML/association.c b/objects/UML/association.c
index 69b9109b8..1dd9345da 100644
--- a/objects/UML/association.c
+++ b/objects/UML/association.c
@@ -431,7 +431,7 @@ association_draw (Association *assoc, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, assoc->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
startarrow.length = ASSOCIATION_TRIANGLESIZE;
diff --git a/objects/UML/dependency.c b/objects/UML/dependency.c
index 5ef604439..06ae89084 100644
--- a/objects/UML/dependency.c
+++ b/objects/UML/dependency.c
@@ -250,7 +250,7 @@ dependency_draw (Dependency *dep, DiaRenderer *renderer)
dia_renderer_set_linestyle (renderer,
DIA_LINE_STYLE_DASHED,
DEPENDENCY_DASHLEN);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
arrow.type = ARROW_LINES;
diff --git a/objects/UML/generalization.c b/objects/UML/generalization.c
index 61b19ff54..57cbec13a 100644
--- a/objects/UML/generalization.c
+++ b/objects/UML/generalization.c
@@ -243,7 +243,7 @@ generalization_draw (Generalization *genlz, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, genlz->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
arrow.type = ARROW_HOLLOW_TRIANGLE;
diff --git a/objects/UML/realizes.c b/objects/UML/realizes.c
index e771e9956..103595cc7 100644
--- a/objects/UML/realizes.c
+++ b/objects/UML/realizes.c
@@ -242,7 +242,7 @@ realizes_draw (Realizes *realize, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, realize->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DASHED, REALIZES_DASHLEN);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
arrow.type = ARROW_HOLLOW_TRIANGLE;
diff --git a/objects/chronogram/chronoline.c b/objects/chronogram/chronoline.c
index 00ab53d0a..1be0059f2 100644
--- a/objects/chronogram/chronoline.c
+++ b/objects/chronogram/chronoline.c
@@ -412,7 +412,7 @@ chronoline_draw_really (Chronoline *chronoline,
oldx = elem->corner.x;
lst = chronoline->evtlist;
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linewidth (renderer, chronoline->data_lwidth);
@@ -466,7 +466,7 @@ chronoline_draw (Chronoline *chronoline, DiaRenderer *renderer)
elem = &chronoline->element;
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DOTTED, 1.0);
dia_renderer_set_linewidth (renderer, chronoline->main_lwidth);
p1.x = elem->corner.x + elem->width;
diff --git a/objects/chronogram/chronoref.c b/objects/chronogram/chronoref.c
index 93e8adf96..fd61254b1 100644
--- a/objects/chronogram/chronoref.c
+++ b/objects/chronogram/chronoref.c
@@ -284,7 +284,7 @@ chronoref_draw(Chronoref *chronoref, DiaRenderer *renderer)
elem = &chronoref->element;
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
lr_corner.x = elem->corner.x + elem->width;
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index 0fa219cfd..1b4161e53 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -135,7 +135,7 @@ static void custom_draw_displaylist (GList *display_li
double *cur_line,
double *cur_dash,
LineCaps *cur_caps,
- LineJoin *cur_join,
+ DiaLineJoin *cur_join,
DiaLineStyle *cur_style);
static void custom_draw_element (GraphicElement *el,
Custom *custom,
@@ -145,7 +145,7 @@ static void custom_draw_element (GraphicElement *el,
double *cur_line,
double *cur_dash,
LineCaps *cur_caps,
- LineJoin *cur_join,
+ DiaLineJoin *cur_join,
DiaLineStyle *cur_style,
Color *fg,
Color *bg);
@@ -926,7 +926,7 @@ custom_draw (Custom *custom, DiaRenderer *renderer)
static GArray *arr = NULL, *barr = NULL;
double cur_line = 1.0, cur_dash = 1.0;
LineCaps cur_caps = LINECAPS_BUTT;
- LineJoin cur_join = LINEJOIN_MITER;
+ DiaLineJoin cur_join = DIA_LINE_JOIN_MITER;
DiaLineStyle cur_style = custom->line_style;
assert(custom != NULL);
@@ -975,7 +975,7 @@ custom_draw_displaylist (GList *display_list,
double *cur_line,
double *cur_dash,
LineCaps *cur_caps,
- LineJoin *cur_join,
+ DiaLineJoin *cur_join,
DiaLineStyle *cur_style)
{
GList *tmp;
@@ -994,6 +994,7 @@ custom_draw_displaylist (GList *display_list,
}
}
+
static void
custom_draw_element (GraphicElement *el,
Custom *custom,
@@ -1003,16 +1004,16 @@ custom_draw_element (GraphicElement *el,
double *cur_line,
double *cur_dash,
LineCaps *cur_caps,
- LineJoin *cur_join,
+ DiaLineJoin *cur_join,
DiaLineStyle *cur_style,
Color *fg,
Color *bg)
{
Point p1, p2;
- real width, height;
- real coord;
+ double width, height;
+ double coord;
int i;
- real radius;
+ double radius;
/* Somehow - maybe due to scaling - the exact match does not always work. Instead of:
* (el->any.s.line_width != (*cur_line))
@@ -1029,10 +1030,10 @@ custom_draw_element (GraphicElement *el,
el->any.s.linecap : LINECAPS_BUTT;
dia_renderer_set_linecaps (renderer, (*cur_caps));
}
- if ((el->any.s.linejoin==LINEJOIN_DEFAULT && (*cur_join)!=LINEJOIN_MITER) ||
+ if ((el->any.s.linejoin == DIA_LINE_JOIN_DEFAULT && (*cur_join) != DIA_LINE_JOIN_MITER) ||
el->any.s.linejoin != (*cur_join)) {
- (*cur_join) = (el->any.s.linejoin!=LINEJOIN_DEFAULT) ?
- el->any.s.linejoin : LINEJOIN_MITER;
+ (*cur_join) = (el->any.s.linejoin != DIA_LINE_JOIN_DEFAULT) ?
+ el->any.s.linejoin : DIA_LINE_JOIN_MITER;
dia_renderer_set_linejoin (renderer, (*cur_join));
}
diff --git a/objects/custom/shape_info.c b/objects/custom/shape_info.c
index bf6c8f77f..61eb465f8 100644
--- a/objects/custom/shape_info.c
+++ b/objects/custom/shape_info.c
@@ -937,7 +937,7 @@ load_shape_info (const gchar *filename, ShapeInfo *preload)
DIA_SVG_COLOUR_NONE,
1.0,
LINECAPS_DEFAULT,
- LINEJOIN_DEFAULT,
+ DIA_LINE_JOIN_DEFAULT,
DIA_LINE_STYLE_DEFAULT,
1.0
};
diff --git a/objects/flowchart/box.c b/objects/flowchart/box.c
index 5c5d0625a..873d101b4 100644
--- a/objects/flowchart/box.c
+++ b/objects/flowchart/box.c
@@ -371,7 +371,7 @@ box_draw (Box *box, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, box->border_width);
dia_renderer_set_linestyle (renderer, box->line_style, box->dashlength);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
/* Problem: How do we make the fill with rounded corners?
* It's solved in the base class ...
*/
diff --git a/objects/flowchart/diamond.c b/objects/flowchart/diamond.c
index e39e8409d..541d11092 100644
--- a/objects/flowchart/diamond.c
+++ b/objects/flowchart/diamond.c
@@ -388,7 +388,7 @@ diamond_draw(Diamond *diamond, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, diamond->border_width);
dia_renderer_set_linestyle (renderer, diamond->line_style, diamond->dashlength);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer,
pts,
diff --git a/objects/flowchart/ellipse.c b/objects/flowchart/ellipse.c
index d8f25c7f4..82a5c8dd2 100644
--- a/objects/flowchart/ellipse.c
+++ b/objects/flowchart/ellipse.c
@@ -381,7 +381,7 @@ ellipse_draw (Ellipse *ellipse, DiaRenderer *renderer)
}
dia_renderer_set_linewidth (renderer, ellipse->border_width);
dia_renderer_set_linestyle (renderer, ellipse->line_style, ellipse->dashlength);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_ellipse (renderer,
¢er,
diff --git a/objects/flowchart/parallelogram.c b/objects/flowchart/parallelogram.c
index 91cd83309..45fc95ae1 100644
--- a/objects/flowchart/parallelogram.c
+++ b/objects/flowchart/parallelogram.c
@@ -393,7 +393,7 @@ pgram_draw (Pgram *pgram, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, pgram->border_width);
dia_renderer_set_linestyle (renderer, pgram->line_style, pgram->dashlength);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer,
pts,
diff --git a/objects/network/basestation.c b/objects/network/basestation.c
index 45873c7b5..c2ac501aa 100644
--- a/objects/network/basestation.c
+++ b/objects/network/basestation.c
@@ -248,7 +248,7 @@ basestation_draw (Basestation *basestation, DiaRenderer *renderer)
h = elem->height - r;
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
- dia_renderer_set_linejoin (renderer, LINEJOIN_ROUND);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_ROUND);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
dia_renderer_set_linewidth (renderer, BASESTATION_LINEWIDTH);
diff --git a/objects/network/radiocell.c b/objects/network/radiocell.c
index 053364167..3834e1a28 100644
--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -259,7 +259,7 @@ radiocell_draw (RadioCell *radiocell, DiaRenderer *renderer)
dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
}
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, radiocell->line_style, radiocell->dashlength);
dia_renderer_set_linewidth (renderer, radiocell->line_width);
dia_renderer_draw_polygon (renderer, points, n,
diff --git a/objects/network/wanlink.c b/objects/network/wanlink.c
index e2c5f94a8..32dc0d1a7 100644
--- a/objects/network/wanlink.c
+++ b/objects/network/wanlink.c
@@ -222,7 +222,7 @@ wanlink_draw (WanLink *wanlink, DiaRenderer *renderer)
assert (renderer != NULL);
dia_renderer_set_linewidth (renderer, FLASH_LINE);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_draw_polygon (renderer,
diff --git a/objects/standard/arc.c b/objects/standard/arc.c
index c12985fea..2a49469c6 100644
--- a/objects/standard/arc.c
+++ b/objects/standard/arc.c
@@ -660,7 +660,7 @@ arc_draw (Arc *arc, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, 0);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DOTTED, 1);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_BUTT);
dia_renderer_draw_line (renderer, &endpoints[0], &arc->center, &line_color);
diff --git a/objects/standard/bezier.c b/objects/standard/bezier.c
index fe18d883d..b921149d3 100644
--- a/objects/standard/bezier.c
+++ b/objects/standard/bezier.c
@@ -49,7 +49,7 @@ struct _Bezierline {
Color line_color;
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
LineCaps line_caps;
double dashlength;
double line_width;
@@ -479,7 +479,7 @@ bezierline_create(Point *startpoint,
bezierline->line_color = attributes_get_foreground();
attributes_get_default_line_style(&bezierline->line_style,
&bezierline->dashlength);
- bezierline->line_join = LINEJOIN_MITER;
+ bezierline->line_join = DIA_LINE_JOIN_MITER;
bezierline->line_caps = LINECAPS_BUTT;
bezierline->start_arrow = attributes_get_default_start_arrow();
bezierline->end_arrow = attributes_get_default_end_arrow();
@@ -634,12 +634,17 @@ bezierline_save(Bezierline *bezierline, ObjectNode obj_node,
ctx);
}
- if (bezierline->line_join != LINEJOIN_MITER)
- data_add_enum(new_attribute(obj_node, "line_join"),
- bezierline->line_join, ctx);
- if (bezierline->line_caps != LINECAPS_BUTT)
- data_add_enum(new_attribute(obj_node, "line_caps"),
- bezierline->line_caps, ctx);
+ if (bezierline->line_join != DIA_LINE_JOIN_MITER) {
+ data_add_enum (new_attribute (obj_node, "line_join"),
+ bezierline->line_join,
+ ctx);
+ }
+
+ if (bezierline->line_caps != LINECAPS_BUTT) {
+ data_add_enum (new_attribute (obj_node, "line_caps"),
+ bezierline->line_caps,
+ ctx);
+ }
if (bezierline->start_arrow.type != ARROW_NONE) {
dia_arrow_save (&bezierline->start_arrow,
@@ -701,10 +706,11 @@ bezierline_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
bezierline->line_style = data_enum(attribute_first_data(attr), ctx);
- bezierline->line_join = LINEJOIN_MITER;
- attr = object_find_attribute(obj_node, "line_join");
- if (attr != NULL)
- bezierline->line_join = data_enum(attribute_first_data(attr), ctx);
+ bezierline->line_join = DIA_LINE_JOIN_MITER;
+ attr = object_find_attribute (obj_node, "line_join");
+ if (attr != NULL) {
+ bezierline->line_join = data_enum (attribute_first_data (attr), ctx);
+ }
bezierline->line_caps = LINECAPS_BUTT;
attr = object_find_attribute(obj_node, "line_caps");
diff --git a/objects/standard/beziergon.c b/objects/standard/beziergon.c
index 26350c7c3..fa9db9b8b 100644
--- a/objects/standard/beziergon.c
+++ b/objects/standard/beziergon.c
@@ -48,7 +48,7 @@ typedef struct _Beziergon {
Color line_color;
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
Color inner_color;
gboolean show_background;
double dashlength;
@@ -305,9 +305,9 @@ beziergon_create(Point *startpoint,
beziergon->line_width = attributes_get_default_linewidth();
beziergon->line_color = attributes_get_foreground();
beziergon->inner_color = attributes_get_background();
- attributes_get_default_line_style(&beziergon->line_style,
- &beziergon->dashlength);
- beziergon->line_join = LINEJOIN_MITER;
+ attributes_get_default_line_style (&beziergon->line_style,
+ &beziergon->dashlength);
+ beziergon->line_join = DIA_LINE_JOIN_MITER;
beziergon->show_background = default_properties.show_background;
beziergon_update_data(beziergon);
@@ -411,9 +411,11 @@ beziergon_save(Beziergon *beziergon, ObjectNode obj_node,
data_add_real(new_attribute(obj_node, "dashlength"),
beziergon->dashlength, ctx);
- if (beziergon->line_join != LINEJOIN_MITER)
- data_add_enum(new_attribute(obj_node, "line_join"),
- beziergon->line_join, ctx);
+ if (beziergon->line_join != DIA_LINE_JOIN_MITER) {
+ data_add_enum (new_attribute (obj_node, "line_join"),
+ beziergon->line_join,
+ ctx);
+ }
if (beziergon->pattern)
data_add_pattern(new_attribute(obj_node, "pattern"),
@@ -464,10 +466,11 @@ beziergon_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
beziergon->line_style = data_enum(attribute_first_data(attr), ctx);
- beziergon->line_join = LINEJOIN_MITER;
- attr = object_find_attribute(obj_node, "line_join");
- if (attr != NULL)
- beziergon->line_join = data_enum(attribute_first_data(attr), ctx);
+ beziergon->line_join = DIA_LINE_JOIN_MITER;
+ attr = object_find_attribute (obj_node, "line_join");
+ if (attr != NULL) {
+ beziergon->line_join = data_enum (attribute_first_data (attr), ctx);
+ }
beziergon->dashlength = DEFAULT_LINESTYLE_DASHLEN;
attr = object_find_attribute(obj_node, "dashlength");
diff --git a/objects/standard/box.c b/objects/standard/box.c
index 78626087e..69174bb22 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -62,7 +62,7 @@ struct _Box {
Color inner_color;
gboolean show_background;
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
double dashlength;
double corner_radius;
AspectType aspect;
@@ -378,7 +378,7 @@ box_draw (Box *box, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, box->border_width);
dia_renderer_set_linestyle (renderer, box->line_style, box->dashlength);
if (box->corner_radius > 0) {
- dia_renderer_set_linejoin (renderer, LINEJOIN_ROUND);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_ROUND);
} else {
dia_renderer_set_linejoin (renderer, box->line_join);
}
@@ -508,8 +508,8 @@ box_create(Point *startpoint,
box->border_width = attributes_get_default_linewidth();
box->border_color = attributes_get_foreground();
box->inner_color = attributes_get_background();
- attributes_get_default_line_style(&box->line_style, &box->dashlength);
- box->line_join = LINEJOIN_MITER;
+ attributes_get_default_line_style (&box->line_style, &box->dashlength);
+ box->line_join = DIA_LINE_JOIN_MITER;
/* For non-default objects, this is overridden by the default */
box->show_background = default_properties.show_background;
box->corner_radius = default_properties.corner_radius;
@@ -610,9 +610,11 @@ box_save(Box *box, ObjectNode obj_node, DiaContext *ctx)
data_add_real(new_attribute(obj_node, "dashlength"),
box->dashlength, ctx);
- if (box->line_join != LINEJOIN_MITER)
- data_add_enum(new_attribute(obj_node, "line_join"),
- box->line_join, ctx);
+ if (box->line_join != DIA_LINE_JOIN_MITER) {
+ data_add_enum (new_attribute (obj_node, "line_join"),
+ box->line_join,
+ ctx);
+ }
if (box->corner_radius > 0.0)
data_add_real(new_attribute(obj_node, "corner_radius"),
@@ -680,10 +682,11 @@ box_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
box->dashlength = data_real(attribute_first_data(attr), ctx);
- box->line_join = LINEJOIN_MITER;
- attr = object_find_attribute(obj_node, "line_join");
- if (attr != NULL)
- box->line_join = data_enum(attribute_first_data(attr), ctx);
+ box->line_join = DIA_LINE_JOIN_MITER;
+ attr = object_find_attribute (obj_node, "line_join");
+ if (attr != NULL) {
+ box->line_join = data_enum (attribute_first_data (attr), ctx);
+ }
box->corner_radius = 0.0;
attr = object_find_attribute(obj_node, "corner_radius");
diff --git a/objects/standard/image.c b/objects/standard/image.c
index 726704b0c..5cc1fda58 100644
--- a/objects/standard/image.c
+++ b/objects/standard/image.c
@@ -465,7 +465,7 @@ image_draw (Image *image, DiaRenderer *renderer)
if (image->draw_border) {
dia_renderer_set_linewidth (renderer, image->border_width);
dia_renderer_set_linestyle (renderer, image->line_style, image->dashlength);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
if (image->angle != 0.0) {
Point poly[4];
diff --git a/objects/standard/outline.c b/objects/standard/outline.c
index 70679fdad..d98d3d0d1 100644
--- a/objects/standard/outline.c
+++ b/objects/standard/outline.c
@@ -345,7 +345,7 @@ outline_draw (Outline *outline, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, outline->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
- dia_renderer_set_linejoin (renderer, LINEJOIN_MITER);
+ dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_set_linecaps (renderer, LINECAPS_ROUND);
/* the cairo text path is position independent, Dia's bezier are not */
diff --git a/objects/standard/polygon.c b/objects/standard/polygon.c
index 1a6e11a36..7724ac63e 100644
--- a/objects/standard/polygon.c
+++ b/objects/standard/polygon.c
@@ -52,7 +52,7 @@ typedef struct _Polygon {
Color line_color;
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
Color inner_color;
gboolean show_background;
double dashlength;
@@ -291,9 +291,9 @@ polygon_create(Point *startpoint,
polygon->line_width = attributes_get_default_linewidth();
polygon->line_color = attributes_get_foreground();
polygon->inner_color = attributes_get_background();
- attributes_get_default_line_style(&polygon->line_style,
- &polygon->dashlength);
- polygon->line_join = LINEJOIN_MITER;
+ attributes_get_default_line_style (&polygon->line_style,
+ &polygon->dashlength);
+ polygon->line_join = DIA_LINE_JOIN_MITER;
polygon->show_background = default_properties.show_background;
polygon_update_data(polygon);
@@ -383,9 +383,11 @@ polygon_save(Polygon *polygon, ObjectNode obj_node,
data_add_real(new_attribute(obj_node, "dashlength"),
polygon->dashlength, ctx);
- if (polygon->line_join != LINEJOIN_MITER)
- data_add_enum(new_attribute(obj_node, "line_join"),
- polygon->line_join, ctx);
+ if (polygon->line_join != DIA_LINE_JOIN_MITER) {
+ data_add_enum (new_attribute (obj_node, "line_join"),
+ polygon->line_join,
+ ctx);
+ }
if (polygon->pattern)
data_add_pattern(new_attribute(obj_node, "pattern"),
@@ -435,10 +437,11 @@ polygon_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
polygon->line_style = data_enum(attribute_first_data(attr), ctx);
- polygon->line_join = LINEJOIN_MITER;
- attr = object_find_attribute(obj_node, "line_join");
- if (attr != NULL)
- polygon->line_join = data_enum(attribute_first_data(attr), ctx);
+ polygon->line_join = DIA_LINE_JOIN_MITER;
+ attr = object_find_attribute (obj_node, "line_join");
+ if (attr != NULL) {
+ polygon->line_join = data_enum (attribute_first_data (attr), ctx);
+ }
polygon->dashlength = DEFAULT_LINESTYLE_DASHLEN;
attr = object_find_attribute(obj_node, "dashlength");
diff --git a/objects/standard/polyline.c b/objects/standard/polyline.c
index 6e3724764..6c768350b 100644
--- a/objects/standard/polyline.c
+++ b/objects/standard/polyline.c
@@ -43,7 +43,7 @@ typedef struct _Polyline {
Color line_color;
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
LineCaps line_caps;
double dashlength;
double line_width;
@@ -360,9 +360,9 @@ polyline_create(Point *startpoint,
polyline->line_width = attributes_get_default_linewidth();
polyline->line_color = attributes_get_foreground();
- attributes_get_default_line_style(&polyline->line_style,
- &polyline->dashlength);
- polyline->line_join = LINEJOIN_MITER;
+ attributes_get_default_line_style (&polyline->line_style,
+ &polyline->dashlength);
+ polyline->line_join = DIA_LINE_JOIN_MITER;
polyline->line_caps = LINECAPS_BUTT;
polyline->start_arrow = attributes_get_default_start_arrow();
polyline->end_arrow = attributes_get_default_end_arrow();
@@ -488,9 +488,12 @@ polyline_save(Polyline *polyline, ObjectNode obj_node,
data_add_real(new_attribute(obj_node, "dashlength"),
polyline->dashlength, ctx);
- if (polyline->line_join != LINEJOIN_MITER)
- data_add_enum(new_attribute(obj_node, "line_join"),
- polyline->line_join, ctx);
+ if (polyline->line_join != DIA_LINE_JOIN_MITER) {
+ data_add_enum (new_attribute (obj_node, "line_join"),
+ polyline->line_join,
+ ctx);
+ }
+
if (polyline->line_caps != LINECAPS_BUTT)
data_add_enum(new_attribute(obj_node, "line_caps"),
polyline->line_caps, ctx);
@@ -558,10 +561,11 @@ polyline_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
polyline->line_style = data_enum(attribute_first_data(attr), ctx);
- polyline->line_join = LINEJOIN_MITER;
- attr = object_find_attribute(obj_node, "line_join");
- if (attr != NULL)
- polyline->line_join = data_enum(attribute_first_data(attr), ctx);
+ polyline->line_join = DIA_LINE_JOIN_MITER;
+ attr = object_find_attribute (obj_node, "line_join");
+ if (attr != NULL) {
+ polyline->line_join = data_enum (attribute_first_data (attr), ctx);
+ }
polyline->line_caps = LINECAPS_BUTT;
attr = object_find_attribute(obj_node, "line_caps");
diff --git a/objects/standard/zigzagline.c b/objects/standard/zigzagline.c
index d4c34c43e..457c36ed4 100644
--- a/objects/standard/zigzagline.c
+++ b/objects/standard/zigzagline.c
@@ -45,7 +45,7 @@ typedef struct _Zigzagline {
Color line_color;
DiaLineStyle line_style;
- LineJoin line_join;
+ DiaLineJoin line_join;
LineCaps line_caps;
double dashlength;
double line_width;
@@ -267,9 +267,9 @@ zigzagline_create(Point *startpoint,
zigzagline->line_width = attributes_get_default_linewidth();
zigzagline->line_color = attributes_get_foreground();
- attributes_get_default_line_style(&zigzagline->line_style,
- &zigzagline->dashlength);
- zigzagline->line_join = LINEJOIN_MITER;
+ attributes_get_default_line_style (&zigzagline->line_style,
+ &zigzagline->dashlength);
+ zigzagline->line_join = DIA_LINE_JOIN_MITER;
zigzagline->line_caps = LINECAPS_BUTT;
zigzagline->start_arrow = attributes_get_default_start_arrow();
zigzagline->end_arrow = attributes_get_default_end_arrow();
@@ -504,9 +504,12 @@ zigzagline_save(Zigzagline *zigzagline, ObjectNode obj_node,
data_add_enum(new_attribute(obj_node, "line_style"),
zigzagline->line_style, ctx);
- if (zigzagline->line_join != LINEJOIN_MITER)
- data_add_enum(new_attribute(obj_node, "line_join"),
- zigzagline->line_join, ctx);
+ if (zigzagline->line_join != DIA_LINE_JOIN_MITER) {
+ data_add_enum (new_attribute (obj_node, "line_join"),
+ zigzagline->line_join,
+ ctx);
+ }
+
if (zigzagline->line_caps != LINECAPS_BUTT)
data_add_enum(new_attribute(obj_node, "line_caps"),
zigzagline->line_caps, ctx);
@@ -572,10 +575,11 @@ zigzagline_load(ObjectNode obj_node, int version, DiaContext *ctx)
if (attr != NULL)
zigzagline->line_style = data_enum(attribute_first_data(attr), ctx);
- zigzagline->line_join = LINEJOIN_MITER;
- attr = object_find_attribute(obj_node, "line_join");
- if (attr != NULL)
- zigzagline->line_join = data_enum(attribute_first_data(attr), ctx);
+ zigzagline->line_join = DIA_LINE_JOIN_MITER;
+ attr = object_find_attribute (obj_node, "line_join");
+ if (attr != NULL) {
+ zigzagline->line_join = data_enum (attribute_first_data (attr), ctx);
+ }
zigzagline->line_caps = LINECAPS_BUTT;
attr = object_find_attribute(obj_node, "line_caps");
diff --git a/plug-ins/cgm/cgm.c b/plug-ins/cgm/cgm.c
index 20293c1d1..f5a77f95a 100644
--- a/plug-ins/cgm/cgm.c
+++ b/plug-ins/cgm/cgm.c
@@ -606,29 +606,30 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
renderer->lcurrent.cap = renderer->fcurrent.cap = cap;
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- CgmRenderer *renderer = CGM_RENDERER(self);
- int join;
+ CgmRenderer *renderer = CGM_RENDERER (self);
+ int join;
- switch(mode)
- {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- join = 2;
- break;
- case LINEJOIN_ROUND:
- join = 3;
- break;
- case LINEJOIN_BEVEL:
- join = 4;
- break;
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ join = 2;
+ break;
+ case DIA_LINE_JOIN_ROUND:
+ join = 3;
+ break;
+ case DIA_LINE_JOIN_BEVEL:
+ join = 4;
+ break;
default:
- join = 2;
- break;
- }
- renderer->lcurrent.join = renderer->fcurrent.join = join;
+ join = 2;
+ break;
+ }
+
+ renderer->lcurrent.join = renderer->fcurrent.join = join;
}
diff --git a/plug-ins/drs/dia-render-script-import.c b/plug-ins/drs/dia-render-script-import.c
index ef122a790..7348b2e27 100644
--- a/plug-ins/drs/dia-render-script-import.c
+++ b/plug-ins/drs/dia-render-script-import.c
@@ -194,22 +194,30 @@ _parse_linecaps (xmlNodePtr node, const char *attrib)
}
return val;
}
-static LineJoin
+
+
+static DiaLineJoin
_parse_linejoin (xmlNodePtr node, const char *attrib)
{
- xmlChar *str = xmlGetProp(node, (const xmlChar *)attrib);
- LineJoin val = LINEJOIN_MITER;
+ xmlChar *str = xmlGetProp (node, (const xmlChar *) attrib);
+ DiaLineJoin val =DIA_LINE_JOIN_MITER;
+
if (str) {
- if (strcmp ((const char *)str, "round") == 0)
- val = LINEJOIN_ROUND;
- else if (strcmp ((const char *)str, "bevel") == 0)
- val = LINEJOIN_BEVEL;
- else if (strcmp ((const char *)str, "miter") != 0)
+ if (g_strcmp0 ((const char *) str, "round") == 0) {
+ val = DIA_LINE_JOIN_ROUND;
+ } else if (g_strcmp0 ((const char *) str, "bevel") == 0) {
+ val = DIA_LINE_JOIN_BEVEL;
+ } else if (g_strcmp0 ((const char *) str, "miter") != 0) {
g_warning ("unknown linejoin: %s", str);
- xmlFree(str);
+ }
}
+
+ dia_clear_xml_string (&str);
+
return val;
}
+
+
static FillStyle
_parse_fillstyle (xmlNodePtr node, const char *attrib)
{
diff --git a/plug-ins/drs/dia-render-script-renderer.c b/plug-ins/drs/dia-render-script-renderer.c
index b00800ef2..3492d60b1 100644
--- a/plug-ins/drs/dia-render-script-renderer.c
+++ b/plug-ins/drs/dia-render-script-renderer.c
@@ -416,21 +416,21 @@ set_linecaps (DiaRenderer *self, LineCaps mode)
static void
-set_linejoin (DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
DrsRenderer *renderer = DRS_RENDERER (self);
xmlNodePtr node;
- gchar *value = NULL;
+ char *value = NULL;
switch (mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
value = "miter";
break;
- case LINEJOIN_ROUND:
+ case DIA_LINE_JOIN_ROUND:
value = "round";
break;
- case LINEJOIN_BEVEL:
+ case DIA_LINE_JOIN_BEVEL:
value = "bevel";
break;
default:
diff --git a/plug-ins/dxf/dxf-export.c b/plug-ins/dxf/dxf-export.c
index 0ae3ebb64..43cfbf2c4 100644
--- a/plug-ins/dxf/dxf-export.c
+++ b/plug-ins/dxf/dxf-export.c
@@ -258,8 +258,9 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
{
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
}
diff --git a/plug-ins/hpgl/hpgl.c b/plug-ins/hpgl/hpgl.c
index d56dd8619..e27620539 100644
--- a/plug-ins/hpgl/hpgl.c
+++ b/plug-ins/hpgl/hpgl.c
@@ -224,22 +224,23 @@ set_linecaps(DiaRenderer *object, LineCaps mode)
}
}
+
static void
-set_linejoin(DiaRenderer *object, LineJoin mode)
+set_linejoin (DiaRenderer *object, DiaLineJoin mode)
{
- DIAG_NOTE(g_message("set_join %d", mode));
+ DIAG_NOTE (g_message ( "set_join %d", mode));
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- break;
- case LINEJOIN_ROUND:
- break;
- case LINEJOIN_BEVEL:
- break;
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ break;
+ case DIA_LINE_JOIN_ROUND:
+ break;
+ case DIA_LINE_JOIN_BEVEL:
+ break;
default:
- g_warning("HpglRenderer : Unsupported fill mode specified!");
- }
+ g_warning ("HpglRenderer : Unsupported fill mode specified!");
+ }
}
diff --git a/plug-ins/metapost/render_metapost.c b/plug-ins/metapost/render_metapost.c
index 30bc5a065..9e4630558 100644
--- a/plug-ins/metapost/render_metapost.c
+++ b/plug-ins/metapost/render_metapost.c
@@ -274,30 +274,32 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
renderer->saved_line_cap = mode;
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- MetapostRenderer *renderer = METAPOST_RENDERER (self);
+ MetapostRenderer *renderer = METAPOST_RENDERER (self);
- if(mode == renderer->saved_line_join)
- return;
+ if (mode == renderer->saved_line_join) {
+ return;
+ }
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- fprintf(renderer->file, "linejoin:=mitered;\n");
- break;
- case LINEJOIN_ROUND:
- fprintf(renderer->file, "linejoin:=rounded;\n");
- break;
- case LINEJOIN_BEVEL:
- fprintf(renderer->file, "linejoin:=beveled;\n");
- break;
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ fprintf (renderer->file, "linejoin:=mitered;\n");
+ break;
+ case DIA_LINE_JOIN_ROUND:
+ fprintf (renderer->file, "linejoin:=rounded;\n");
+ break;
+ case DIA_LINE_JOIN_BEVEL:
+ fprintf (renderer->file, "linejoin:=beveled;\n");
+ break;
default:
- /* noop; required at least for msvc */;
- }
+ /* noop; required at least for msvc */;
+ }
- renderer->saved_line_join = mode;
+ renderer->saved_line_join = mode;
}
diff --git a/plug-ins/metapost/render_metapost.h b/plug-ins/metapost/render_metapost.h
index c80f324f1..63d014bb1 100644
--- a/plug-ins/metapost/render_metapost.h
+++ b/plug-ins/metapost/render_metapost.h
@@ -50,7 +50,7 @@ struct _MetapostRenderer {
DiaLineStyle saved_line_style;
LineCaps saved_line_cap;
- LineJoin saved_line_join;
+ DiaLineJoin saved_line_join;
Color color;
diff --git a/plug-ins/pdf/pdf-import.cpp b/plug-ins/pdf/pdf-import.cpp
index dc92b9ef6..3e2f64565 100644
--- a/plug-ins/pdf/pdf-import.cpp
+++ b/plug-ins/pdf/pdf-import.cpp
@@ -173,15 +173,18 @@ public :
}
}
- void updateLineJoin(GfxState * state)
+ void
+ updateLineJoin (GfxState * state)
{
- if (state->getLineJoin() == 0)
- this->line_join = LINEJOIN_MITER;
- else if (state->getLineJoin() == 1)
- this->line_join = LINEJOIN_ROUND;
- else
- this->line_join = LINEJOIN_BEVEL;
+ if (state->getLineJoin() == 0) {
+ this->line_join = DIA_LINE_JOIN_MITER;
+ } else if (state->getLineJoin() == 1) {
+ this->line_join = DIA_LINE_JOIN_ROUND;
+ } else {
+ this->line_join = DIA_LINE_JOIN_BEVEL;
+ }
}
+
void updateLineCap(GfxState *state)
{
if (state->getLineCap() == 0)
@@ -442,7 +445,7 @@ private :
double line_width;
DiaLineStyle line_style;
double dash_length;
- LineJoin line_join;
+ DiaLineJoin line_join;
LineCaps line_caps;
Color fill_color;
@@ -482,7 +485,7 @@ DiaOutputDev::DiaOutputDev (DiagramData *_dia, int _n) :
// favoring member intitialization list over attributes_get_default_line_style()
line_style(DIA_LINE_STYLE_SOLID),
dash_length(1.0),
- line_join(LINEJOIN_MITER),
+ line_join(DIA_LINE_JOIN_MITER),
line_caps(LINECAPS_PROJECTING),
fill_color(attributes_get_background ()),
alignment(ALIGN_LEFT),
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index e9d5380a1..e8647f7d6 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -82,7 +82,7 @@ static void begin_render(DiaRenderer *self, const DiaRectangle *update);
static void end_render(DiaRenderer *self);
static void set_linewidth(DiaRenderer *self, real linewidth);
static void set_linecaps(DiaRenderer *self, LineCaps mode);
-static void set_linejoin(DiaRenderer *self, LineJoin mode);
+static void set_linejoin (DiaRenderer *self, DiaLineJoin mode);
static void set_linestyle(DiaRenderer *self, DiaLineStyle mode, double dash_length);
static void set_fillstyle(DiaRenderer *self, FillStyle mode);
static void set_font(DiaRenderer *self, DiaFont *font, real height);
@@ -437,24 +437,24 @@ set_linecaps (DiaRenderer *self, LineCaps mode)
static void
-set_linejoin (DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- PgfRenderer *renderer = PGF_RENDERER(self);
+ PgfRenderer *renderer = PGF_RENDERER (self);
/* int ps_mode; */
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- fprintf(renderer->file, "\\pgfsetmiterjoin\n");
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ fprintf (renderer->file, "\\pgfsetmiterjoin\n");
break;
- case LINEJOIN_ROUND:
- fprintf(renderer->file, "\\pgfsetroundjoin\n");
+ case DIA_LINE_JOIN_ROUND:
+ fprintf (renderer->file, "\\pgfsetroundjoin\n");
break;
- case LINEJOIN_BEVEL:
- fprintf(renderer->file, "\\pgfsetbeveljoin\n");
+ case DIA_LINE_JOIN_BEVEL:
+ fprintf (renderer->file, "\\pgfsetbeveljoin\n");
break;
default:
- fprintf(renderer->file, "\\pgfsetmiterjoin\n");
+ fprintf (renderer->file, "\\pgfsetmiterjoin\n");
}
}
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index cba876465..a0bdfc4cd 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -183,28 +183,29 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
fprintf(renderer->file, "%d slc\n", ps_mode);
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- DiaPsRenderer *renderer = DIA_PS_RENDERER(self);
+ DiaPsRenderer *renderer = DIA_PS_RENDERER (self);
int ps_mode;
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- ps_mode = 0;
- break;
- case LINEJOIN_ROUND:
- ps_mode = 1;
- break;
- case LINEJOIN_BEVEL:
- ps_mode = 2;
- break;
- default:
- ps_mode = 0;
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ ps_mode = 0;
+ break;
+ case DIA_LINE_JOIN_ROUND:
+ ps_mode = 1;
+ break;
+ case DIA_LINE_JOIN_BEVEL:
+ ps_mode = 2;
+ break;
+ default:
+ ps_mode = 0;
}
- fprintf(renderer->file, "%d slj\n", ps_mode);
+ fprintf (renderer->file, "%d slj\n", ps_mode);
}
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index f04a0c46c..28845661f 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -77,7 +77,7 @@ static void begin_render(DiaRenderer *self, const DiaRectangle *update);
static void end_render(DiaRenderer *self);
static void set_linewidth(DiaRenderer *self, real linewidth);
static void set_linecaps(DiaRenderer *self, LineCaps mode);
-static void set_linejoin(DiaRenderer *self, LineJoin mode);
+static void set_linejoin (DiaRenderer *self, DiaLineJoin mode);
static void set_linestyle(DiaRenderer *self, DiaLineStyle mode, double dash_length);
static void set_fillstyle(DiaRenderer *self, FillStyle mode);
static void set_font(DiaRenderer *self, DiaFont *font, real height);
@@ -355,28 +355,29 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
fprintf(renderer->file, "\\setlinecaps{%d}\n", ps_mode);
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- PstricksRenderer *renderer = PSTRICKS_RENDERER(self);
- int ps_mode;
+ PstricksRenderer *renderer = PSTRICKS_RENDERER (self);
+ int ps_mode;
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- ps_mode = 0;
- break;
- case LINEJOIN_ROUND:
- ps_mode = 1;
- break;
- case LINEJOIN_BEVEL:
- ps_mode = 2;
- break;
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ ps_mode = 0;
+ break;
+ case DIA_LINE_JOIN_ROUND:
+ ps_mode = 1;
+ break;
+ case DIA_LINE_JOIN_BEVEL:
+ ps_mode = 2;
+ break;
default:
- ps_mode = 0;
- }
+ ps_mode = 0;
+ }
- fprintf(renderer->file, "\\setlinejoinmode{%d}\n", ps_mode);
+ fprintf (renderer->file, "\\setlinejoinmode{%d}\n", ps_mode);
}
diff --git a/plug-ins/python/pydia-render.c b/plug-ins/python/pydia-render.c
index 308e1488f..bbf01c3e4 100644
--- a/plug-ins/python/pydia-render.c
+++ b/plug-ins/python/pydia-render.c
@@ -242,25 +242,25 @@ set_linecaps (DiaRenderer *renderer, LineCaps mode)
/**
* set_linejoin:
* @renderer: the #DiaRenderer
- * @mode: the #LineJoin type
+ * @mode: the #DiaLineJoin type
*
* Set linejoin for later use
*
* Optional on the PyDia side.
*/
static void
-set_linejoin (DiaRenderer *renderer, LineJoin mode)
+set_linejoin (DiaRenderer *renderer, DiaLineJoin mode)
{
PyObject *func, *res, *arg, *self = PYDIA_RENDERER (renderer);
switch (mode) {
- case LINEJOIN_MITER:
+ case DIA_LINE_JOIN_MITER:
break;
- case LINEJOIN_ROUND:
+ case DIA_LINE_JOIN_ROUND:
break;
- case LINEJOIN_BEVEL:
+ case DIA_LINE_JOIN_BEVEL:
break;
- case LINEJOIN_DEFAULT:
+ case DIA_LINE_JOIN_DEFAULT:
default:
PyErr_Warn (PyExc_RuntimeWarning,
"DiaPyRenderer : Unsupported fill mode specified!\n");
diff --git a/plug-ins/svg/svg-import.c b/plug-ins/svg/svg-import.c
index 816297934..647596e94 100644
--- a/plug-ins/svg/svg-import.c
+++ b/plug-ins/svg/svg-import.c
@@ -575,7 +575,7 @@ apply_style (DiaObject *obj,
}
eprop = g_ptr_array_index(props,5);
- if (gs->linejoin != LINEJOIN_DEFAULT)
+ if (gs->linejoin != DIA_LINE_JOIN_DEFAULT)
eprop->enum_data = gs->linejoin;
else
eprop->common.experience |= PXP_NOTSET;
diff --git a/plug-ins/vdx/vdx-export.c b/plug-ins/vdx/vdx-export.c
index d987e37fc..4499500c8 100644
--- a/plug-ins/vdx/vdx-export.c
+++ b/plug-ins/vdx/vdx-export.c
@@ -87,7 +87,7 @@ struct _VDXRenderer
double linewidth;
LineCaps capsmode;
- LineJoin joinmode;
+ DiaLineJoin joinmode;
DiaLineStyle stylemode;
double dashlength;
FillStyle fillmode;
@@ -328,15 +328,14 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
renderer->capsmode = mode;
}
-/** Set line join
- * @param self a renderer
- * @param mode new line join
- */
+/**
+ * Set line join
+ */
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin(DiaRenderer *self, DiaLineJoin mode)
{
- VDXRenderer *renderer = VDX_RENDERER(self);
+ VDXRenderer *renderer = VDX_RENDERER (self);
renderer->joinmode = mode;
}
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index bcfeb7fcc..3e7e6cb1d 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -435,30 +435,33 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
}
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- WmfRenderer *renderer = WMF_RENDERER (self);
+ WmfRenderer *renderer = WMF_RENDERER (self);
- DIAG_NOTE(renderer, "set_join %d\n", mode);
+ DIAG_NOTE (renderer, "set_join %d\n", mode);
- if (!renderer->platform_is_nt)
- return;
+ if (!renderer->platform_is_nt) {
+ return;
+ }
- renderer->fnPenStyle &= ~(PS_JOIN_MASK);
- switch(mode) {
- case LINEJOIN_MITER:
+ renderer->fnPenStyle &= ~(PS_JOIN_MASK);
+
+ switch (mode) {
+ case DIA_LINE_JOIN_MITER:
renderer->fnPenStyle |= PS_JOIN_MITER;
break;
- case LINEJOIN_ROUND:
+ case DIA_LINE_JOIN_ROUND:
renderer->fnPenStyle |= PS_JOIN_ROUND;
break;
- case LINEJOIN_BEVEL:
+ case DIA_LINE_JOIN_BEVEL:
renderer->fnPenStyle |= PS_JOIN_BEVEL;
break;
default:
- g_warning("WmfRenderer : Unsupported fill mode specified!\n");
- }
+ g_warning ("WmfRenderer : Unsupported fill mode specified!\n");
+ }
}
diff --git a/plug-ins/wpg/wpg.c b/plug-ins/wpg/wpg.c
index dcce6986b..ac9b6c42b 100644
--- a/plug-ins/wpg/wpg.c
+++ b/plug-ins/wpg/wpg.c
@@ -365,21 +365,22 @@ set_linecaps(DiaRenderer *self, LineCaps mode)
}
}
+
static void
-set_linejoin(DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
- DIAG_NOTE(g_message("set_join %d", mode));
+ DIAG_NOTE (g_message ("set_join %d", mode));
- switch(mode) {
- case LINEJOIN_DEFAULT:
- case LINEJOIN_MITER:
- break;
- case LINEJOIN_ROUND:
- break;
- case LINEJOIN_BEVEL:
- break;
- default:
- g_warning("WpgRenderer : Unsupported line-join mode specified!\n");
+ switch (mode) {
+ case DIA_LINE_JOIN_DEFAULT:
+ case DIA_LINE_JOIN_MITER:
+ break;
+ case DIA_LINE_JOIN_ROUND:
+ break;
+ case DIA_LINE_JOIN_BEVEL:
+ break;
+ default:
+ g_warning ("WpgRenderer : Unsupported line-join mode specified!\n");
}
}
diff --git a/plug-ins/xfig/xfig-export.c b/plug-ins/xfig/xfig-export.c
index 0d58319c0..32c4e13f6 100644
--- a/plug-ins/xfig/xfig-export.c
+++ b/plug-ins/xfig/xfig-export.c
@@ -70,7 +70,7 @@ struct _DiaXfigRenderer {
double linewidth;
LineCaps capsmode;
- LineJoin joinmode;
+ DiaLineJoin joinmode;
DiaLineStyle stylemode;
double dashlength;
FillStyle fillmode;
@@ -499,7 +499,7 @@ set_linecaps (DiaRenderer *self, LineCaps mode)
static void
-set_linejoin (DiaRenderer *self, LineJoin mode)
+set_linejoin (DiaRenderer *self, DiaLineJoin mode)
{
DiaXfigRenderer *renderer = DIA_XFIG_RENDERER (self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
