diff --git a/sw/ground_segment/cockpit/Paparazzi/Horizon.pm b/sw/ground_segment/cockpit/Paparazzi/Horizon.pm index cffb52a68f..3e6fc650ef 100644 --- a/sw/ground_segment/cockpit/Paparazzi/Horizon.pm +++ b/sw/ground_segment/cockpit/Paparazzi/Horizon.pm @@ -84,7 +84,7 @@ sub build_gui { # pitch scale $self->{y_per_deg} = $radius / 30; - my $v_tick_font = '-adobe-helvetica-bold-o-normal--12-240-100-100-p-182-iso8859-1'; + my $v_tick_font = Paparazzi::GuiConfig::get_resource('default', 'small_font'); my $i; for ($i=-16; $i <= 16; $i++) { my $angle = $i*2.5; diff --git a/sw/ground_segment/cockpit/Paparazzi/LensScale.pm b/sw/ground_segment/cockpit/Paparazzi/LensScale.pm index e3ad9317b5..6e0d92cd7b 100644 --- a/sw/ground_segment/cockpit/Paparazzi/LensScale.pm +++ b/sw/ground_segment/cockpit/Paparazzi/LensScale.pm @@ -16,12 +16,6 @@ sub populate { ); } -#sub completeinit { -# my $self = shift; -# $self->SUPER::completeinit; -## $self->build_gui(); -#} - use constant VZ_WIDTH => 8; use constant MAX_VZ => 2. ; @@ -32,7 +26,6 @@ sub vz { my $h = $self->get('-height'); my $y = $new_vz * $h / 2 / MAX_VZ; $zinc->coords($self->{vz_itemclip}, [0, 0, VZ_WIDTH, -$y]); - } sub value() { @@ -93,7 +86,7 @@ sub build_gui { -linecolor => 'yellow', -filled => 0); - my $font = '-adobe-helvetica-bold-o-normal--16-240-100-100-p-182-iso8859-1'; + my $font = Paparazzi::GuiConfig::get_resource('default', 'normal_font'); $self->{fixed_text} = $zinc->add('text', $self->{lens_group}, -position => [$xt, $h/2], diff --git a/sw/ground_segment/cockpit/Paparazzi/Scale.pm b/sw/ground_segment/cockpit/Paparazzi/Scale.pm index c1e649db9c..cedf2c0cc0 100644 --- a/sw/ground_segment/cockpit/Paparazzi/Scale.pm +++ b/sw/ground_segment/cockpit/Paparazzi/Scale.pm @@ -157,7 +157,7 @@ if ($self->get('-height') > $self->get('-width')) { ); my $nb_ticks = ($self->get('-max_val') - $self->get('-min_val')) / $self->get('-tick_scale'); - my $tick_font = '-adobe-helvetica-bold-o-normal--18-240-100-100-p-182-iso8859-1'; + my $tick_font = Paparazzi::GuiConfig::get_resource('default', 'normal_font'); my $first_tick = $self->get('-periodic') ? -$nb_ticks:0; my $last_tick = $self->get('-periodic') ? 2*$nb_ticks:$nb_ticks; for (my $tick=$first_tick; $tick<=$last_tick; $tick++) {