From a793974809aa0593e019906e35579c47e5b6926f Mon Sep 17 00:00:00 2001 From: c vw Date: Fri, 27 Nov 2020 15:46:27 +0100 Subject: [PATCH] Use display font and sized defined in radio.h --- rx_panadapter.c | 18 +++++++++--------- tx_panadapter.c | 15 ++++++++------- vfo.c | 16 ++++++++-------- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/rx_panadapter.c b/rx_panadapter.c index 0373b9d..c60cd7c 100644 --- a/rx_panadapter.c +++ b/rx_panadapter.c @@ -233,8 +233,8 @@ void rx_panadapter_update(RECEIVER *rx) { double dbm_per_line=(double)display_height/((double)rx->panadapter_high-(double)rx->panadapter_low); cairo_set_line_width(cr, LINE_WIDTH); - cairo_select_font_face(cr, "FreeMono", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); - cairo_set_font_size(cr, 12); + cairo_select_font_face(cr, DISPLAY_FONT, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); char v[32]; for(i=rx->panadapter_high;i>=rx->panadapter_low;i--) { @@ -365,10 +365,10 @@ void rx_panadapter_update(RECEIVER *rx) { } f = ((min_display/divisor)*divisor)+divisor; - cairo_select_font_face(cr, "FreeMono", + cairo_select_font_face(cr, DISPLAY_FONT, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); while(faddress)->sin_addr),text,64); cairo_text_extents(cr, text, &extents); cairo_move_to(cr, ((double)display_width/2.0)-(extents.width/2.0), (double)display_height/2.0); @@ -586,7 +586,7 @@ void rx_panadapter_update(RECEIVER *rx) { if(rx->id==0 && controller==CONTROLLER1) { cairo_set_source_rgb(cr,1.0,1.0,0.0); - cairo_set_font_size(cr,16); + cairo_set_font_size(cr,DISPLAY_FONT_SIZE3); if(ENABLE_E2_ENCODER) { cairo_move_to(cr, display_width-200,70); sprintf(text,"%s (%s)",encoder_string[e2_encoder_action],sw_string[e2_sw_action]); @@ -611,7 +611,7 @@ void rx_panadapter_update(RECEIVER *rx) { if(sequence_errors!=0) { cairo_move_to(cr,100.0,50.0); cairo_set_source_rgb(cr,1.0,0.0,0.0); - cairo_set_font_size(cr,12); + cairo_set_font_size(cr,DISPLAY_FONT_SIZE2); cairo_show_text(cr, "Sequence Error"); sequence_error_count++; // show for 2 second @@ -624,7 +624,7 @@ void rx_panadapter_update(RECEIVER *rx) { if(rx->id==0 && protocol==ORIGINAL_PROTOCOL && device==DEVICE_HERMES_LITE2) { cairo_set_source_rgb(cr,1.0,1.0,0.0); - cairo_set_font_size(cr,16); + cairo_set_font_size(cr,DISPLAY_FONT_SIZE3); double t = (3.26 * ((double)average_temperature / 4096.0) - 0.5) / 0.01; sprintf(text,"%0.1fC",t); diff --git a/tx_panadapter.c b/tx_panadapter.c index f4b5a67..dae2b55 100644 --- a/tx_panadapter.c +++ b/tx_panadapter.c @@ -215,8 +215,8 @@ void tx_panadapter_update(TRANSMITTER *tx) { double dbm_per_line=(double)display_height/((double)tx->panadapter_high-(double)tx->panadapter_low); cairo_set_source_rgb (cr, 0.00, 1.00, 1.00); cairo_set_line_width(cr, 1.0); - cairo_select_font_face(cr, "FreeMono", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); - cairo_set_font_size(cr, 12); + cairo_select_font_face(cr, DISPLAY_FONT, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); for(i=tx->panadapter_high;i>=tx->panadapter_low;i--) { char v[32]; @@ -273,10 +273,10 @@ void tx_panadapter_update(TRANSMITTER *tx) { cairo_line_to(cr,(double)i,(double)display_height); cairo_set_source_rgb (cr, 0.0, 1.0, 1.0); - cairo_select_font_face(cr, "FreeMono", + cairo_select_font_face(cr, DISPLAY_FONT, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); char v[32]; sprintf(v,"%0lld.%03lld",f/1000000,(f%1000000)/1000); //cairo_move_to(cr, (double)i, (double)(display_height-10)); @@ -355,7 +355,7 @@ void tx_panadapter_update(TRANSMITTER *tx) { char text[64]; cairo_set_source_rgb(cr,1.0,1.0,0.0); - cairo_set_font_size(cr,16); + cairo_set_font_size(cr,DISPLAY_FONT_SIZE3); if(ENABLE_E2_ENCODER) { cairo_move_to(cr, display_width-200,70); sprintf(text,"%s (%s)",encoder_string[e2_encoder_action],sw_string[e2_sw_action]); @@ -380,6 +380,7 @@ void tx_panadapter_update(TRANSMITTER *tx) { #ifdef PURESIGNAL if(tx->puresignal) { cairo_set_source_rgb(cr,0.0,1.0,0.0); + cairo_set_font_size(cr,DISPLAY_FONT_SIZE2); cairo_move_to(cr,display_width/2,display_height-10); cairo_show_text(cr, "PureSignal"); @@ -398,7 +399,7 @@ void tx_panadapter_update(TRANSMITTER *tx) { if(duplex) { char text[64]; cairo_set_source_rgb(cr,1.0,0.0,0.0); - cairo_set_font_size(cr, 16); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE3); if(transmitter->fwd<0.0001) { sprintf(text,"FWD: %0.3f",transmitter->exciter); @@ -430,7 +431,7 @@ void tx_panadapter_update(TRANSMITTER *tx) { if(tx->dialog==NULL && protocol==ORIGINAL_PROTOCOL && device==DEVICE_HERMES_LITE2) { char text[64]; cairo_set_source_rgb(cr,1.0,1.0,0.0); - cairo_set_font_size(cr,16); + cairo_set_font_size(cr,DISPLAY_FONT_SIZE3); double t = (3.26 * ((double)average_temperature / 4096.0) - 0.5) / 0.01; sprintf(text,"%0.1fC",t); diff --git a/vfo.c b/vfo.c index 20f6e71..b5b0cb5 100644 --- a/vfo.c +++ b/vfo.c @@ -1033,7 +1033,7 @@ void vfo_update() { cairo_set_source_rgb (cr, 0.0, 0.0, 0.0); cairo_paint (cr); - cairo_select_font_face(cr, "FreeMono", + cairo_select_font_face(cr, DISPLAY_FONT, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD); @@ -1059,7 +1059,7 @@ void vfo_update() { sprintf(temp_text,"%s %s",mode_string[vfo[id].mode],band_filter->title); break; } - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); cairo_set_source_rgb(cr, 1.0, 1.0, 0.0); cairo_move_to(cr, 5, 15); cairo_show_text(cr, temp_text); @@ -1089,7 +1089,7 @@ void vfo_update() { } } cairo_move_to(cr, 5, 38); - cairo_set_font_size(cr, 22); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE4); cairo_show_text(cr, temp_text); sprintf(temp_text,"VFO B: %0lld.%06lld",bf/(long long)1000000,bf%(long long)1000000); @@ -1114,7 +1114,7 @@ void vfo_update() { } else { cairo_set_source_rgb(cr, 0.7, 0.7, 0.7); } - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); cairo_show_text(cr, "PS"); } #endif @@ -1125,7 +1125,7 @@ void vfo_update() { } else { cairo_set_source_rgb(cr, 0.7, 0.7, 0.7); } - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); sprintf(temp_text,"Zoom x%d",active_receiver->zoom); cairo_show_text(cr, temp_text); @@ -1136,7 +1136,7 @@ void vfo_update() { } sprintf(temp_text,"RIT: %lldHz",vfo[id].rit); cairo_move_to(cr, 170, 15); - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); cairo_show_text(cr, temp_text); @@ -1148,7 +1148,7 @@ void vfo_update() { } sprintf(temp_text,"XIT: %lldHz",transmitter->xit); cairo_move_to(cr, 310, 15); - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); cairo_show_text(cr, temp_text); } @@ -1325,7 +1325,7 @@ void vfo_update() { } sprintf(temp_text,"DUP"); cairo_move_to(cr, 260, 38); - cairo_set_font_size(cr, 12); + cairo_set_font_size(cr, DISPLAY_FONT_SIZE2); cairo_show_text(cr, temp_text); cairo_destroy (cr); -- 2.45.2