adg-canvas.h   adg-canvas.h 
skipping to change at line 35 skipping to change at line 35
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_CANVAS (adg_canvas_get_type ()) #define ADG_TYPE_CANVAS (adg_canvas_get_type ())
#define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_CANVAS, AdgCanvas)) #define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_CANVAS, AdgCanvas))
#define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_CANVAS, AdgCanvasClass)) #define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_CANVAS, AdgCanvasClass))
#define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_CANVAS)) #define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_CANVAS))
#define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_CANVAS)) #define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_CANVAS))
#define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_CANVAS, AdgCanvasClass)) #define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_CANVAS, AdgCanvasClass))
/* AdgCanvas declared in adgentity.h */ /* AdgCanvas declared in adg-entity.h */
typedef struct _AdgCanvasClass AdgCanvasClass; typedef struct _AdgCanvasClass AdgCanvasClass;
typedef struct _AdgCanvasPrivate AdgCanvasPrivate; typedef struct _AdgCanvasPrivate AdgCanvasPrivate;
struct _AdgCanvas struct _AdgCanvas
{ {
AdgContainer container; AdgContainer container;
/*< private >*/ /*< private >*/
AdgCanvasPrivate *priv; AdgCanvasPrivate *priv;
}; };
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-dim.h   adg-dim.h 
skipping to change at line 52 skipping to change at line 52
/*< private >*/ /*< private >*/
AdgDimPrivate *priv; AdgDimPrivate *priv;
}; };
struct _AdgDimClass struct _AdgDimClass
{ {
AdgEntityClass parent_class; AdgEntityClass parent_class;
/* Virtual Table */ /* Virtual Table */
gchar * (*default_label) (AdgDim *di gchar * (*default_quote) (AdgDim *di
m); m);
void (*label_layout) (AdgDim *di void (*quote_layout) (AdgDim *di
m, m,
cairo_t *cr ); cairo_t *cr );
}; };
GType adg_dim_get_type (void) G_GNUC_CONST ; GType adg_dim_get_type (void) G_GNUC_CONST ;
const AdgPair * adg_dim_get_ref1 (AdgDim *di m); const AdgPair * adg_dim_get_ref1 (AdgDim *di m);
const AdgPair * adg_dim_get_ref2 (AdgDim *di m); const AdgPair * adg_dim_get_ref2 (AdgDim *di m);
void adg_dim_set_ref (AdgDim *di m, void adg_dim_set_ref (AdgDim *di m,
const AdgPair *re f1, const AdgPair *re f1,
const AdgPair *re f2); const AdgPair *re f2);
skipping to change at line 82 skipping to change at line 82
AdgPair *po s1, AdgPair *po s1,
AdgPair *po s2); AdgPair *po s2);
void adg_dim_set_pos_explicit (AdgDim *di m, void adg_dim_set_pos_explicit (AdgDim *di m,
double po s1_x, double po s1_x,
double po s1_y, double po s1_y,
double po s2_x, double po s2_x,
double po s2_y); double po s2_y);
double adg_dim_get_level (AdgDim *di m); double adg_dim_get_level (AdgDim *di m);
void adg_dim_set_level (AdgDim *di m, void adg_dim_set_level (AdgDim *di m,
double le vel); double le vel);
const gchar * adg_dim_get_label (AdgDim *di const gchar * adg_dim_get_quote (AdgDim *di
m); m);
void adg_dim_set_label (AdgDim *di void adg_dim_set_quote (AdgDim *di
m, m,
const gchar *la const gchar *qu
bel); ote);
const gchar * adg_dim_get_tolerance_up (AdgDim *di m); const gchar * adg_dim_get_tolerance_up (AdgDim *di m);
void adg_dim_set_tolerance_up (AdgDim *di m, void adg_dim_set_tolerance_up (AdgDim *di m,
const gchar *to lerance_up); const gchar *to lerance_up);
const gchar * adg_dim_get_tolerance_down (AdgDim *di m); const gchar * adg_dim_get_tolerance_down (AdgDim *di m);
void adg_dim_set_tolerance_down (AdgDim *di m, void adg_dim_set_tolerance_down (AdgDim *di m,
const gchar *to lerance_down); const gchar *to lerance_down);
void adg_dim_set_tolerances (AdgDim *di m, void adg_dim_set_tolerances (AdgDim *di m,
const gchar *to lerance_up, const gchar *to lerance_up,
const gchar *to lerance_down); const gchar *to lerance_down);
const gchar * adg_dim_get_note (AdgDim *di m); const gchar * adg_dim_get_note (AdgDim *di m);
 End of changes. 2 change blocks. 
10 lines changed or deleted 10 lines changed or added


 adg-entity.h   adg-entity.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __ADG_ENTITY_H__ #ifndef __ADG_ENTITY_H__
#define __ADG_ENTITY_H__ #define __ADG_ENTITY_H__
#include <adg/adg-context.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-style.h> #include <adg/adg-line-style.h>
#include <adg/adg-font-style.h>
#include <adg/adg-arrow-style.h>
#include <adg/adg-dim-style.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* Forward declarations */ /* Forward declarations */
typedef struct _AdgCanvas AdgCanvas; typedef struct _AdgCanvas AdgCanvas;
#define ADG_TYPE_ENTITY (adg_entity_get_type ()) #define ADG_TYPE_ENTITY (adg_entity_get_type ())
#define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_ENTITY, AdgEntity)) #define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_ENTITY, AdgEntity))
#define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_ENTITY, AdgEntityClass))
#define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_ENTITY)) #define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_ENTITY))
skipping to change at line 63 skipping to change at line 67
/* Signals */ /* Signals */
void (*model_matrix_changed) (AdgEntity *ent ity, void (*model_matrix_changed) (AdgEntity *ent ity,
AdgMatrix *par ent_matrix); AdgMatrix *par ent_matrix);
void (*paper_matrix_changed) (AdgEntity *ent ity, void (*paper_matrix_changed) (AdgEntity *ent ity,
AdgMatrix *par ent_matrix); AdgMatrix *par ent_matrix);
void (*render) (AdgEntity *ent ity, void (*render) (AdgEntity *ent ity,
cairo_t *cr) ; cairo_t *cr) ;
/* Virtual Table */ /* Virtual Table */
const AdgLineStyle * (*get_line_style) (AdgEntity *ent
ity);
void (*set_line_style) (AdgEntity *ent
ity,
AdgLineStyle *lin
e_style);
const AdgFontStyle * (*get_font_style) (AdgEntity *ent
ity);
void (*set_font_style) (AdgEntity *ent
ity,
AdgFontStyle *fon
t_style);
const AdgArrowStyle * (*get_arrow_style) (AdgEntity
*entity);
void (*set_arrow_style) (AdgEntity *ent
ity,
AdgArrowStyle *arr
ow_style);
const AdgDimStyle * (*get_dim_style) (AdgEntity *ent
ity);
void (*set_dim_style) (AdgEntity *ent
ity,
AdgDimStyle *dim
_style);
const AdgMatrix * (*get_model_matrix) (AdgEntity *ent ity); const AdgMatrix * (*get_model_matrix) (AdgEntity *ent ity);
const AdgMatrix * (*get_paper_matrix) (AdgEntity *ent ity); const AdgMatrix * (*get_paper_matrix) (AdgEntity *ent ity);
}; };
#define ADG_CALLBACK(f) ((AdgCallback) (f)) #define ADG_CALLBACK(f) ((AdgCallback) (f))
typedef void (*AdgCallback) (AdgEntity *entity, gpointer user_data); typedef void (*AdgCallback) (AdgEntity *entity, gpointer user_data);
GType adg_entity_get_type (void) G_GNUC_CONST; GType adg_entity_get_type (void) G_GNUC_CONST;
AdgCanvas * adg_entity_get_canvas (AdgEntity *ent ity); AdgCanvas * adg_entity_get_canvas (AdgEntity *ent ity);
AdgContext * adg_entity_get_context (AdgEntity *ent
ity);
void adg_entity_set_context (AdgEntity *ent
ity,
AdgContext *con
text);
const AdgMatrix * adg_entity_get_model_matrix (AdgEntity *ent ity); const AdgMatrix * adg_entity_get_model_matrix (AdgEntity *ent ity);
const AdgMatrix * adg_entity_get_paper_matrix (AdgEntity *ent ity); const AdgMatrix * adg_entity_get_paper_matrix (AdgEntity *ent ity);
void adg_entity_model_matrix_changed (AdgEntity *ent ity, void adg_entity_model_matrix_changed (AdgEntity *ent ity,
const AdgMatrix*par ent_matrix); const AdgMatrix*par ent_matrix);
void adg_entity_paper_matrix_changed (AdgEntity *ent ity, void adg_entity_paper_matrix_changed (AdgEntity *ent ity,
const AdgMatrix*par ent_matrix); const AdgMatrix*par ent_matrix);
const AdgLineStyle * adg_entity_get_line_style (AdgEntity *ent AdgStyle * adg_entity_get_style (AdgEntity *ent
ity); ity,
void adg_entity_set_line_style (AdgEntity *ent AdgStyleSlot sty
ity, le_slot);
AdgLineStyle *lin void adg_entity_apply (AdgEntity *ent
e_style); ity,
const AdgFontStyle * adg_entity_get_font_style (AdgEntity *ent AdgStyleSlot sty
ity); le_slot,
void adg_entity_set_font_style (AdgEntity *ent cairo_t *cr)
ity, ;
AdgFontStyle *fon
t_style);
const AdgArrowStyle * adg_entity_get_arrow_style (AdgEntity *ent
ity);
void adg_entity_set_arrow_style (AdgEntity *ent
ity,
AdgArrowStyle *arr
ow_style);
const AdgDimStyle * adg_entity_get_dim_style (AdgEntity *ent
ity);
void adg_entity_set_dim_style (AdgEntity *ent
ity,
AdgDimStyle *dim
_style);
gboolean adg_entity_model_matrix_applied (AdgEntity *ent ity); gboolean adg_entity_model_matrix_applied (AdgEntity *ent ity);
gboolean adg_entity_paper_matrix_applied (AdgEntity *ent ity); gboolean adg_entity_paper_matrix_applied (AdgEntity *ent ity);
gboolean adg_entity_model_applied (AdgEntity *ent ity); gboolean adg_entity_model_applied (AdgEntity *ent ity);
void adg_entity_render (AdgEntity *ent ity, void adg_entity_render (AdgEntity *ent ity,
cairo_t *cr) ; cairo_t *cr) ;
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENTITY_H__ */ #endif /* __ADG_ENTITY_H__ */
 End of changes. 5 change blocks. 
49 lines changed or deleted 22 lines changed or added


 adg-pair.h   adg-pair.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __ADG_PAIR_H__ #ifndef __ADG_PAIR_H__
#define __ADG_PAIR_H__ #define __ADG_PAIR_H__
#include <adg/adg-matrix.h> #include <cpml/cpml.h>
#include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_PAIR (adg_pair_get_type ()) #define ADG_TYPE_PAIR (adg_pair_get_type ())
/** typedef CpmlPair AdgPair;
* adg_pair_unset:
* @pair: an #AdgPair structure
*
* Unsets @pair, so its content is no more valid. Use adg_pair_is_set() to
* check if the pair is valid.
*/
#define adg_pair_unset(pair) adg_pair_set_explicit ((pair), ADG_NAN, ADG
_NAN)
/**
* adg_pair_is_set:
* @pair: an #AdgPair
*
* Checks if @pair is a valid pair. A pair is invalid when one or both its
xy
* components are equal to #ADG_NAN.
*
* For performance reasons, this function is implemented as a macro.
*/
#define adg_pair_is_set(pair) \
((pair) != NULL && !adg_isnan ((pair)->x) && !adg_isnan ((pair)->y))
typedef struct _AdgPair AdgPair;
typedef struct _AdgPair AdgVector;
struct _AdgPair
{
double x;
double y;
};
GType adg_pair_get_type (void) G_GNUC_CONST
;
AdgPair * adg_pair_dup (const AdgPair *pa
ir);
AdgPair * adg_pair_set (AdgPair *pa
ir,
const AdgPair *sr
c);
AdgPair * adg_pair_set_explicit (AdgPair *pa
ir,
double x,
double y)
;
double adg_pair_get_squared_length (const AdgPair *pa
ir);
double adg_pair_get_length (const AdgPair *pa
ir);
double adg_pair_get_angle (const AdgPair *pa
ir);
AdgPair * adg_pair_add (AdgPair *pa
ir,
const AdgPair *pa
ir2);
AdgPair * adg_pair_sub (AdgPair *pa
ir,
const AdgPair *pa
ir2);
AdgPair * adg_pair_mul (AdgPair *pa
ir,
const AdgPair *pa
ir2);
AdgPair * adg_pair_scale (AdgPair *pa
ir,
double sc
ale);
AdgPair * adg_pair_mid (AdgPair *pa
ir,
const AdgPair *pa
ir2);
AdgPair * adg_pair_transform (AdgPair *pa
ir,
const AdgMatrix*ma
trix);
AdgPair * adg_pair_scale_and_transform (AdgPair *pa
ir,
double sc
ale,
const AdgMatrix*ma
trix);
AdgPair * adg_pair_intersection (AdgPair *pa
ir,
const AdgVector*ve
ctor,
const AdgPair *pa
ir2,
const AdgVector*ve
ctor2);
AdgPair * adg_pair_projection (AdgPair *pa
ir,
const AdgPair *pa
ir2,
const AdgVector*ve
ctor2);
AdgVector * adg_vector_set_with_pair (AdgVector *ve
ctor,
const AdgPair *pa
ir);
AdgVector * adg_vector_set_with_angle (AdgVector *ve
ctor,
double an
gle);
AdgVector * adg_vector_normal (AdgVector *ve GType adg_pair_get_type (void) G_GNUC_CONST;
ctor); AdgPair * adg_pair_dup (const AdgPair *pair);
G_END_DECLS G_END_DECLS
#endif /* __ADG_PAIR_H__ */ #endif /* __ADG_PAIR_H__ */
 End of changes. 3 change blocks. 
112 lines changed or deleted 5 lines changed or added


 adg-style.h   adg-style.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __ADG_STYLE_H__ #ifndef __ADG_STYLE_H__
#define __ADG_STYLE_H__ #define __ADG_STYLE_H__
#include <glib-object.h> #include <adg/adg-pattern.h>
#include <cairo.h>
#include <adg/adg-pair.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_LINE_STYLE (adg_line_style_get_type ()) #define ADG_TYPE_STYLE (adg_style_get_type ())
#define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_
typedef struct _AdgLineStyle AdgLineStyle; TYPE_STYLE, AdgStyle))
#define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_T
struct _AdgLineStyle YPE_STYLE, AdgStyleClass))
{ #define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_
double width; TYPE_STYLE))
cairo_line_cap_t cap; #define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T
cairo_line_join_t join; YPE_STYLE))
double *dashes; /* Dash style */ #define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T
int num_dashes; YPE_STYLE, AdgStyleClass))
double dash_offset;
};
/**
* AdgLineStyleId:
* @ADG_LINE_STYLE_DRAW: normal drawing
* @ADG_LINE_STYLE_CENTER: axis and center-lines
* @ADG_LINE_STYLE_HIDDEN: covered entities
* @ADG_LINE_STYLE_XATCH: xatches
* @ADG_LINE_STYLE_DIM: extension and base lines of dimension entities
* @ADG_LINE_STYLE_LAST: start of user-defined styles
*
* Numeric representation of line styles.
* Some standard line styles are predefined.
*/
typedef enum
{
ADG_LINE_STYLE_DRAW,
ADG_LINE_STYLE_CENTER,
ADG_LINE_STYLE_HIDDEN,
ADG_LINE_STYLE_XATCH,
ADG_LINE_STYLE_DIM,
ADG_LINE_STYLE_LAST
} AdgLineStyleId;
GType adg_line_style_get_type (void) G_GNUC_CONST;
AdgLineStyle * adg_line_style_from_id (AdgLineStyleId id);
AdgLineStyleId adg_line_style_register (AdgLineStyle *new_style)
;
void adg_line_style_apply (const AdgLineStyle *style,
cairo_t *cr);
#define ADG_TYPE_FONT_STYLE (adg_font_style_get_type ())
typedef struct _AdgFontStyle AdgFontStyle;
struct _AdgFontStyle typedef struct _AdgStyle AdgStyle;
{ typedef struct _AdgStyleClass AdgStyleClass;
char *family; typedef struct _AdgStylePrivate AdgStylePrivate;
cairo_font_slant_t slant; typedef gint AdgStyleId;
cairo_font_weight_t weight; typedef gint AdgStyleSlot;
double size;
cairo_antialias_t antialias;
cairo_subpixel_order_t subpixel_order;
cairo_hint_style_t hint_style;
cairo_hint_metrics_t hint_metrics;
};
/** struct _AdgStyle
* AdgFontStyleId:
*
* Numeric representation of font styles.
* Some standard font styles are predefined.
*/
typedef enum
{ {
ADG_FONT_STYLE_TEXT, GObject object;
ADG_FONT_STYLE_DIMLABEL,
ADG_FONT_STYLE_DIMTOLERANCE,
ADG_FONT_STYLE_DIMNOTE,
ADG_FONT_STYLE_LAST
} AdgFontStyleId;
GType adg_font_style_get_type (void) G_GNUC_CONST;
AdgFontStyle * adg_font_style_from_id (AdgFontStyleId id);
AdgFontStyleId adg_font_style_register (AdgFontStyle *new_style)
;
void adg_font_style_apply (const AdgFontStyle *style,
cairo_t *cr);
#define ADG_TYPE_ARROW_STYLE (adg_arrow_style_get_type ())
typedef struct _AdgArrowStyle AdgArrowStyle;
/**
* AdgArrowRenderFunc:
* @cr: a #cairo_t drawing context
* @arrow_style: the #AdgArrowStyle structure
* @poi: point of interest
* @path_data: data of the path to follow
*
* Callback that renders the arrow with the specified @arrow_style followin
g
* the @path_data path.
*/
typedef void (*AdgArrowRenderFunc) (cairo_t *cr,
AdgArrowStyle *arrow_style,
AdgPair *poi,
cairo_path_data_t *path_data);
struct _AdgArrowStyle /*< private >*/
{ AdgStylePrivate *priv;
double size;
double angle;
double margin;
gboolean need_path;
AdgArrowRenderFunc render_func;
}; };
/** struct _AdgStyleClass
* AdgArrowStyleId:
* @ADG_ARROW_STYLE_ARROW: the classic arrow to use in technical drawings
* @ADG_ARROW_STYLE_TRIANGLE: same as above, but not filled
* @ADG_ARROW_STYLE_DOT: a little size filled circle
* @ADG_ARROW_STYLE_TICK: an architetural tick
* @ADG_ARROW_STYLE_CIRCLE: a medium size empty circle
* @ADG_ARROW_STYLE_SQUARE: a medium size empty square
* @ADG_ARROW_STYLE_LAST: start of user-defined styles
*
* Numeric representation of arrow styles.
* Some standard arrow styles are predefined.
*/
typedef enum
{
ADG_ARROW_STYLE_ARROW,
ADG_ARROW_STYLE_TRIANGLE,
ADG_ARROW_STYLE_DOT,
ADG_ARROW_STYLE_CIRCLE,
ADG_ARROW_STYLE_SQUARE,
ADG_ARROW_STYLE_TICK,
ADG_ARROW_STYLE_LAST
} AdgArrowStyleId;
typedef enum
{
ADG_PATH_POINT_START,
ADG_PATH_POINT_MIDDLE,
ADG_PATH_POINT_END
} AdgPathPoint;
GType adg_arrow_style_get_type(void) G_GNUC_CONST;
AdgArrowStyle * adg_arrow_style_from_id (AdgArrowStyleId id);
AdgArrowStyleId adg_arrow_style_register(AdgArrowStyle *new_style);
void adg_arrow_render (cairo_t *cr,
AdgArrowStyle *arrow_style,
cairo_path_t *path,
AdgPathPoint path_point);
#define ADG_TYPE_DIM_STYLE (adg_dim_style_get_type ())
typedef struct _AdgDimStyle AdgDimStyle;
struct _AdgDimStyle
{ {
cairo_pattern_t *pattern; GObjectClass parent_class;
AdgFontStyle *label_style;
AdgFontStyle *tolerance_style;
AdgFontStyle *note_style;
AdgLineStyle *line_style;
AdgArrowStyle *arrow_style;
double from_offset;
double to_offset;
double baseline_spacing;
AdgPair quote_offset;
AdgPair tolerance_offset;
double tolerance_spacing;
AdgPair note_offset;
gchar *measure_format; /* Virtual table */
gchar *measure_tag; GPtrArray * (*get_pool) (void);
void (*apply) (AdgStyle *style,
cairo_t *cr);
}; };
/** GType adg_style_get_type (void) G_GNUC_CONST;
* AdgDimStyleId: AdgStyleId adg_style_register_id (AdgStyle *style);
* @ADG_DIM_STYLE_ISO: ISO standard AdgStyle * adg_style_from_id (GType type,
* @ADG_DIM_STYLE_LAST: start of user-defined styles AdgStyleId id);
* AdgStyle * adg_style_get_default (AdgStyleClass *klass);
* Numeric representation of dimension styles.
* Some standard dimension styles are predefined.
*/
typedef enum
{
ADG_DIM_STYLE_ISO,
ADG_DIM_STYLE_LAST
} AdgDimStyleId;
GType adg_dim_style_get_type (void) G_GNUC_CONST; void adg_style_apply (AdgStyle *style,
AdgDimStyle * adg_dim_style_from_id (AdgDimStyleId id); cairo_t *cr);
AdgDimStyleId adg_dim_style_register (AdgDimStyle *new_style); const AdgPattern * adg_style_get_pattern (AdgStyle *style);
void adg_style_set_pattern (AdgStyle *style,
AdgPattern *pattern);
G_END_DECLS G_END_DECLS
#endif /* __ADG_STYLE_H__ */ #endif /* __ADG_STYLE_H__ */
 End of changes. 11 change blocks. 
185 lines changed or deleted 37 lines changed or added


 adg-type-builtins.h   adg-type-builtins.h 
#ifndef __ADG_TYPE_BUILTINS_H__ #ifndef __ADG_TYPE_BUILTINS_H__
#define __ADG_TYPE_BUILTINS_H__ #define __ADG_TYPE_BUILTINS_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* enumerations from "adg-style.h" */ /* enumerations from "adg-enums.h" */
GType adg_line_style_id_get_type (void) G_GNUC_CONST; GType adg_line_style_id_get_type (void) G_GNUC_CONST;
#define ADG_TYPE_LINE_STYLE_ID (adg_line_style_id_get_type()) #define ADG_TYPE_LINE_STYLE_ID (adg_line_style_id_get_type())
GType adg_font_style_id_get_type (void) G_GNUC_CONST; GType adg_font_style_id_get_type (void) G_GNUC_CONST;
#define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type()) #define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type())
GType adg_arrow_style_id_get_type (void) G_GNUC_CONST; GType adg_arrow_style_id_get_type (void) G_GNUC_CONST;
#define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type()) #define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type())
GType adg_path_point_get_type (void) G_GNUC_CONST;
#define ADG_TYPE_PATH_POINT (adg_path_point_get_type())
GType adg_dim_style_id_get_type (void) G_GNUC_CONST; GType adg_dim_style_id_get_type (void) G_GNUC_CONST;
#define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type()) #define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type())
G_END_DECLS G_END_DECLS
#endif /* __ADG_TYPE_BUILTINS_H__ */ #endif /* __ADG_TYPE_BUILTINS_H__ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 adg-util.h   adg-util.h 
skipping to change at line 35 skipping to change at line 35
#include <math.h> #include <math.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE) #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_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_END
#define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_EN D #define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_EN D
#define ADG_CHECKPOINT_WITH_MESSAGE(message) \ #define ADG_CHECKPOINT_WITH_MESSAGE(message) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"file %s: line %d: %s", \ "file `%s' at line %d: %s", \
__FILE__, __LINE__, #message) __FILE__, __LINE__, #message)
#define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point") #define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point")
#ifdef __GNUC__
#define ADG_STUB() g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"%s: stub", __PRETTY_FUNCTION__)
#else /* !__GNUC__ */
#define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub") #define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub")
#endif /* __GNUC__ */
#ifdef NAN
#define ADG_NAN NAN
#define adg_isnan(n) ((gboolean) (isnan (n) != 0))
#else /* !NAN */
#define ADG_NAN (adg_nan ())
double adg_nan (void) G_GNUC_CONST
;
gboolean adg_isnan (double va
lue);
#endif /* NAN */
#define ADG_DIR_NONE ADG_NAN
#define ADG_DIR_RIGHT 0.0
#define ADG_DIR_UP (3.0 * G_PI_2)
#define ADG_DIR_LEFT G_PI
#define ADG_DIR_DOWN G_PI_2
gboolean adg_cairo_path_data_start_point (cairo_path_data_t
*pa
th_data,
double *p_
x,
double *p_
y);
gboolean adg_cairo_path_data_end_point (cairo_path_data_t
*pa
th_data,
double *p_
x,
double *p_
y);
cairo_path_data_t * adg_cairo_path_tail (cairo_path_t *pa
th);
G_END_DECLS G_END_DECLS
#endif /* __ADG_UTIL_H__ */ #endif /* __ADG_UTIL_H__ */
 End of changes. 3 change blocks. 
48 lines changed or deleted 1 lines changed or added


 adg.h   adg.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef __ADG_H__ #ifndef __ADG_H__
#define __ADG_H__ #define __ADG_H__
#include <adg/adg-adim.h> #include <adg/adg-adim.h>
#include <adg/adg-canvas.h> #include <adg/adg-canvas.h>
#include <adg/adg-container.h> #include <adg/adg-container.h>
#include <adg/adg-dim.h> #include <adg/adg-dim.h>
#include <adg/adg-entity.h> #include <adg/adg-entity.h>
#include <adg/adg-enums.h>
#include <adg/adg-ldim.h> #include <adg/adg-ldim.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-model.h> #include <adg/adg-model.h>
#include <adg/adg-pair.h> #include <adg/adg-pair.h>
#include <adg/adg-path.h> #include <adg/adg-path.h>
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-type-builtins.h> #include <adg/adg-type-builtins.h>
#include <adg/adg-util.h> #include <adg/adg-util.h>
#endif /* __ADG_H__ */ #endif /* __ADG_H__ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/