From c26cb1e7e28316d2c062a313d3181d17e3a0cd00 Mon Sep 17 00:00:00 2001 From: Nicola Fontana Date: Mon, 9 Mar 2009 23:05:24 +0100 Subject: [PATCH] [ADG] Defined the CPML_DIR_... macros as ADG_DIR_... As in the previous commit the CPML_DIR_... macros were removed, now they are defined in the adg-util.h header. --- adg/adg-adim.c | 2 +- adg/adg-ldim.c | 4 ++-- adg/adg-util.h | 5 +++++ demo/adg-demo.c | 22 +++++++++++----------- demo/cpml-demo.c | 1 + demo/ldim.c | 4 ++-- docs/adg/adg-sections.txt | 5 +++++ docs/cpml/cpml-sections.txt | 4 ---- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/adg/adg-adim.c b/adg/adg-adim.c index 855f090a..d4015486 100644 --- a/adg/adg-adim.c +++ b/adg/adg-adim.c @@ -74,7 +74,7 @@ adg_adim_class_init(AdgADimClass *klass) param = g_param_spec_double("direction", P_("Direction"), P_("The inclination angle of the extension lines"), - -G_MAXDOUBLE, G_MAXDOUBLE, CPML_DIR_RIGHT, + -G_MAXDOUBLE, G_MAXDOUBLE, ADG_DIR_RIGHT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property(gobject_class, PROP_DIRECTION, param); } diff --git a/adg/adg-ldim.c b/adg/adg-ldim.c index 9784f872..625e4734 100644 --- a/adg/adg-ldim.c +++ b/adg/adg-ldim.c @@ -91,7 +91,7 @@ adg_ldim_class_init(AdgLDimClass *klass) param = g_param_spec_double("direction", P_("Direction"), P_("The inclination angle of the extension lines"), - -G_MAXDOUBLE, G_MAXDOUBLE, CPML_DIR_RIGHT, + -G_MAXDOUBLE, G_MAXDOUBLE, ADG_DIR_RIGHT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT); g_object_class_install_property(gobject_class, PROP_DIRECTION, param); } @@ -102,7 +102,7 @@ adg_ldim_init(AdgLDim *ldim) AdgLDimPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE(ldim, ADG_TYPE_LDIM, AdgLDimPrivate); - priv->direction = CPML_DIR_RIGHT; + priv->direction = ADG_DIR_RIGHT; priv->path.status = CAIRO_STATUS_INVALID_PATH_DATA; priv->path.data = priv->path_data; diff --git a/adg/adg-util.h b/adg/adg-util.h index a50dddda..ef772508 100644 --- a/adg/adg-util.h +++ b/adg/adg-util.h @@ -25,6 +25,11 @@ #include #include +#define ADG_DIR_RIGHT 0. +#define ADG_DIR_DOWN M_PI_2 +#define ADG_DIR_LEFT M_PI +#define ADG_DIR_UP (M_PI_2 * 3.) + #define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE) #define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_END #define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_END diff --git a/demo/adg-demo.c b/demo/adg-demo.c index 47a4a036..9ebb0e47 100644 --- a/demo/adg-demo.c +++ b/demo/adg-demo.c @@ -165,14 +165,14 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) /* LD2 */ entity = adg_ldim_new_full_explicit(A - B - LD2, -D1 / 2.0, A - B, - -D3 / 2.0 + CHAMFER, CPML_DIR_UP, 0.0, + -D3 / 2.0 + CHAMFER, ADG_DIR_UP, 0.0, -D3 / 2.0); adg_container_add(ADG_CONTAINER(canvas), entity); /* LD3 */ entity = adg_ldim_new_full_explicit(A - B, -D3 / 2.0 + CHAMFER, A - B + LD3, - -D3 / 2.0 + CHAMFER, CPML_DIR_UP, 0.0, + -D3 / 2.0 + CHAMFER, ADG_DIR_UP, 0.0, -D3 / 2.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -182,14 +182,14 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) /* B */ entity = adg_ldim_new_full_explicit(A - B, D3 / 2.0 - CHAMFER, A, D7 / 2.0, - CPML_DIR_DOWN, 0.0, D3 / 2.0); + ADG_DIR_DOWN, 0.0, D3 / 2.0); adg_dim_set_tolerances(ADG_DIM(entity), "+0.1", NULL); adg_container_add(ADG_CONTAINER(canvas), entity); /* A */ entity = adg_ldim_new_full_explicit(0.0, D1 / 2.0, A, D7 / 2.0, - CPML_DIR_DOWN, 0.0, D3 / 2.0); + ADG_DIR_DOWN, 0.0, D3 / 2.0); adg_dim_set_tolerances(ADG_DIM(entity), "+0.05", "-0.05"); adg_dim_set_level(ADG_DIM(entity), 2.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -201,7 +201,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) x = A - B + LD3 - CHAMFER; entity = adg_ldim_new_full_explicit(x, -D3 / 2.0, x, D3 / 2.0, - CPML_DIR_RIGHT, A, 0.0); + ADG_DIR_RIGHT, A, 0.0); adg_dim_set_tolerances(ADG_DIM(entity), "-0.25", NULL); adg_dim_set_level(ADG_DIM(entity), 5.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -210,7 +210,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) x = A - C + LD6; entity = adg_ldim_new_full_explicit(x, -D6 / 2.0, x, D6 / 2.0, - CPML_DIR_RIGHT, A, 0.0); + ADG_DIR_RIGHT, A, 0.0); adg_dim_set_tolerances(ADG_DIM(entity), "-0.1", NULL); adg_dim_set_level(ADG_DIM(entity), 4.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -219,7 +219,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) x = A - C - LD5; entity = adg_ldim_new_full_explicit(x, -D4 / 2.0, x, D4 / 2.0, - CPML_DIR_RIGHT, A, 0.0); + ADG_DIR_RIGHT, A, 0.0); adg_dim_set_level(ADG_DIM(entity), 3.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -227,7 +227,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) x = A - C; entity = adg_ldim_new_full_explicit(x, -D5 / 2.0, x, D5 / 2.0, - CPML_DIR_RIGHT, A, 0.0); + ADG_DIR_RIGHT, A, 0.0); adg_dim_set_tolerances(ADG_DIM(entity), "-0.1", NULL); adg_dim_set_level(ADG_DIM(entity), 2.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -235,7 +235,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) /* D7 */ entity = adg_ldim_new_full_explicit(A, -D7 / 2.0, A, D7 / 2.0, - CPML_DIR_RIGHT, A, 0.0); + ADG_DIR_RIGHT, A, 0.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -244,7 +244,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) /* D1 */ entity = adg_ldim_new_full_explicit(0.0, -D1 / 2.0, 0.0, D1 / 2.0, - CPML_DIR_LEFT, 0.0, 0.0); + ADG_DIR_LEFT, 0.0, 0.0); adg_dim_set_tolerances(ADG_DIM(entity), "+0.05", "-0.05"); adg_dim_set_level(ADG_DIM(entity), 2.0); adg_container_add(ADG_CONTAINER(canvas), entity); @@ -254,7 +254,7 @@ add_piston_dimensions(AdgCanvas *canvas, Piston *piston) x = A - B - LD2 + y * G_SQRT3; entity = adg_ldim_new_full_explicit(x, -D2 / 2.0, x, D2 / 2.0, - CPML_DIR_LEFT, 0.0, 0.0); + ADG_DIR_LEFT, 0.0, 0.0); adg_dim_set_tolerances(ADG_DIM(entity), "-0.1", NULL); adg_container_add(ADG_CONTAINER(canvas), entity); } diff --git a/demo/cpml-demo.c b/demo/cpml-demo.c index e95bc1c6..cb9c54bb 100644 --- a/demo/cpml-demo.c +++ b/demo/cpml-demo.c @@ -1,6 +1,7 @@ #include #include #include +#include static gchar * find_data_file (const gchar *file); diff --git a/demo/ldim.c b/demo/ldim.c index 4e04b96c..8484f44c 100644 --- a/demo/ldim.c +++ b/demo/ldim.c @@ -28,11 +28,11 @@ main(gint argc, gchar ** argv) adg_container_add(ADG_CONTAINER(canvas), entity); /* Add the north quotes */ - entity = adg_ldim_new_full_explicit(2., -10., 8., -10., CPML_DIR_UP, + entity = adg_ldim_new_full_explicit(2., -10., 8., -10., ADG_DIR_UP, 0.0, -10.); adg_container_add(ADG_CONTAINER(canvas), entity); - entity = adg_ldim_new_full_explicit(0., -5., 10., -5., CPML_DIR_UP, + entity = adg_ldim_new_full_explicit(0., -5., 10., -5., ADG_DIR_UP, 0.0, -10.); adg_dim_set_level(ADG_DIM(entity), 2); adg_container_add(ADG_CONTAINER(canvas), entity); diff --git a/docs/adg/adg-sections.txt b/docs/adg/adg-sections.txt index d507b7df..bb9c6b61 100644 --- a/docs/adg/adg-sections.txt +++ b/docs/adg/adg-sections.txt @@ -537,6 +537,11 @@ ADG_ADIM_GET_CLASS
util adg/adg.h +ADG_DIR_RIGHT +ADG_DIR_DOWN +ADG_DIR_LEFT +ADG_DIR_UP + ADG_SET ADG_UNSET ADG_ISSET diff --git a/docs/cpml/cpml-sections.txt b/docs/cpml/cpml-sections.txt index 96aaa9b0..acd792f0 100644 --- a/docs/cpml/cpml-sections.txt +++ b/docs/cpml/cpml-sections.txt @@ -2,10 +2,6 @@ macros cpml/cpml.h CPML_GNUC_CONST -CPML_DIR_RIGHT -CPML_DIR_DOWN -CPML_DIR_LEFT -CPML_DIR_UP
-- 2.11.4.GIT