Enable the escape key to remove/reset the ruler tool.

[andy/viking.git] / src / globals.h

diff --git a/src/globals.h b/src/globals.h
index d34d1aa012cbed7b0649297a6f417880968f50ea..40d58d58260c0e075dec679b899fecfa7a1dd5a6 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -32,8 +32,28 @@
 #define ALTI_TO_MPP 1.4017295
 #define MPP_TO_ALTI 0.7134044
 
 #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_FEET_TO_METERS(X) ((X)/VIK_FEET_IN_METER)
+
+#define VIK_MILES_IN_METER 0.000621371192
+#define VIK_METERS_TO_MILES(X) ((X)*VIK_MILES_IN_METER)
+#define VIK_MILES_TO_METERS(X) ((X)/VIK_MILES_IN_METER)
+
+/* MPS - Metres Per Second */
+/* MPH - Metres Per Hour */
+#define VIK_MPH_IN_MPS 2.23693629
+#define VIK_MPS_TO_MPH(X) ((X)*VIK_MPH_IN_MPS)
+#define VIK_MPH_TO_MPS(X) ((X)/VIK_MPH_IN_MPS)
+
+/* KPH - Kilometres Per Hour */
+#define VIK_KPH_IN_MPS 3.6
+#define VIK_MPS_TO_KPH(X) ((X)*VIK_KPH_IN_MPS)
+#define VIK_KPH_TO_MPS(X) ((X)/VIK_KPH_IN_MPS)
+
+#define VIK_KNOTS_IN_MPS 1.94384449
+#define VIK_MPS_TO_KNOTS(X) ((X)*VIK_KNOTS_IN_MPS)
+#define VIK_KNOTS_TO_MPS(X) ((X)/VIK_KNOTS_IN_MPS)

 
 #define VIK_DEFAULT_ALTITUDE 0.0
 #define VIK_DEFAULT_DOP 0.0
 
 #define VIK_DEFAULT_ALTITUDE 0.0
 #define VIK_DEFAULT_DOP 0.0