Merge branch 'use-trunc-rounding' into rounding-fixes
[gpstools.git] / Patch / ygraph-midnight.patch
blob1936b6ed6c0a9b500dfd3bdd35ff6501b5468c36
1 Index: tests/run-tests.pl
2 ===================================================================
3 --- tests/run-tests.pl (revision 2148)
4 +++ tests/run-tests.pl (working copy)
5 @@ -1655,16 +1655,16 @@
6 # }}}
7 testcmd("../gpst -o ygraph date_error.mayko", # {{{
8 <<END,
9 -"Time = 0.0
10 +"Time = 33156.0
11 5.5794667 60.4280897
13 -"Time = 2.0
14 +"Time = 33158.0
15 5.5802255 60.4281867
17 -"Time = 5.0
18 +"Time = 33161.0
19 5.5813636 60.4283320
21 -"Time = 6.0
22 +"Time = 33162.0
23 5.5817430 60.4283806
25 END
26 Index: gpst
27 ===================================================================
28 --- gpst (revision 2148)
29 +++ gpst (working copy)
30 @@ -1054,7 +1054,7 @@
32 } elsif ($Opt{'output-format'} eq "ygraph") {
33 if (!length($Dat{'error'})) {
34 - my $Time = $print_time ? ($ep_time - $first_time) * 1 : 0;
35 + my $Time = $print_time ? ($Dat{'hour'} * 3600 + $Dat{'min'} * 60 + $Dat{'sec'}) : 0;
36 $Line .= "\"Time = $Time.0\n$Dat{'lon'} $Dat{'lat'}\n\n";
38 } elsif ($Opt{'output-format'} eq "csv") {