From a5bbd6cf2a4c4ce58cf833664a3b843f48cf318b Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Thu, 13 Aug 2009 11:11:06 +0200
Subject: [PATCH] [AdgEntity] -adg_entity_scale_to_{model,paper}()

Started cleaning up process: removed this too specific API.
---
 adg/adg-dim.c    | 17 ++++++++++++-----
 adg/adg-entity.c | 50 --------------------------------------------------
 adg/adg-entity.h |  4 ----
 3 files changed, 12 insertions(+), 59 deletions(-)

diff --git a/adg/adg-dim.c b/adg/adg-dim.c
index 7c3f173f..21f561b2 100644
--- a/adg/adg-dim.c
+++ b/adg/adg-dim.c
@@ -876,25 +876,32 @@ void
 adg_dim_render_quote(AdgDim *dim, cairo_t *cr)
 {
     AdgDimPrivate *data;
+    AdgEntity *entity;
     AdgDimStyle *dim_style;
+    const AdgMatrix *paper;
+    cairo_matrix_t matrix;
 
     g_return_if_fail(ADG_IS_DIM(dim));
 
     data = dim->data;
-    dim_style = (AdgDimStyle *) adg_entity_get_style((AdgEntity *) dim,
-                                                     ADG_SLOT_DIM_STYLE);
+    entity = (AdgEntity *) dim;
+    dim_style = (AdgDimStyle *) adg_entity_get_style(entity, ADG_SLOT_DIM_STYLE);
+    paper = adg_entity_get_paper_matrix(entity);
 
     if (data->quote == NULL)
         adg_dim_set_quote(dim, ADG_DIM_GET_CLASS(dim)->default_quote(dim));
 
     cairo_save(cr);
 
-    cairo_set_matrix(cr, adg_entity_get_paper_matrix((AdgEntity *) dim));
+    cairo_set_matrix(cr, paper);
     ADG_DIM_GET_CLASS(dim)->quote_layout(dim, cr);
-    cairo_set_matrix(cr, adg_entity_get_model_matrix((AdgEntity *) dim));
+    cairo_set_matrix(cr, adg_entity_get_model_matrix(entity));
 
     cairo_translate(cr, data->org.x, data->org.y);
-    adg_entity_scale_to_paper((AdgEntity *) dim, cr);
+    cairo_get_matrix(cr, &matrix);
+    matrix.xx = paper->xx;
+    matrix.yy = paper->yy;
+    cairo_set_matrix(cr, &matrix);
     cairo_rotate(cr, -data->angle);
 
     /* Rendering quote */
diff --git a/adg/adg-entity.c b/adg/adg-entity.c
index 60f8df3c..5aa9f5d7 100644
--- a/adg/adg-entity.c
+++ b/adg/adg-entity.c
@@ -472,56 +472,6 @@ adg_entity_get_paper_matrix(AdgEntity *entity)
 }
 
 /**
- * adg_entity_scale_to_model:
- * @entity: an #AdgEntity object
- * @cr: a #cairo_t drawing context
- *
- * Sets the model matrix as current matrix on @cr. The translation
- * and rotation component of the previous matrix are kept: only the
- * scale is changed.
- **/
-void
-adg_entity_scale_to_model(AdgEntity *entity, cairo_t *cr)
-{
-    const AdgMatrix *model_matrix;
-    cairo_matrix_t matrix;
-
-    g_return_if_fail(ADG_IS_ENTITY(entity));
-
-    model_matrix = ADG_ENTITY_GET_CLASS(entity)->get_model_matrix(entity);
-    cairo_get_matrix(cr, &matrix);
-
-    matrix.xx = model_matrix->xx;
-    matrix.yy = model_matrix->yy;
-    cairo_set_matrix(cr, &matrix);
-}
-
-/**
- * adg_entity_scale_to_paper:
- * @entity: an #AdgEntity object
- * @cr: a #cairo_t drawing context
- *
- * Sets the paper matrix as current matrix on @cr. The translation
- * and rotation component of the previous matrix are kept: only the
- * scale is changed.
- **/
-void
-adg_entity_scale_to_paper(AdgEntity *entity, cairo_t *cr)
-{
-    const AdgMatrix *paper_matrix;
-    cairo_matrix_t matrix;
-
-    g_return_if_fail(ADG_IS_ENTITY(entity));
-
-    paper_matrix = ADG_ENTITY_GET_CLASS(entity)->get_paper_matrix(entity);
-    cairo_get_matrix(cr, &matrix);
-
-    matrix.xx = paper_matrix->xx;
-    matrix.yy = paper_matrix->yy;
-    cairo_set_matrix(cr, &matrix);
-}
-
-/**
  * adg_entity_build_paper2model:
  * @entity: an #AdgEntity
  * @matrix: the destination matrix
diff --git a/adg/adg-entity.h b/adg/adg-entity.h
index fecde1c1..5f12893f 100644
--- a/adg/adg-entity.h
+++ b/adg/adg-entity.h
@@ -103,10 +103,6 @@ gboolean        adg_entity_build_paper2model    (AdgEntity      *entity,
                                                  AdgMatrix      *matrix);
 gboolean        adg_entity_build_model2paper    (AdgEntity      *entity,
                                                  AdgMatrix      *matrix);
-void            adg_entity_scale_to_model       (AdgEntity      *entity,
-                                                 cairo_t        *cr);
-void            adg_entity_scale_to_paper       (AdgEntity      *entity,
-                                                 cairo_t        *cr);
 void            adg_entity_model_matrix_changed (AdgEntity      *entity,
                                                  const AdgMatrix*parent_matrix);
 void            adg_entity_paper_matrix_changed (AdgEntity      *entity,
-- 
2.11.4.GIT