Tidy up: simpler and better use of trackpoint free methods in TRW Layer.

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

diff --git a/src/viktrwlayer.h b/src/viktrwlayer.h
index f05718dcae14713a94f9cfa77ed12b522e79715f..cbed60c4589a17154ad45096504291221cbbb98d 100644 (file)
--- a/src/viktrwlayer.h
+++ b/src/viktrwlayer.h
@@ -2,6 +2,7 @@
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
  * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>

+ * Copyright (c) 2011, Rob Norris <rw_norris@hotmail.com>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -26,6 +27,7 @@
 #include "vikviewport.h"
 #include "vikwaypoint.h"
 #include "viktrack.h"
 #include "vikviewport.h"
 #include "vikwaypoint.h"
 #include "viktrack.h"

+#include "viklayerspanel.h"

 
 #define VIK_TRW_LAYER_TYPE            (vik_trw_layer_get_type ())
 #define VIK_TRW_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_TRW_LAYER_TYPE, VikTrwLayer))
 
 #define VIK_TRW_LAYER_TYPE            (vik_trw_layer_get_type ())
 #define VIK_TRW_LAYER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIK_TRW_LAYER_TYPE, VikTrwLayer))


@@ -33,6 +35,13 @@
 #define IS_VIK_TRW_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_TRW_LAYER_TYPE))
 #define IS_VIK_TRW_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_TRW_LAYER_TYPE))
 
 #define IS_VIK_TRW_LAYER(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIK_TRW_LAYER_TYPE))
 #define IS_VIK_TRW_LAYER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIK_TRW_LAYER_TYPE))
 

+enum {
+  VIK_TRW_LAYER_SUBLAYER_TRACKS,
+  VIK_TRW_LAYER_SUBLAYER_WAYPOINTS,
+  VIK_TRW_LAYER_SUBLAYER_TRACK,
+  VIK_TRW_LAYER_SUBLAYER_WAYPOINT
+};
+

 typedef struct _VikTrwLayerClass VikTrwLayerClass;
 struct _VikTrwLayerClass
 {
 typedef struct _VikTrwLayerClass VikTrwLayerClass;
 struct _VikTrwLayerClass
 {


@@ -49,36 +58,36 @@ typedef struct _VikTrwLayer VikTrwLayer;
 void vik_trw_layer_filein_add_waypoint ( VikTrwLayer *vtl, gchar *name, VikWaypoint *wp );
 void vik_trw_layer_filein_add_track ( VikTrwLayer *vtl, gchar *name, VikTrack *tr );
 
 void vik_trw_layer_filein_add_waypoint ( VikTrwLayer *vtl, gchar *name, VikWaypoint *wp );
 void vik_trw_layer_filein_add_track ( VikTrwLayer *vtl, gchar *name, VikTrack *tr );
 

-
-/* TODO 0.0.8: _none_ of this should be here... interfaces, remember... */
-VikTrwLayer *vik_trw_layer_new ( gint drawmode );
-void vik_trw_layer_draw ( VikTrwLayer *l, gpointer data );
-void vik_trw_layer_free ( VikTrwLayer *trwlayer );
-
-VikTrwLayer *vik_trw_layer_create ( VikViewport *vp );
-gboolean vik_trw_layer_properties ( VikTrwLayer *vtl, gpointer vp );
+gint vik_trw_layer_get_property_tracks_line_thickness ( VikTrwLayer *vtl );

 
 void vik_trw_layer_add_waypoint ( VikTrwLayer *vtl, gchar *name, VikWaypoint *wp );
 void vik_trw_layer_add_track ( VikTrwLayer *vtl, gchar *name, VikTrack *t );
 
 void vik_trw_layer_add_waypoint ( VikTrwLayer *vtl, gchar *name, VikWaypoint *wp );
 void vik_trw_layer_add_track ( VikTrwLayer *vtl, gchar *name, VikTrack *t );

-VikWaypoint *vik_trw_layer_get_waypoint ( VikTrwLayer *vtl, gchar *name );
-VikTrack *vik_trw_layer_get_track ( VikTrwLayer *vtl, gchar *name );
-gboolean vik_trw_layer_delete_waypoint ( VikTrwLayer *vtl, const gchar *wp_name );
-gboolean vik_trw_layer_delete_track ( VikTrwLayer *vtl, const gchar *trk_name );
-const gchar *vik_trw_layer_sublayer_rename_request ( VikTrwLayer *l, const gchar *newname, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter );

 
 

-gboolean vik_trw_layer_sublayer_toggle_visible ( VikTrwLayer *l, gint subtype, gpointer sublayer );
-void vik_trw_layer_realize ( VikTrwLayer *vtl, VikTreeview *vt, GtkTreeIter *layer_iter );
+// Waypoint returned is the first one
+VikWaypoint *vik_trw_layer_get_waypoint ( VikTrwLayer *vtl, const gchar *name );

 
 

+// Track returned is the first one
+VikTrack *vik_trw_layer_get_track ( VikTrwLayer *vtl, const gchar *name );
+gboolean vik_trw_layer_delete_track ( VikTrwLayer *vtl, VikTrack *trk );
+
+gboolean vik_trw_layer_auto_set_view ( VikTrwLayer *vtl, VikViewport *vvp );

 gboolean vik_trw_layer_find_center ( VikTrwLayer *vtl, VikCoord *dest );
 GHashTable *vik_trw_layer_get_tracks ( VikTrwLayer *l );
 GHashTable *vik_trw_layer_get_waypoints ( VikTrwLayer *l );
 gboolean vik_trw_layer_find_center ( VikTrwLayer *vtl, VikCoord *dest );
 GHashTable *vik_trw_layer_get_tracks ( VikTrwLayer *l );
 GHashTable *vik_trw_layer_get_waypoints ( VikTrwLayer *l );

-void vik_trw_layer_add_menu_items ( VikTrwLayer *vtl, GtkMenu *menu, gpointer vlp );
-gboolean vik_trw_layer_sublayer_add_menu_items ( VikTrwLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter );

 gboolean vik_trw_layer_new_waypoint ( VikTrwLayer *vtl, GtkWindow *w, const VikCoord *def_coord );
 
 VikCoordMode vik_trw_layer_get_coord_mode ( VikTrwLayer *vtl );
 
 gboolean vik_trw_layer_new_waypoint ( VikTrwLayer *vtl, GtkWindow *w, const VikCoord *def_coord );
 
 VikCoordMode vik_trw_layer_get_coord_mode ( VikTrwLayer *vtl );
 

+gboolean vik_trw_layer_uniquify ( VikTrwLayer *vtl, VikLayersPanel *vlp );
+

 void vik_trw_layer_delete_all_waypoints ( VikTrwLayer *vtl );
 void vik_trw_layer_delete_all_tracks ( VikTrwLayer *vtl );
 void vik_trw_layer_delete_all_waypoints ( VikTrwLayer *vtl );
 void vik_trw_layer_delete_all_tracks ( VikTrwLayer *vtl );

+void trw_layer_cancel_tps_of_track ( VikTrwLayer *vtl, VikTrack *trk );
+
+/* Exposed Layer Interface function definitions */
+// Intended only for use by other trw_layer subwindows
+void trw_layer_verify_thumbnails ( VikTrwLayer *vtl, GtkWidget *vp );
+// Other functions only for use by other trw_layer subwindows
+gchar *trw_layer_new_unique_sublayer_name ( VikTrwLayer *vtl, gint sublayer_type, const gchar *name );

 
 #endif
 
 #endif