Make the main app use SCX::Parser

[slotcarman.git] / gui.pl

diff --git a/gui.pl b/gui.pl
index 7fcfc7f740fc400e74bf14b4b77b60ddff47b108..7cfe6085f24085b14aa7fdf8c1cfb32927d45423 100755 (executable)
--- a/gui.pl
+++ b/gui.pl
@@ -9,19 +9,35 @@ use Glib qw(TRUE FALSE);
 use SCX::GUI;
 use SCX::Track;
 use SCX::Reader;
+use SCX::RaceParser;
 
-my $gui = SCX::GUI->new({ img_height => 80 });
+my $gui = SCX::GUI->new({ img_height => 120 });
 my $track = SCX::Track->new({ gui => $gui });
 
-my $reader;
-eval {
-       $reader = SCX::Reader->new({
-               portname   => '/dev/ttyUSB0',
-               logfile    => 'log',
-               track      => $track,
+my $logfile = 'log';
+my $tty = '/dev/ttyUSB0';
+
+if (defined $ARGV[0] && $ARGV[0] eq '-') {
+       $logfile = undef;
+       $tty = '-';
+}
+
+my $parser = SCX::RaceParser->new({
+       track => $track,
+       logfile => $logfile,
+});
+
+my $reader = eval {
+       SCX::Reader->new({
+               filename   => $tty,
+               parser     => $parser,
        });
 };
 
+if ($@) {
+       print STDERR "Demo mode only: $@";
+}
+
 $track->car(0)->set_model('F1 Ferrari');
 $track->car(1)->set_model('F1 McLaren');
 $track->car(2)->set_model('F1 Williams');
@@ -37,16 +53,27 @@ if ($reader) {
        Glib::IO->add_watch(fileno($reader->fh), 'in', \&scx_read, $reader);
 } else {
        # Just display some random values
+
        $gui->rounds('5/13');
        $gui->time('53.4');
        $gui->best_lap('12.3');
 
-       $track->car(0)->set_lap(13);
-       $track->car(1)->set_lap(11);
-       $track->car(2)->set_lap(10);
-       $track->car(3)->set_lap(undef);
-       $track->car(4)->set_lap(undef);
-       $track->car(5)->set_lap(undef);
+       my $now = time;
+       $track->{race_running_since} = $now;
+       $track->{race_running} = 1;
+
+       $track->finish_line($now + 0.5, 1, 2);
+       $track->finish_line($now + 0.7, 1, 1);
+       $track->finish_line($now + 4.9, 1, 1);
+       $track->finish_line($now + 5.3, 1, 2);
+       $track->finish_line($now + 7.2, 1, 1);
+       $track->finish_line($now + 8.1, 0, 2);
+#      $track->car(0)->set_lap(13);
+#      $track->car(1)->set_lap(11);
+#      $track->car(2)->set_lap(10);
+#      $track->car(3)->set_lap(undef);
+#      $track->car(4)->set_lap(undef);
+#      $track->car(5)->set_lap(undef);
 
        $track->car(0)->set_laptime(9.12322);
        $track->car(1)->set_laptime(15.313);
@@ -57,7 +84,7 @@ if ($reader) {
        $track->car(2)->set_fuel(8);
 
        $track->car(0)->set_throttle(0);
-       $track->car(1)->set_throttle(8);
+       $track->car(1)->set_throttle(8, 1);
        $track->car(2)->set_throttle(12);
 }