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

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

revision 121 by harbaum, Sun Sep 20 19:26:29 2009 UTC revision 150 by harbaum, Thu Oct 29 20:25:11 2009 UTC
# Line 1248  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1248  osm_gps_map_map_redraw (OsmGpsMap *map)
1248  {  {
1249      OsmGpsMapPrivate *priv = map->priv;      OsmGpsMapPrivate *priv = map->priv;
1250    
1251        /* on diablo the map comes up at 1x1 pixel size and */
1252        /* isn't really usable. we'll just ignore this ... */
1253        if((GTK_WIDGET(map)->allocation.width < 2) ||
1254           (GTK_WIDGET(map)->allocation.height < 2)) {
1255            printf("not a useful sized map yet ...\n");
1256            return FALSE;
1257        }
1258    
1259      priv->idle_map_redraw = 0;      priv->idle_map_redraw = 0;
1260    
1261      /* don't redraw the entire map while the OSD is doing */      /* don't redraw the entire map while the OSD is doing */
# Line 2836  osm_gps_map_redraw (OsmGpsMap *map) Line 2844  osm_gps_map_redraw (OsmGpsMap *map)
2844      osm_gps_map_map_redraw_idle(map);      osm_gps_map_map_redraw_idle(map);
2845  }  }
2846    
2847  osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {  osm_gps_map_osd_t *
2848    osm_gps_map_osd_get(OsmGpsMap *map)
2849    {
2850      g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);      g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2851      return map->priv->osd;      return map->priv->osd;
2852  }  }
2853    
2854  void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {  void
2855    osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd)
2856    {
2857      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2858    
2859      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
# Line 2853  void osm_gps_map_register_osd(OsmGpsMap Line 2865  void osm_gps_map_register_osd(OsmGpsMap
2865  }  }
2866    
2867  void  void
2868  osm_gps_map_repaint (OsmGpsMap *map) {  osm_gps_map_repaint (OsmGpsMap *map)
2869    {
2870      osm_gps_map_expose (GTK_WIDGET(map), NULL);      osm_gps_map_expose (GTK_WIDGET(map), NULL);
2871  }  }
2872    
2873    coord_t *
2874    osm_gps_map_get_gps (OsmGpsMap *map)
2875    {
2876        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2877    
2878        if(!map->priv->gps_valid)
2879            return NULL;
2880    
2881        return map->priv->gps;
2882    }
2883    
2884  #endif  #endif
Legend:
Removed from v.121  
changed lines
  Added in v.150