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

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

revision 145 by harbaum, Tue Oct 27 12:17:57 2009 UTC revision 146 by harbaum, Tue Oct 27 13:28:41 2009 UTC
# Line 643  osd_check_zoom(gint x, gint y) { Line 643  osd_check_zoom(gint x, gint y) {
643  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
644  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
645  #ifndef OSD_FONT_SIZE  #ifndef OSD_FONT_SIZE
646  #define OSD_FONT_SIZE 16.0  #define OSD_FONT_SIZE (16.0)
647  #endif  #endif
648  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
649  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
# Line 1128  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1128  osd_zoom_labels(cairo_t *cr, gint x, gin
1128  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1129    
1130  #ifndef OSD_COORDINATES_FONT_SIZE  #ifndef OSD_COORDINATES_FONT_SIZE
1131  #define OSD_COORDINATES_FONT_SIZE 12  #define OSD_COORDINATES_FONT_SIZE (12.0)
1132  #endif  #endif
1133    
1134  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
# Line 1207  osd_render_centered_text(cairo_t *cr, in Line 1207  osd_render_centered_text(cairo_t *cr, in
1207      strcpy(p, text);      strcpy(p, text);
1208    
1209      cairo_text_extents_t extents;      cairo_text_extents_t extents;
1210    
1211        printf("test extents of \"abc\"\n");
1212        memset(&extents, 0, sizeof(cairo_text_extents_t));
1213        cairo_text_extents (cr, "abc", &extents);
1214        printf("-> %f\n", extents.width);
1215    
1216        printf("test extents of \"49 00.000\"\n");
1217        memset(&extents, 0, sizeof(cairo_text_extents_t));
1218        cairo_text_extents (cr, "49 00.000", &extents);
1219        printf("-> %f\n", extents.width);
1220    
1221        printf("test extents of \"49° 00.000\"\n");
1222        memset(&extents, 0, sizeof(cairo_text_extents_t));
1223        cairo_text_extents (cr, "49° 00.000", &extents);
1224        printf("-> %f\n", extents.width);
1225    
1226      printf("getting extents for \"%s\"\n", p);  // XXX      printf("getting extents for \"%s\"\n", p);  // XXX
1227        memset(&extents, 0, sizeof(cairo_text_extents_t));
1228      cairo_text_extents (cr, p, &extents);      cairo_text_extents (cr, p, &extents);
1229      printf("initial extents.width = %f\n", extents.width);  // XXX      printf("initial extents.width = %f\n", extents.width);  // XXX
1230    
# Line 1217  osd_render_centered_text(cairo_t *cr, in Line 1234  osd_render_centered_text(cairo_t *cr, in
1234          g_assert(trunc_at > 0);          g_assert(trunc_at > 0);
1235    
1236          printf("trunc at %d\n", trunc_at);  // XXX          printf("trunc at %d\n", trunc_at);  // XXX
         printf("extents.width = %f > %d\n", extents.width, width);  // XXX  
1237    
1238          trunc_at--;          trunc_at--;
1239          strcpy(p+trunc_at, "...");          strcpy(p+trunc_at, "...");
1240          printf("getting extents for \"%s\"\n", p);  // XXX          printf("getting extents for \"%s\"\n", p);  // XXX
1241    
1242            memset(&extents, 0, sizeof(cairo_text_extents_t));
1243          cairo_text_extents (cr, p, &extents);          cairo_text_extents (cr, p, &extents);
1244            printf("extents.width = %f > %d\n", extents.width, width);  // XXX
1245      }      }
1246    
1247      printf("painting\n"); // XXX      printf("painting\n"); // XXX
# Line 1549  osd_render_crosshair(osm_gps_map_osd_t * Line 1568  osd_render_crosshair(osm_gps_map_osd_t *
1568  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1569    
1570  #ifndef OSD_SCALE_FONT_SIZE  #ifndef OSD_SCALE_FONT_SIZE
1571  #define OSD_SCALE_FONT_SIZE 12  #define OSD_SCALE_FONT_SIZE (12.0)
1572  #endif  #endif
1573  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1574  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
Legend:
Removed from v.145  
changed lines
  Added in v.146