From ecebfaabbed96cff20d972e690fe4bb9ff234cfd Mon Sep 17 00:00:00 2001
From: Antoine Drouin <poinix@gmail.com>
Date: Sun, 28 Aug 2005 00:43:59 +0000
Subject: [PATCH] *** empty log message ***

---
 conf/gui.xml                                  |  5 +++++
 sw/ground_segment/cockpit/Paparazzi/NDPage.pm |  6 +++---
 sw/ground_segment/cockpit/Paparazzi/Strip.pm  | 16 ----------------
 sw/ground_segment/cockpit/cockpit.pl          |  2 +-
 sw/lib/perl/Paparazzi/Traces.pm               |  2 +-
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/conf/gui.xml b/conf/gui.xml
index dc86ebd6ef..b4d96010db 100644
--- a/conf/gui.xml
+++ b/conf/gui.xml
@@ -25,6 +25,11 @@
 -->
 
 <gui>
+  <section name="default">
+    <resource name="big_font"  value="bleriot-radar-m18c"/>
+    <resource name="normal_font"  value="bleriot-radar-m12c"/>
+    <resource name="small_font"  value="bleriot-radar-m8c"/>
+  </section>
   <section name="strip">
     <resource name="background_color" value="=axial -90 |bisque|sandybrown;70"/>
     <resource name="selected_background_color" value="=axial -90 |white|yellow;70"/>
diff --git a/sw/ground_segment/cockpit/Paparazzi/NDPage.pm b/sw/ground_segment/cockpit/Paparazzi/NDPage.pm
index 8cb569fdbe..1789577b79 100644
--- a/sw/ground_segment/cockpit/Paparazzi/NDPage.pm
+++ b/sw/ground_segment/cockpit/Paparazzi/NDPage.pm
@@ -24,9 +24,9 @@ sub populate {
 sub completeinit {
   my $self = shift;
   $self->SUPER::completeinit;
-  $self->{big_font} = "bleriot-radar-m16c";
-  $self->{normal_font} = "bleriot-radar-m12c";
-  $self->{small_font} = "bleriot-radar-m8c";
+  $self->{big_font} = Paparazzi::GuiConfig::get_resource('default', 'big_font');
+  $self->{normal_font} = Paparazzi::GuiConfig::get_resource('default', 'normal_font');
+  $self->{small_font} = Paparazzi::GuiConfig::get_resource('default', 'small_font');
   $self->build_gui();
 }
 
diff --git a/sw/ground_segment/cockpit/Paparazzi/Strip.pm b/sw/ground_segment/cockpit/Paparazzi/Strip.pm
index 7d43d062c3..b473af93d0 100644
--- a/sw/ground_segment/cockpit/Paparazzi/Strip.pm
+++ b/sw/ground_segment/cockpit/Paparazzi/Strip.pm
@@ -93,7 +93,6 @@ sub completeinit {
     value_color => Paparazzi::GuiConfig::get_resource('strip', 'value_color'),
  };
 
-#  $self->parse_config();
   $self->{prefix} = "STRIP_".$self->get(-aircraft)->get('-ac_id')."_";
   $self->{zinc_bat} = undef;
   $self->{zinc_bat_value} = undef;
@@ -101,21 +100,6 @@ sub completeinit {
   $self->draw();
 }
 
-# sub parse_config {
-#   my ($self) = @_;
-#   my $parser = XML::DOM::Parser->new();
-#   print "Parsing gui.xml\n";
-#   return;
-#   my $doc = $parser->parsefile(Paparazzi::Environment::get_config("gui.xml"));
-#   my $strip = $doc->getElementsByTagName('strip')->[0];
-#   foreach my $attr ('selected_background_color', 'background_color', 'normal_font',
-# 		    'small_font', 'border_color', 'label_color', 'value_color') {
-#     $self->{options}->{$attr} =  $strip->getAttribute($attr);
-#   }
-# }
-
-
-
 # draw
 #   draw elements of the strip
 ##############################################################################
diff --git a/sw/ground_segment/cockpit/cockpit.pl b/sw/ground_segment/cockpit/cockpit.pl
index 3777979abb..a05d16f73b 100755
--- a/sw/ground_segment/cockpit/cockpit.pl
+++ b/sw/ground_segment/cockpit/cockpit.pl
@@ -39,7 +39,7 @@ my $options =
   {
    ivy_bus  => "127.255.255.255:2005",
    render => 1,
-   tracelevel => 1,
+   tracelevel => 3,
   };
 
 sub populate {
diff --git a/sw/lib/perl/Paparazzi/Traces.pm b/sw/lib/perl/Paparazzi/Traces.pm
index 8720376efb..b831aef148 100644
--- a/sw/lib/perl/Paparazzi/Traces.pm
+++ b/sw/lib/perl/Paparazzi/Traces.pm
@@ -8,7 +8,7 @@ use constant TRACE_ERROR => 1;
 use constant TRACE_DEBUG => 2;
 use constant TRACE_JUNK  => 3;
 
-my $tracelevel = 2;
+my $tracelevel = 1;
 
 sub init {
   my ($level) = @_;