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

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

revision 202 by harbaum, Sat Nov 21 20:13:13 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 82  typedef struct { Line 82  typedef struct {
82          cairo_surface_t *surface;          cairo_surface_t *surface;
83          float lat, lon;          float lat, lon;
84          char *name;          char *name;
85          gboolean imperial;    // display distance imperial/metric          gboolean imperial, mode;    // display distance imperial/metric
86            int click_sep;
87      } nav;      } nav;
88  #endif  #endif
89    
# Line 1305  osd_render_nav(osm_gps_map_osd_t *osd) Line 1306  osd_render_nav(osm_gps_map_osd_t *osd)
1306      y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);      y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);
1307      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1308      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);
1309    
1310      g_free(latitude);      g_free(latitude);
1311      g_free(longitude);      g_free(longitude);
1312    
1313        /* everything below this is the compass. we need to know this */
1314        /* to differ between coordinate clicks and compass clicks */
1315        priv->nav.click_sep = y;
1316    
1317      /* draw the compass */      /* draw the compass */
1318      int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;      int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1319      if(radius > OSD_NAV_W/2)      if(radius > OSD_NAV_W/2)
# Line 1331  osd_render_nav(osm_gps_map_osd_t *osd) Line 1336  osd_render_nav(osm_gps_map_osd_t *osd)
1336  #define ARROW_WIDTH     0.3  #define ARROW_WIDTH     0.3
1337  #define ARROW_LENGTH    0.7  #define ARROW_LENGTH    0.7
1338    
1339      coord_t *gps = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));      coord_t mpos, *pos = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1340      if(gps) {      if(priv->nav.mode) {
1341          float arot = get_bearing(gps->rlat, gps->rlon,          gfloat lat, lon;
1342            g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1343            mpos.rlat = deg2rad(lat);
1344            mpos.rlon = deg2rad(lon);
1345            pos = &mpos;
1346        }
1347    
1348        if(pos) {
1349            float arot = get_bearing(pos->rlat, pos->rlon,
1350                       deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));                       deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1351    
1352          cairo_move_to(cr,          cairo_move_to(cr,
# Line 1353  osd_render_nav(osm_gps_map_osd_t *osd) Line 1366  osd_render_nav(osm_gps_map_osd_t *osd)
1366                        y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));                        y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1367    
1368          cairo_close_path(cr);          cairo_close_path(cr);
1369          cairo_set_source_rgb (cr, 0, 0, 0);          if(priv->nav.mode)
1370                cairo_set_source_rgb (cr, 0, 0, 0);
1371            else
1372                cairo_set_source_rgb (cr, 0, 0, 0.8);
1373    
1374          cairo_fill (cr);          cairo_fill (cr);
1375    
1376          y += radius + OSD_COORDINATES_FONT_SIZE/4;          y += radius + OSD_COORDINATES_FONT_SIZE/4;
1377    
1378          float dist = get_distance(gps->rlat, gps->rlon,          float dist = get_distance(pos->rlat, pos->rlon,
1379                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1380    
1381          char *dist_str = NULL;          char *dist_str = NULL;
# Line 1404  osd_nav_check(osm_gps_map_osd_t *osd, gb Line 1421  osd_nav_check(osm_gps_map_osd_t *osd, gb
1421      y -= (osd->widget->allocation.height - OSD_NAV_H)/2;      y -= (osd->widget->allocation.height - OSD_NAV_H)/2;
1422    
1423      if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {      if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {
1424          osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),          if(y < priv->nav.click_sep)
1425                                 priv->nav.lat, priv->nav.lon);              osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),
1426                                       priv->nav.lat, priv->nav.lon);
1427            else {
1428                priv->nav.mode = !priv->nav.mode;
1429                osm_gps_map_redraw(OSM_GPS_MAP(osd->widget));
1430            }
1431      }      }
1432    
1433      FOUT;      FOUT;
# Line 2070  osd_free(osm_gps_map_osd_t *osd) Line 2092  osd_free(osm_gps_map_osd_t *osd)
2092           cairo_surface_destroy(priv->balloon.surface);           cairo_surface_destroy(priv->balloon.surface);
2093  #endif  #endif
2094    
2095        printf("freeing priv\n");
2096      g_free(priv);      g_free(priv);
2097      FOUT;      FOUT;
2098  }  }
# Line 2113  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2136  osm_gps_map_osd_classic_init(OsmGpsMap *
2136  {  {
2137      FIN;      FIN;
2138      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);
2139        printf("alloc new osd priv\n");
2140    
2141  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
2142      priv->balloon.lat = OSM_GPS_MAP_INVALID;      priv->balloon.lat = OSM_GPS_MAP_INVALID;
Legend:
Removed from v.202  
changed lines
  Added in v.226