From 89ecbe9cdc612ccf92a8895366963bc965745364 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 29 Sep 2012 16:26:08 +0000 Subject: [PATCH] Merged r10439 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10520 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/SVG/Graph/TimeSeries.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/SVG/Graph/TimeSeries.rb b/lib/SVG/Graph/TimeSeries.rb index ee47359aa..bfa7c960c 100644 --- a/lib/SVG/Graph/TimeSeries.rb +++ b/lib/SVG/Graph/TimeSeries.rb @@ -1,5 +1,4 @@ require 'SVG/Graph/Plot' -require 'parsedate' module SVG module Graph @@ -157,8 +156,7 @@ module SVG y = [] data[:data].each_index {|i| if i%2 == 0 - arr = ParseDate.parsedate( data[:data][i] ) - t = Time.local( *arr[0,6].compact ) + t = DateTime.parse( data[:data][i] ).to_time x << t.to_i else y << data[:data][i] @@ -173,8 +171,7 @@ module SVG protected def min_x_value=(value) - arr = ParseDate.parsedate( value ) - @min_x_value = Time.local( *arr[0,6].compact ).to_i + @min_x_value = DateTime.parse( data[:data][i] ).to_time end