Fix incorrect GPSBabel/Garmin symbol names.

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

diff --git a/src/vikviewport.h b/src/vikviewport.h
index bbdf1a767a15fbcd98cec2e2f13d5bde39cb3327..27f291da9f58059abb70a8e15341584b119c5bd4 100644 (file)
--- a/src/vikviewport.h
+++ b/src/vikviewport.h
@@ -36,11 +36,11 @@ G_BEGIN_DECLS
 #define VIK_VIEWPORT_TYPE            (vik_viewport_get_type ())
 #define VIK_VIEWPORT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_VIEWPORT_TYPE, VikViewport))
 #define VIK_VIEWPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), VIK_VIEWPORT_TYPE, VikViewportClass))
-#define IS_VIK_VIEWPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_VIEWPORT_TYPE))
-#define IS_VIK_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_VIEWPORT_TYPE))
+#define VIK_IS_VIEWPORT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_VIEWPORT_TYPE))
+#define VIK_IS_VIEWPORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_VIEWPORT_TYPE))
 
 #define VIK_VIEWPORT_MAX_ZOOM 32768.0
-#define VIK_VIEWPORT_MIN_ZOOM 0.125
+#define VIK_VIEWPORT_MIN_ZOOM (1 / 32.0)
 
 /* used for coord to screen etc, screen to coord */
 #define VIK_VIEWPORT_UTM_WRONG_ZONE -9999999
@@ -168,6 +168,7 @@ const gchar *vik_viewport_get_highlight_color ( VikViewport *vvp );
 GdkColor *vik_viewport_get_highlight_gdkcolor ( VikViewport *vvp );
 void vik_viewport_set_highlight_gdkcolor ( VikViewport *vvp, GdkColor * );
 GdkGC* vik_viewport_get_gc_highlight ( VikViewport *vvp );
+void vik_viewport_set_highlight_thickness ( VikViewport *vvp, gint thickness );
 
 /* Drawing primitives */
 void a_viewport_clip_line ( gint *x1, gint *y1, gint *x2, gint *y2 ); /* run this before drawing a line. vik_viewport_draw_line runs it for you */
@@ -178,7 +179,8 @@ void vik_viewport_draw_arc ( VikViewport *vvp, GdkGC *gc, gboolean filled, gint
 void vik_viewport_draw_polygon ( VikViewport *vvp, GdkGC *gc, gboolean filled, GdkPoint *points, gint npoints );
 void vik_viewport_draw_layout ( VikViewport *vvp, GdkGC *gc, gint x, gint y, PangoLayout *layout );
 
-
+/* Utilities */
+void vik_viewport_compute_bearing ( VikViewport *vp, gint x1, gint y1, gint x2, gint y2, gdouble *angle, gdouble *baseangle );
 
 G_END_DECLS