From 7890961f67ccc1950dc021c3bb9f54078ffe651b Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Fri, 25 Sep 2009 20:02:50 +0200
Subject: [PATCH] [AdgLDim] Code cleanup

Shortened kilometric variable name in update_geometry().
---
 adg/adg-ldim-private.h |  1 -
 adg/adg-ldim.c         | 32 ++++++++++++++++----------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/adg/adg-ldim-private.h b/adg/adg-ldim-private.h
index b7f4f10c..ddfb8895 100644
--- a/adg/adg-ldim-private.h
+++ b/adg/adg-ldim-private.h
@@ -78,7 +78,6 @@ struct _AdgLDimPrivate {
         CpmlPath path;
         cairo_path_data_t data[20];
     }                    cpml;
-
 };
 
 G_END_DECLS
diff --git a/adg/adg-ldim.c b/adg/adg-ldim.c
index f53ba35e..bc84bd07 100644
--- a/adg/adg-ldim.c
+++ b/adg/adg-ldim.c
@@ -659,39 +659,39 @@ update_shift(AdgLDim *ldim)
 static void
 update_geometry(AdgLDim *ldim)
 {
-    AdgDim *dim;
     AdgLDimPrivate *data;
+    AdgDim *dim;
     const AdgPair *ref1, *ref2;
     const AdgPair *pos;
-    CpmlPair baseline_vector, extension_vector;
+    CpmlVector baseline, extension;
     gdouble d, k;
 
-    dim = (AdgDim *) ldim;
     data = ldim->data;
 
     if (data->geometry.is_arranged)
         return;
 
+    dim = (AdgDim *) ldim;
     ref1 = adg_dim_get_ref1(dim);
     ref2 = adg_dim_get_ref2(dim);
     pos = adg_dim_get_pos(dim);
-    cpml_vector_from_angle(&extension_vector, data->direction);
-    baseline_vector.x = -extension_vector.y;
-    baseline_vector.y = extension_vector.x;
+    cpml_vector_from_angle(&extension, data->direction);
+    cpml_pair_copy(&baseline, &extension);
+    cpml_vector_normal(&baseline);
 
-    d = extension_vector.y * baseline_vector.x -
-        extension_vector.x * baseline_vector.y;
+    d = extension.y * baseline.x -
+        extension.x * baseline.y;
     g_return_if_fail(d != 0);
 
-    k = ((pos->y - ref1->y) * baseline_vector.x -
-         (pos->x - ref1->x) * baseline_vector.y) / d;
-    data->geometry.base1.x = ref1->x + k * extension_vector.x;
-    data->geometry.base1.y = ref1->y + k * extension_vector.y;
+    k = ((pos->y - ref1->y) * baseline.x -
+         (pos->x - ref1->x) * baseline.y) / d;
+    data->geometry.base1.x = ref1->x + k * extension.x;
+    data->geometry.base1.y = ref1->y + k * extension.y;
 
-    k = ((pos->y - ref2->y) * baseline_vector.x -
-         (pos->x - ref2->x) * baseline_vector.y) / d;
-    data->geometry.base2.x = ref2->x + k * extension_vector.x;
-    data->geometry.base2.y = ref2->y + k * extension_vector.y;
+    k = ((pos->y - ref2->y) * baseline.x -
+         (pos->x - ref2->x) * baseline.y) / d;
+    data->geometry.base2.x = ref2->x + k * extension.x;
+    data->geometry.base2.y = ref2->y + k * extension.y;
 
     data->geometry.distance = cpml_pair_distance(&data->geometry.base1,
                                                  &data->geometry.base2);
-- 
2.11.4.GIT