Refactorized GUI layer.

[slotcarman.git] / SCX / Car.pm

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 23caad6c4abfb8fd03bf8cd7d353e72d6812b7b4..8bb7bb9a00e8c5a1f15f596b19e0587dace11eeb 100644 (file)
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -3,23 +3,21 @@
 package SCX::Car;
 
 use strict;
+use Time::HiRes qw(gettimeofday);
 
 sub new {
        my ($class, $args) = @_;
 
        my $self = {
-               gui => $args->{gui},
+               gui      => $args->{gui},
                throttle => -1,
-               fuel => -1,
-               order => $args->{order},
-               track => $args->{track},
+               fuel     => -1,
+               id       => $args->{id},
+               track    => $args->{track},
        };
 
        bless $self, $class;
 
-       $self->set_throttle(undef);
-       $self->set_fuel(undef);
-
        return $self;
 }
 
@@ -78,6 +76,15 @@ sub set_lap {
 
        $self->{lap} = $lap_nr;
        $self->gui->set_lap($self->{order}, defined $lap_nr ? $lap_nr : '--');
+       if ($self->track->{race_running} && $self->{lap} > 1) {
+               my $now = gettimeofday;
+               my $avg = ($now - $self->track->{race_running_since})
+                       / ($self->{lap} - 1);
+               $self->{avg_lap} = $avg;
+               $self->gui->set_avg_lap($self->{order}, $avg);
+       } else {
+               $self->gui->set_avg_lap($self->{order}, '--');
+       }
 }
 
 sub set_laptime {
@@ -120,7 +127,7 @@ sub set_driver {
                        && $self->{driver} == $driver_name);
 
        $self->{driver} = $driver_name;
-       $self->gui->set_driver($self->{order}, $driver_name || '--');
+       $self->gui->set_name($self->{order}, $driver_name || '--');
 }
 
 sub enter_pit_lane {
@@ -146,7 +153,7 @@ sub set_order {
 
        $self->{order} = $pos;
        
-       $self->gui->set_driver($self->{order}, $self->{driver}
+       $self->gui->set_name($self->{order}, $self->{driver}
                || '--');
        $self->gui->set_car_icon($self->{order}, $self->{car_icon});
        $self->gui->set_throttle($self->{order}, $self->{throttle});
@@ -156,6 +163,8 @@ sub set_order {
                ? $self->{laptime} : '--');
        $self->gui->set_best_lap($self->{order}, defined $self->{best_lap}
                ? $self->{best_lap} : '--');
+       $self->gui->set_avg_lap($self->{order}, defined $self->{avg_lap}
+               ? $self->{avg_lap} : '--');
        $self->gui->set_fuel($self->{order}, $self->{fuel});
 }