Merge pull request #2 from snotskie/master

Continuing to make Plotly.plot play well with other packages: TimeSeries and WAV

Author: chriddyp

README.md

@@ -35,6 +35,11 @@ That last line is what the REPL prints out,
 as a Firefox tab opens with the plot.
 You can also just call `plot` by itself, and you'll get a String that's the url of your chart.
 
+## Style and Layout
+    julia> Plotly.style(["line"=>["color"=>"rgb(255,0,0)","width"=>10]])
+    
+    julia> Plotly.layout(["layout"=>["title"=>"Time Wasted"]])
+
 ## Plot Functions and Polynomials
     julia> Plotly.plot(abs)
     julia> Plotly.plot([sqrt, log], ["left"=>10, "right"=>20, "step"=>0.1])
@@ -48,13 +53,17 @@ the square root and logarithm functions, both from 10 to 20 at increments of 0.1
     julia> Plotly.plot(3x^3 + 2x^2 - x + 1)
 
 If you have the Polynomial package installed, you can plot them directly the same way as math functions.
-
-## Style and Layout
-    julia> Plotly.style(["line"=>["color"=>"rgb(255,0,0)","width"=>10]])
 
-    julia> Plotly.layout(["layout"=>["title"=>"Time Wasted"]])
-    
-
+## Plot TimeSeries
+    julia> using TimeSeries
+    julia> d = [date(2012,5,29):date(2013,5,29)]
+    julia> t = TimeArray(d, rand(length(d),2), ["foo","bar"])
+    julia> Plotly.plot(t)
 
+If you have the TimeSeries package installed, you can plot them directly by passing a TimeArray argument.
 
+## Plot WAV Files
+    julia> using WAV
+    julia> Plotly.plot(wavread("filename.wav"))
 
+If you have the WAV package installed, you can plot WAV files by passing a call to the wavread function.

src/plot.jl

@@ -23,7 +23,7 @@ function plot(f::Function, options=Dict())
 end
 
 if Pkg.installed("Polynomial") !== nothing
-	using Polynomial
+	import Polynomial: Poly, polyval
 
 	function plot{T<:Number}(ps::Array{Poly{T},1}, options=Dict())
 		data = [get_points(x->polyval(p,x), merge(["name"=>"$p"], options)) for p in ps]
@@ -33,4 +33,27 @@ if Pkg.installed("Polynomial") !== nothing
 	function plot(p::Poly, options=Dict())
 		return plot([p], options)
 	end
+end
+
+if Pkg.installed("TimeSeries") !== nothing
+	import TimeSeries: TimeArray, timestamp, values, colnames
+
+	function plot(ts::TimeArray, options=Dict())
+		data = [
+			["x"=>map(t->"$t", timestamp(ts[col])), "y"=>values(ts[col]), "type"=>"scatter", "mode"=>"lines", "name"=>col]
+			for col in colnames(ts)
+		]
+		return plot([data], options)
+	end
+end
+
+if Pkg.installed("WAV") !== nothing
+	function plot{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict())
+		opt = merge(["layout"=>["xaxis"=>["title"=>"seconds","dtick"=>1,"tick0"=>0,"autotick"=>false]]], options)
+		w, Fs = wav
+		X = [f/Fs for f in 1.0:length(w)]
+		Y = [round(y,8) for y in w]
+		data = [["x"=>X, "y"=>Y, "type"=>"scatter", "mode"=>"lines", "name"=>"WAV data"]]
+		return plot([data], opt)
+	end
 end