---
src/dialog.c | 6 +++---
src/globals.h | 4 ++--
src/vikdemlayer.c | 8 ++++----
src/viktrwlayer_propwin.c | 6 +++---
src/viktrwlayer_tpwin.c | 6 +++---
src/vikwindow.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/dialog.c b/src/dialog.c
index 790420e..e1447c7 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -212,7 +212,7 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar
**dest, VikWaypoint *w
alt = g_strdup_printf ( "%f", wp->altitude );
break;
case VIK_UNITS_HEIGHT_FEET:
- alt = g_strdup_printf ( "%f", FEET_TO_METERS(wp->altitude) );
+ alt = g_strdup_printf ( "%f", VIK_METERS_TO_FEET(wp->altitude) );
break;
default:
alt = g_strdup_printf ( "%f", wp->altitude );
@@ -343,7 +343,7 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar
**dest, VikWaypoint *w
wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
break;
case VIK_UNITS_HEIGHT_FEET:
- wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) )
/ FEET_IN_METER;
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) )
/ VIK_FEET_IN_METER;
break;
default:
wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
@@ -382,7 +382,7 @@ gboolean a_dialog_new_waypoint ( GtkWindow *parent, gchar
**dest, VikWaypoint *w
wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
break;
case VIK_UNITS_HEIGHT_FEET:
- wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) ) /
FEET_IN_METER;
+ wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) ) /
VIK_FEET_IN_METER;
break;
default:
wp->altitude = atof ( gtk_entry_get_text ( GTK_ENTRY(altentry) ) );
diff --git a/src/globals.h b/src/globals.h
index d34d1aa..8d8258f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -32,8 +32,8 @@
#define ALTI_TO_MPP 1.4017295
#define MPP_TO_ALTI 0.7134044
-#define FEET_IN_METER 3.2808399
-#define FEET_TO_METERS(X) (X*FEET_IN_METER)
+#define VIK_FEET_IN_METER 3.2808399
+#define VIK_METERS_TO_FEET(X) (X*VIK_FEET_IN_METER)
#define VIK_DEFAULT_ALTITUDE 0.0
#define VIK_DEFAULT_DOP 0.0
diff --git a/src/vikdemlayer.c b/src/vikdemlayer.c
index 4061399..264e5fe 100644
--- a/src/vikdemlayer.c
+++ b/src/vikdemlayer.c
@@ -299,7 +299,7 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16
id, VikLayerParamData d
/* Convert to store internally
NB file operation always in internal units (metres) */
if (!is_file_operation && a_vik_get_units_height () ==
VIK_UNITS_HEIGHT_FEET )
- vdl->min_elev = data.d / FEET_IN_METER;
+ vdl->min_elev = data.d / VIK_FEET_IN_METER;
else
vdl->min_elev = data.d;
break;
@@ -307,7 +307,7 @@ gboolean dem_layer_set_param ( VikDEMLayer *vdl, guint16
id, VikLayerParamData d
/* Convert to store internally
NB file operation always in internal units (metres) */
if (!is_file_operation && a_vik_get_units_height () ==
VIK_UNITS_HEIGHT_FEET )
- vdl->max_elev = data.d / FEET_IN_METER;
+ vdl->max_elev = data.d / VIK_FEET_IN_METER;
else
vdl->max_elev = data.d;
break;
@@ -330,7 +330,7 @@ static VikLayerParamData dem_layer_get_param ( VikDEMLayer
*vdl, guint16 id, gbo
/* Convert for display in desired units
NB file operation always in internal units (metres) */
if (!is_file_operation && a_vik_get_units_height () ==
VIK_UNITS_HEIGHT_FEET )
- rv.d = FEET_TO_METERS(vdl->min_elev);
+ rv.d = VIK_METERS_TO_FEET(vdl->min_elev);
else
rv.d = vdl->min_elev;
break;
@@ -338,7 +338,7 @@ static VikLayerParamData dem_layer_get_param ( VikDEMLayer
*vdl, guint16 id, gbo
/* Convert for display in desired units
NB file operation always in internal units (metres) */
if (!is_file_operation && a_vik_get_units_height () ==
VIK_UNITS_HEIGHT_FEET )
- rv.d = FEET_TO_METERS(vdl->max_elev);
+ rv.d = VIK_METERS_TO_FEET(vdl->max_elev);
else
rv.d = vdl->max_elev;
break;
diff --git a/src/viktrwlayer_propwin.c b/src/viktrwlayer_propwin.c
index 6da5862..62e4a69 100644
--- a/src/viktrwlayer_propwin.c
+++ b/src/viktrwlayer_propwin.c
@@ -407,7 +407,7 @@ GtkWidget *vik_trw_layer_create_profile ( GtkWidget
*window, VikTrack *tr, gpoin
sprintf(s, "%8dm", (int)(mina + (LINES-i)*(maxa-mina)/LINES));
break;
case VIK_UNITS_HEIGHT_FEET:
- sprintf(s, "%8dft", (int)((mina +
(LINES-i)*(maxa-mina)/LINES)*FEET_IN_METER));
+ sprintf(s, "%8dft", (int)VIK_METERS_TO_FEET(mina +
(LINES-i)*(maxa-mina)/LINES));
break;
default:
sprintf(s, "--");
@@ -893,7 +893,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent,
VikTrwLayer *vtl, VikTrack *
g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m - %.0f m", min_alt, max_alt
);
break;
case VIK_UNITS_HEIGHT_FEET:
- g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet - %.0f feet",
FEET_TO_METERS(min_alt), FEET_TO_METERS(max_alt) );
+ g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet - %.0f feet",
VIK_METERS_TO_FEET(min_alt), VIK_METERS_TO_FEET(max_alt) );
break;
default:
g_snprintf(tmp_buf, sizeof(tmp_buf), "--" );
@@ -911,7 +911,7 @@ void vik_trw_layer_propwin_run ( GtkWindow *parent,
VikTrwLayer *vtl, VikTrack *
g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f m / %.0f m", max_alt, min_alt
);
break;
case VIK_UNITS_HEIGHT_FEET:
- g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet / %.0f feet",
FEET_TO_METERS(max_alt), FEET_TO_METERS(min_alt) );
+ g_snprintf(tmp_buf, sizeof(tmp_buf), "%.0f feet / %.0f feet",
VIK_METERS_TO_FEET(max_alt), VIK_METERS_TO_FEET(min_alt) );
break;
default:
g_snprintf(tmp_buf, sizeof(tmp_buf), "--" );
diff --git a/src/viktrwlayer_tpwin.c b/src/viktrwlayer_tpwin.c
index 69248cf..ac599aa 100644
--- a/src/viktrwlayer_tpwin.c
+++ b/src/viktrwlayer_tpwin.c
@@ -101,7 +101,7 @@ static void tpwin_sync_alt_to_tp ( VikTrwLayerTpwin *tpwin )
tpwin->cur_tp->altitude = gtk_spin_button_get_value ( tpwin->alt );
break;
case VIK_UNITS_HEIGHT_FEET:
- tpwin->cur_tp->altitude = gtk_spin_button_get_value ( tpwin->alt ) /
FEET_IN_METER;
+ tpwin->cur_tp->altitude = gtk_spin_button_get_value ( tpwin->alt ) /
VIK_FEET_IN_METER;
break;
default:
tpwin->cur_tp->altitude = gtk_spin_button_get_value ( tpwin->alt );
@@ -271,7 +271,7 @@ void vik_trw_layer_tpwin_set_tp ( VikTrwLayerTpwin *tpwin,
GList *tpl, gchar *tr
gtk_spin_button_set_value ( tpwin->alt, tp->altitude );
break;
case VIK_UNITS_HEIGHT_FEET:
- gtk_spin_button_set_value ( tpwin->alt, tp->altitude*FEET_IN_METER );
+ gtk_spin_button_set_value ( tpwin->alt, VIK_METERS_TO_FEET(tp->altitude) );
break;
default:
gtk_spin_button_set_value ( tpwin->alt, tp->altitude );
@@ -369,7 +369,7 @@ void vik_trw_layer_tpwin_set_tp ( VikTrwLayerTpwin *tpwin,
GList *tpl, gchar *tr
g_snprintf ( tmp_str, sizeof(tmp_str), "%.5f m", tp->vdop );
break;
case VIK_UNITS_HEIGHT_FEET:
- g_snprintf ( tmp_str, sizeof(tmp_str), "%.5f feet",
FEET_TO_METERS(tp->vdop) );
+ g_snprintf ( tmp_str, sizeof(tmp_str), "%.5f feet",
VIK_METERS_TO_FEET(tp->vdop) );
break;
default:
g_snprintf ( tmp_str, sizeof(tmp_str), "--" );
diff --git a/src/vikwindow.c b/src/vikwindow.c
index 3c623a3..b98b4d5 100644
--- a/src/vikwindow.c
+++ b/src/vikwindow.c
@@ -540,7 +540,7 @@ static void draw_mouse_motion (VikWindow *vw,
GdkEventMotion *event)
if ( a_vik_get_units_height () == VIK_UNITS_HEIGHT_METRES )
g_snprintf ( pointer_buf, BUFFER_SIZE, _("%s %s %dm"), lat, lon, alt );
else
- g_snprintf ( pointer_buf, BUFFER_SIZE, _("%s %s %dft"), lat, lon,
(int)FEET_TO_METERS(alt) );
+ g_snprintf ( pointer_buf, BUFFER_SIZE, _("%s %s %dft"), lat, lon,
(int)VIK_METERS_TO_FEET(alt) );
}
else
g_snprintf ( pointer_buf, BUFFER_SIZE, _("%s %s"), lat, lon );
--
1.7.1
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
Viking-devel mailing list
Viking-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/viking-devel
Viking home page: http://viking.sf.net/
