Skip to content

Commit 4f9c5c9

Browse files
bpostlethwaitebpostlethwaite
committed
Merge pull request #16 from menyoung/master
julia-0.4 syntax
2 parents b53b4c9 + 00ef7ab commit 4f9c5c9

File tree

5 files changed

+108
-105
lines changed

5 files changed

+108
-105
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# A Julia interface to the plot.ly API
22

3-
[![Build Status](https://travis-ci.org/plotly/Plotly-Julia.svg)](https://travis-ci.org/plotly/Plotly-Julia)
3+
[![Build Status](https://travis-ci.org/plotly/Plotly.jl.svg)](https://travis-ci.org/plotly/Plotly.jl)
44

55
README quickly to get started. Alternately, checkout out the pretty Julia docs at http://plot.ly/api
66

‎src/Plotly.jl‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ include("plot.jl")
66
include("utils.jl")
77

88
type CurrentPlot
9-
filename::String
10-
fileopt::String
11-
url::String
9+
filename::ASCIIString
10+
fileopt::ASCIIString
11+
url::ASCIIString
1212
end
1313

1414
api_version = "v2"
1515

16-
default_options = {"filename"=>"Plot from Julia API",
17-
"world_readable"=> true,
18-
"layout"=>{""=>""}}
16+
default_options = Dict("filename"=>"Plot from Julia API",
17+
"world_readable"=> true,
18+
"layout"=>Dict(""=>""))
1919

2020
## Taken from https://github.com/johnmyleswhite/Vega.jl/blob/master/src/Vega.jl#L51
2121
# Open a URL in a browser
22-
function openurl(url::String)
22+
function openurl(url::ASCIIString)
2323
@osx_only run(`open $url`)
2424
@windows_only run(`start $url`)
2525
@linux_only run(`xdg-open $url`)
2626
end
2727

28-
default_opts = {
29-
"origin" => "plot",
30-
"platform" => "Julia",
31-
"version" => "0.2"}
28+
default_opts = Dict(
29+
"origin" => "plot",
30+
"platform" => "Julia",
31+
"version" => "0.2")
3232

3333
function get_plot_endpoint()
3434
config = get_config()
3535
plot_endpoint = "clientresp"
3636
return "$(config.plotly_domain)/$plot_endpoint"
3737
end
3838

39-
function get_content_endpoint(file_id::String, owner::String)
39+
function get_content_endpoint(file_id::ASCIIString, owner::ASCIIString)
4040
config = get_config()
4141
api_endpoint = "$(config.plotly_api_domain)/$api_version/files"
4242
detail = "$owner:$file_id"
@@ -51,12 +51,12 @@ function plot(data::Array,options=Dict())
5151
opt = merge(default_options,options)
5252
r = post(endpoint,
5353
merge(default_opts,
54-
{
54+
Dict(
5555
"un" => creds.username,
5656
"key" => creds.api_key,
5757
"args" => json(data),
5858
"kwargs" => json(opt)
59-
})
59+
))
6060
)
6161
body=JSON.parse(bytestring(r.body))
6262

@@ -79,11 +79,11 @@ function layout(layout_opts::Dict,meta_opts=Dict())
7979

8080
r = post(endpoint,
8181
merge(default_opts,
82-
{"un" => creds.username,
82+
Dict("un" => creds.username,
8383
"key" => creds.api_key,
8484
"args" => json(layout_opts),
8585
"origin" => "layout",
86-
"kwargs" => json(meta_opts)}))
86+
"kwargs" => json(meta_opts))))
8787
__parseresponse(r)
8888
end
8989

@@ -95,16 +95,16 @@ function style(style_opts,meta_opts=Dict())
9595

9696
r = post(endpoint,
9797
merge(default_opts,
98-
{"un" => creds.username,
98+
Dict("un" => creds.username,
9999
"key" => creds.api_key,
100100
"args" => json([style_opts]),
101101
"origin" => "style",
102-
"kwargs" => json(meta_opts)}))
102+
"kwargs" => json(meta_opts))))
103103
__parseresponse(r)
104104
end
105105

106106

107-
function getFile(file_id::String, owner=None)
107+
function getFile(file_id::ASCIIString, owner=None)
108108
creds = get_credentials()
109109
username = creds.username
110110
api_key = creds.api_key
@@ -124,6 +124,7 @@ function getFile(file_id::String, owner=None)
124124
])
125125

126126
r = get(endpoint, options)
127+
print(r)
127128

128129
__parseresponse(r)
129130

@@ -159,11 +160,11 @@ function __parseresponse(r)
159160
end
160161
end
161162

162-
function get_template(format_type::String)
163+
function get_template(format_type::ASCIIString)
163164
if format_type == "layout"
164-
return {
165+
return Dict(
165166
"title"=>"Click to enter Plot title",
166-
"xaxis"=>{
167+
"xaxis"=>Dict(
167168
"range"=>[-1,6],
168169
"type"=>"-",
169170
"mirror"=>true,
@@ -190,9 +191,9 @@ function get_template(format_type::String)
190191
"zerolinewidth"=>1,
191192
"title"=>"Click to enter X axis title",
192193
"unit"=>"",
193-
"titlefont"=>{"family"=>"","size"=>0,"color"=>""},
194-
"tickfont"=>{"family"=>"","size"=>0,"color"=>""}},
195-
"yaxis"=>{
194+
"titlefont"=>Dict("family"=>"","size"=>0,"color"=>""),
195+
"tickfont"=>Dict("family"=>"","size"=>0,"color"=>"")),
196+
"yaxis"=>Dict(
196197
"range"=>[-1,4],
197198
"type"=>"-",
198199
"mirror"=>true,
@@ -219,18 +220,18 @@ function get_template(format_type::String)
219220
"zerolinewidth"=>1,
220221
"title"=>"Click to enter Y axis title",
221222
"unit"=>"",
222-
"titlefont"=>{"family"=>"","size"=>0,"color"=>""},
223-
"tickfont"=>{"family"=>"","size"=>0,"color"=>""}},
224-
"legend"=>{
223+
"titlefont"=>Dict("family"=>"","size"=>0,"color"=>""),
224+
"tickfont"=>Dict("family"=>"","size"=>0,"color"=>"")),
225+
"legend"=>Dict(
225226
"bgcolor"=>"#fff",
226227
"bordercolor"=>"#000",
227228
"borderwidth"=>1,
228-
"font"=>{"family"=>"","size"=>0,"color"=>""},
229-
"traceorder"=>"normal"},
229+
"font"=>Dict("family"=>"","size"=>0,"color"=>""),
230+
"traceorder"=>"normal"),
230231
"width"=>700,
231232
"height"=>450,
232233
"autosize"=>"initial",
233-
"margin"=>{"l"=>80,"r"=>80,"t"=>80,"b"=>80,"pad"=>2},
234+
"margin"=>Dict("l"=>80,"r"=>80,"t"=>80,"b"=>80,"pad"=>2),
234235
"paper_bgcolor"=>"#fff",
235236
"plot_bgcolor"=>"#fff",
236237
"barmode"=>"stack",
@@ -239,10 +240,10 @@ function get_template(format_type::String)
239240
"boxmode"=>"overlay",
240241
"boxgap"=>0.3,
241242
"boxgroupgap"=>0.3,
242-
"font"=>{"family"=>"Arial, sans-serif;","size"=>12,"color"=>"#000"},
243-
"titlefont"=>{"family"=>"","size"=>0,"color"=>""},
243+
"font"=>Dict("family"=>"Arial, sans-serif;","size"=>12,"color"=>"#000"),
244+
"titlefont"=>Dict("family"=>"","size"=>0,"color"=>""),
244245
"dragmode"=>"zoom",
245-
"hovermode"=>"x"}
246+
"hovermode"=>"x")
246247
end
247248
end
248249

‎src/plot.jl‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function get_points(f::Function, options=Dict())
2-
default = {"left"=>-10, "right"=>10, "step"=>0.5, "name"=>"$f", "type"=>"scatter", "mode"=>"lines"}
2+
default = Dict("left"=>-10, "right"=>10, "step"=>0.5, "name"=>"$f", "type"=>"scatter", "mode"=>"lines")
33
opt = merge(default, options)
44
n::Int = (opt["right"] - opt["left"]) / opt["step"] + 1
55
X = Float64[0 for i in 1:n]
@@ -12,31 +12,31 @@ function get_points(f::Function, options=Dict())
1212
end
1313

1414
if opt["type"] == "histogram"
15-
return {"x"=>Y, "type"=>opt["type"], "mode"=>opt["mode"], "name"=>opt["name"]}
15+
return Dict("x"=>Y, "type"=>opt["type"], "mode"=>opt["mode"], "name"=>opt["name"])
1616
elseif opt["type"] == "box"
17-
return {"y"=>Y, "type"=>opt["type"], "mode"=>opt["mode"], "name"=>opt["name"]}
17+
return Dict("y"=>Y, "type"=>opt["type"], "mode"=>opt["mode"], "name"=>opt["name"])
1818
else
19-
return {"x"=>X, "y"=>Y, "type"=>opt["type"], "mode"=>opt["mode"], "name"=>opt["name"]}
19+
return Dict("x"=>X, "y"=>Y, "type"=>opt["type"], "mode"=>opt["mode"], "name"=>opt["name"])
2020
end
2121
end
2222

23-
scatter(f::Array, options=Dict()) = merge({"type"=>"scatter","mode"=>"markers", "x"=>[1:length(f)], "y"=>f}, options)
24-
line(f::Array, options=Dict()) = merge({"type"=>"scatter","mode"=>"lines", "x"=>[1:length(f)], "y"=>f}, options)
25-
box(f::Array, options=Dict()) = merge({"type"=>"box", "x"=>[1:length(f)], "y"=>f}, options)
26-
histogram(f::Array, options=Dict()) = merge({"type"=>"histogram", "y"=>[1:length(f)], "x"=>f}, options)
27-
bar(f::Array, options=Dict()) = merge({"type"=>"bar", "x"=>[1:length(f)], "y"=>f}, options)
23+
scatter(f::Array, options=Dict()) = merge(Dict("type"=>"scatter","mode"=>"markers", "x"=>[1:length(f)], "y"=>f), options)
24+
line(f::Array, options=Dict()) = merge(Dict("type"=>"scatter","mode"=>"lines", "x"=>[1:length(f)], "y"=>f), options)
25+
box(f::Array, options=Dict()) = merge(Dict("type"=>"box", "x"=>[1:length(f)], "y"=>f), options)
26+
histogram(f::Array, options=Dict()) = merge(Dict("type"=>"histogram", "y"=>[1:length(f)], "x"=>f), options)
27+
bar(f::Array, options=Dict()) = merge(Dict("type"=>"bar", "x"=>[1:length(f)], "y"=>f), options)
2828

29-
scatter(f::Dict, options=Dict()) = merge({"type"=>"scatter","mode"=>"markers", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]}, options)
30-
line(f::Dict, options=Dict()) = merge({"type"=>"scatter","mode"=>"lines", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]}, options)
31-
box(f::Dict, options=Dict()) = merge({"type"=>"box", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]}, options)
32-
histogram(f::Dict, options=Dict()) = merge({"type"=>"histogram", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]}, options)
33-
bar(f::Dict, options=Dict()) = merge({"type"=>"bar", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]}, options)
29+
scatter(f::Dict, options=Dict()) = merge(Dict("type"=>"scatter","mode"=>"markers", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]), options)
30+
line(f::Dict, options=Dict()) = merge(Dict("type"=>"scatter","mode"=>"lines", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]), options)
31+
box(f::Dict, options=Dict()) = merge(Dict("type"=>"box", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]), options)
32+
histogram(f::Dict, options=Dict()) = merge(Dict("type"=>"histogram", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]), options)
33+
bar(f::Dict, options=Dict()) = merge(Dict("type"=>"bar", "x"=>[k for k in sort(collect(keys(f)))], "y"=>[f[k] for k in sort(collect(keys(f)))]), options)
3434

35-
scatter(f::Function, options=Dict()) = get_points(f, merge({"type"=>"scatter","mode"=>"markers"}, options))
36-
line(f::Function, options=Dict()) = get_points(f, merge({"type"=>"scatter","mode"=>"lines"}, options))
37-
box(f::Function, options=Dict()) = get_points(f, merge({"type"=>"box"}, options))
38-
histogram(f::Function, options=Dict()) = get_points(f, merge({"type"=>"histogram"}, options))
39-
bar(f::Function, options=Dict()) = get_points(f, merge({"type"=>"bar"}, options))
35+
scatter(f::Function, options=Dict()) = get_points(f, merge(Dict("type"=>"scatter","mode"=>"markers"), options))
36+
line(f::Function, options=Dict()) = get_points(f, merge(Dict("type"=>"scatter","mode"=>"lines"), options))
37+
box(f::Function, options=Dict()) = get_points(f, merge(Dict("type"=>"box"), options))
38+
histogram(f::Function, options=Dict()) = get_points(f, merge(Dict("type"=>"histogram"), options))
39+
bar(f::Function, options=Dict()) = get_points(f, merge(Dict("type"=>"bar"), options))
4040

4141
plot(f::Function, options=Dict()) = plot([line(f, options)])
4242
plot(fs::Array{Function,1}, options=Dict()) = plot([line(f, options) for f in fs])
@@ -51,7 +51,7 @@ if Pkg.installed("Polynomial") !== nothing
5151
bar(p::Poly, options=Dict()) = bar(x->polyval(p,x), options)
5252

5353
function plot{T<:Number}(ps::Array{Poly{T},1}, options=Dict())
54-
data = [get_points(x->polyval(p,x), merge({"name"=>"$p"}, options)) for p in ps]
54+
data = [get_points(x->polyval(p,x), merge(Dict("name"=>"$p"), options)) for p in ps]
5555
return plot([data], options)
5656
end
5757

@@ -64,14 +64,14 @@ if Pkg.installed("TimeSeries") !== nothing
6464
import TimeSeries: TimeArray, timestamp, values, colnames
6565

6666
scatter(ts::TimeArray, options=Dict()) = [
67-
{"x"=>map(t->"$t", timestamp(ts[col])), "y"=>values(ts[col]), "type"=>"scatter", "mode"=>"markers", "name"=>col}
67+
Dict("x"=>map(t->"$t", timestamp(ts[col])), "y"=>values(ts[col]), "type"=>"scatter", "mode"=>"markers", "name"=>col)
6868
for col in colnames(ts)
6969
]
7070

71-
line(ts::TimeArray, options=Dict()) = [merge(x,{"type"=>"line","mode"=>"lines"}) for x in scatter(ts)]
72-
box(ts::TimeArray, options=Dict()) = [merge(x,{"type"=>"box"}) for x in scatter(ts)]
73-
histogram(ts::TimeArray, options=Dict()) = [merge(x,{"type"=>"histogram"}) for x in scatter(ts)]
74-
bar(ts::TimeArray, options=Dict()) = [merge(x,{"type"=>"bar"}) for x in scatter(ts)]
71+
line(ts::TimeArray, options=Dict()) = [merge(x,Dict("type"=>"line","mode"=>"lines")) for x in scatter(ts)]
72+
box(ts::TimeArray, options=Dict()) = [merge(x,Dict("type"=>"box")) for x in scatter(ts)]
73+
histogram(ts::TimeArray, options=Dict()) = [merge(x,Dict("type"=>"histogram")) for x in scatter(ts)]
74+
bar(ts::TimeArray, options=Dict()) = [merge(x,Dict("type"=>"bar")) for x in scatter(ts)]
7575
plot(ts::TimeArray, options=Dict()) = plot([line(ts)], options)
7676
end
7777

@@ -80,30 +80,30 @@ if Pkg.installed("WAV") !== nothing
8080
w, Fs = wav
8181
X = [f/Fs for f in 1.0:length(w)]
8282
Y = [round(y,8) for y in w]
83-
return {"x"=>X, "y"=>Y, "type"=>"scatter", "mode"=>"lines", "name"=>"WAV data"}
83+
return Dict("x"=>X, "y"=>Y, "type"=>"scatter", "mode"=>"lines", "name"=>"WAV data")
8484
end
8585

86-
scatter{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),{"type"=>"scatter","mode"=>"markers"})
87-
box{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),{"type"=>"box"})
88-
histogram{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),{"type"=>"histogram"})
89-
bar{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),{"type"=>"bar"})
86+
scatter{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),Dict("type"=>"scatter","mode"=>"markers"))
87+
box{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),Dict("type"=>"box"))
88+
histogram{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),Dict("type"=>"histogram"))
89+
bar{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict()) = merge(line(wav),Dict("type"=>"bar"))
9090

9191
function plot{T<:Number,U<:Number,V<:Number}(wav::(Array{T,2},U,V,UnionType), options=Dict())
92-
opt = merge({"layout"=>{"xaxis"=>{"title"=>"seconds","dtick"=>1,"tick0"=>0,"autotick"=>false}}}, options)
92+
opt = merge(Dict("layout"=>Dict("xaxis"=>Dict("title"=>"seconds","dtick"=>1,"tick0"=>0,"autotick"=>false))), options)
9393
return plot([line(wav)], opt)
9494
end
9595
end
9696

9797
if Pkg.installed("DataFrames") !== nothing
9898
import DataFrames: DataFrame
9999

100-
scatter(df::DataFrame, options=Dict()) = get_points(df, merge({"type"=>"scatter","mode"=>"markers"}, options))
101-
line(df::DataFrame, options=Dict()) = get_points(df, merge({"type"=>"scatter","mode"=>"lines"}, options))
102-
box(df::DataFrame, options=Dict()) = get_points(df, merge({"type"=>"box"}, options))
103-
histogram(df::DataFrame, options=Dict()) = get_points(df, merge({"type"=>"histogram"}, options))
104-
bar(df::DataFrame, options=Dict()) = get_points(df, merge({"type"=>"bar"}, options))
100+
scatter(df::DataFrame, options=Dict()) = get_points(df, merge(Dict("type"=>"scatter","mode"=>"markers"), options))
101+
line(df::DataFrame, options=Dict()) = get_points(df, merge(Dict("type"=>"scatter","mode"=>"lines"), options))
102+
box(df::DataFrame, options=Dict()) = get_points(df, merge(Dict("type"=>"box"), options))
103+
histogram(df::DataFrame, options=Dict()) = get_points(df, merge(Dict("type"=>"histogram"), options))
104+
bar(df::DataFrame, options=Dict()) = get_points(df, merge(Dict("type"=>"bar"), options))
105105
function get_points(df::DataFrame, options=Dict())
106-
default = {"type"=>"scatter", "mode"=>"lines"}
106+
default = Dict("type"=>"scatter", "mode"=>"lines")
107107
opt = merge(default, options)
108108
for axis in ["xs", "ys"]
109109
if haskey(opt, axis) && typeof(opt[axis]) <: Symbol
@@ -114,27 +114,27 @@ if Pkg.installed("DataFrames") !== nothing
114114
if haskey(opt, "xs") && haskey(opt, "ys")
115115
if length(opt["xs"]) == length(opt["ys"])
116116
return [
117-
{"x"=>df[opt["xs"][i]], "y"=>df[opt["ys"][i]], "type"=>opt["type"], "mode"=>opt["mode"]}
117+
Dict("x"=>df[opt["xs"][i]], "y"=>df[opt["ys"][i]], "type"=>opt["type"], "mode"=>opt["mode"])
118118
for i in 1:length(opt["xs"])
119119
]
120120
else
121121
return [
122-
{"x"=>df[x], "y"=>df[y], "type"=>opt["type"], "mode"=>opt["mode"]}
122+
Dict("x"=>df[x], "y"=>df[y], "type"=>opt["type"], "mode"=>opt["mode"])
123123
for x in opt["xs"], y in opt["ys"]
124124
]
125125
end
126126
elseif haskey(opt, "xs")
127127
return [
128-
{"x"=>df[x], "type"=>opt["type"], "mode"=>opt["mode"]}
128+
Dict("x"=>df[x], "type"=>opt["type"], "mode"=>opt["mode"])
129129
for x in opt["xs"]
130130
]
131131
elseif haskey(opt, "ys")
132132
return [
133-
{"y"=>df[y], "type"=>opt["type"], "mode"=>opt["mode"]}
133+
Dict("y"=>df[y], "type"=>opt["type"], "mode"=>opt["mode"])
134134
for y in opt["ys"]
135135
]
136136
else
137-
return {"error"=>"Please set the xs and/or ys options."}
137+
return Dict("error"=>"Please set the xs and/or ys options.")
138138
end
139139
end
140140

@@ -146,7 +146,7 @@ if Pkg.installed("DataFrames") !== nothing
146146
elseif haskey(options, "ys")
147147
return plot([box(df)], options)
148148
else
149-
return {"error"=>"Please set the xs and/or ys options."}
149+
return Dict("error"=>"Please set the xs and/or ys options.")
150150
end
151151
end
152-
end
152+
end

0 commit comments

Comments
 (0)