Diff of /trunk/src/osm-gps-map.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC revision 86 by harbaum, Sun Aug 30 19:05:44 2009 UTC
# Line 65  typedef enum { Line 65  typedef enum {
65      OSM_GPS_MAP_SOURCE_NULL,      OSM_GPS_MAP_SOURCE_NULL,
66      OSM_GPS_MAP_SOURCE_OPENSTREETMAP,      OSM_GPS_MAP_SOURCE_OPENSTREETMAP,
67      OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER,      OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER,
68      OSM_GPS_MAP_SOURCE_OPENAERIALMAP,      OSM_GPS_MAP_SOURCE_OPENCYCLEMAP,
69      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,      OSM_GPS_MAP_SOURCE_MAPS_FOR_FREE,
70      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,      OSM_GPS_MAP_SOURCE_GOOGLE_STREET,
71      OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,      OSM_GPS_MAP_SOURCE_GOOGLE_SATELLITE,
# Line 100  typedef void (*OsmGpsMapOsdCallback)(osd Line 100  typedef void (*OsmGpsMapOsdCallback)(osd
100  /* the osd structure mainly contains various callbacks */  /* the osd structure mainly contains various callbacks */
101  /* required to draw and update the OSD */  /* required to draw and update the OSD */
102  typedef struct osm_gps_map_osd_s {  typedef struct osm_gps_map_osd_s {
     GdkPixmap *pixmap;   // the main pixmap (to draw on it)  
103      GtkWidget *widget;   // the main map widget (to get its stlye info)      GtkWidget *widget;   // the main map widget (to get its stlye info)
104    
105      void(*render)(struct osm_gps_map_osd_s *);      void(*render)(struct osm_gps_map_osd_s *);
106      void(*draw)(struct osm_gps_map_osd_s *, gint, gint);      void(*draw)(struct osm_gps_map_osd_s *, GdkDrawable *);
107      void(*restore)(struct osm_gps_map_osd_s *) ;      osd_button_t(*check)(struct osm_gps_map_osd_s *,gint, gint);       /* check if x/y lies within OSD */
     osd_button_t(*check)(gint, gint);       /* check if x/y lies within OSD */  
108      void(*free)(struct osm_gps_map_osd_s *);      void(*free)(struct osm_gps_map_osd_s *);
109    
110      OsmGpsMapOsdCallback cb;      OsmGpsMapOsdCallback cb;
# Line 137  void osm_gps_map_clear_tracks (OsmGpsMap Line 135  void osm_gps_map_clear_tracks (OsmGpsMap
135  void osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image);  void osm_gps_map_add_image (OsmGpsMap *map, float latitude, float longitude, GdkPixbuf *image);
136  gboolean osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image);  gboolean osm_gps_map_remove_image (OsmGpsMap *map, GdkPixbuf *image);
137  void osm_gps_map_clear_images (OsmGpsMap *map);  void osm_gps_map_clear_images (OsmGpsMap *map);
 void osm_gps_map_osd_speed (OsmGpsMap *map, float speed);  
138  void osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading);  void osm_gps_map_draw_gps (OsmGpsMap *map, float latitude, float longitude, float heading);
139  void osm_gps_map_clear_gps (OsmGpsMap *map);  void osm_gps_map_clear_gps (OsmGpsMap *map);
140  coord_t osm_gps_map_get_co_ordinates (OsmGpsMap *map, int pixel_x, int pixel_y);  coord_t osm_gps_map_get_co_ordinates (OsmGpsMap *map, int pixel_x, int pixel_y);
# Line 158  void osm_gps_map_clear_balloon (OsmGpsMa Line 155  void osm_gps_map_clear_balloon (OsmGpsMa
155  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd);  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd);
156  void osm_gps_map_redraw (OsmGpsMap *map);  void osm_gps_map_redraw (OsmGpsMap *map);
157  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map);
158    void osm_gps_map_repaint (OsmGpsMap *map);
159  #endif  #endif
160    
161    
Legend:
Removed from v.73  
changed lines
  Added in v.86