From: Jan "Yenya" Kasprzak <kas@fi.muni.cz>
Date: Sun, 8 May 2011 20:05:52 +0000 (+0200)
Subject: Drop average lap time counting
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=slotcarman.git;a=commitdiff_plain;h=ae004f713d7803204ff1163d3189816b28501748

Drop average lap time counting

The average lap time is confusing to the driver and is directly proportional
to ten total time, so do not display it. Also, we can save one row per car.
---

diff --git a/SCX/Car.pm b/SCX/Car.pm
index 878247a..1a74c6b 100644
--- a/SCX/Car.pm
+++ b/SCX/Car.pm
@@ -15,7 +15,6 @@ sub new {
 		fuel     => 0,
 		lap      => 0,
 		laptime  => 0,
-		avg_lap  => 0,
 		car_img  => $args->{car_img},
 		id       => $args->{id},
 		track    => $args->{track},
@@ -100,9 +99,7 @@ sub set_lap {
 	my ($self, $lap_nr) = @_;
 
 	if (!$lap_nr) {
-		$self->{avg_lap} = undef;
 		$self->{lap} = $lap_nr;
-		$self->gui->set_avg_lap($self->{order}, undef);
 		$self->gui->set_lap($self->{order}, $lap_nr);
 		return;
 	}
@@ -117,10 +114,6 @@ sub set_lap {
 	$self->gui->set_lap($self->{order}, $lap_nr);
 	if ($self->track->{race_running} && $self->{lap} > 1) {
 		my $now = $self->{last_finish_time};
-		my $avg = ($now - $self->track->{race_running_since})
-			/ ($self->{lap} - 1);
-		$self->{avg_lap} = $avg;
-		$self->gui->set_avg_lap($self->{order}, $self->{avg_lap});
 	}
 }
 
@@ -187,7 +180,6 @@ sub set_order {
 	$self->gui->set_lap($self->{order}, $self->{lap});
 	$self->gui->set_laptime($self->{order}, $self->{laptime});
 	$self->gui->set_best_lap($self->{order}, $self->{best_lap});
-	$self->gui->set_avg_lap($self->{order}, $self->{avg_lap});
 	$self->gui->set_fuel($self->{order}, $self->{fuel});
 	$self->gui->set_car_id($self->{order}, $self->{id} + 1);
 	$self->gui->set_distance($self->{order},
diff --git a/SCX/GUI.pm b/SCX/GUI.pm
index fbdfa70..41e9112 100755
--- a/SCX/GUI.pm
+++ b/SCX/GUI.pm
@@ -292,12 +292,6 @@ sub set_laptime {
 	$self->set_label('label_laptime', $row, format_lap_time($text));
 }
 
-sub set_avg_lap {
-	my ($self, $row, $text) = @_;
-
-	$self->set_label('label_avg_lap', $row, format_lap_time($text));
-}
-
 sub set_best_lap {
 	my ($self, $row, $text) = @_;
 
diff --git a/slotcarman.glade b/slotcarman.glade
index 57674a8..9dce885 100644
--- a/slotcarman.glade
+++ b/slotcarman.glade
@@ -714,7 +714,7 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">Last/Best/Avg</property>
+                <property name="label" translatable="yes">Last/Best</property>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -822,15 +822,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label_avg_lap1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -860,15 +851,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label_avg_lap2">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -898,15 +880,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label_avg_lap3">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -936,15 +909,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label_avg_lap4">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -974,15 +938,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label_avg_lap5">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -1012,15 +967,6 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkLabel" id="label_avg_lap6">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">0</property>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">5</property>