working on org/docs/test

This commit is contained in:
Thomas Breloff 2015-09-02 19:09:15 -04:00
parent 0d0e584748
commit add53e4dbc
5 changed files with 8 additions and 8 deletions

View File

@ -13,6 +13,7 @@ export
typealias AVec AbstractVector
typealias AMat AbstractMatrix
abstract PlottingPackage
const IMG_DIR = "$(ENV["HOME"])/.julia/v0.4/Plots/img/"
@ -21,7 +22,7 @@ const IMG_DIR = "$(ENV["HOME"])/.julia/v0.4/Plots/img/"
type Plot
o # the underlying object
plotter::Symbol
plotter::PlottingPackage
xdata::Vector{AVec}
ydata::Vector{AVec}
end

View File

@ -4,7 +4,7 @@
immutable GadflyPackage <: PlottingPackage end
# newplot(pkg::QwtPackage) = Plot(Qwt.plot(zeros(0,0)), pkg, AVec[], AVec[])
# plot(::QwtPackage, plt::Plot; kw...) = Qwt.oplot(plt.o; kw...)
# plot!(::GadflyPackage, plt::Plot; kw...) = Qwt.oplot(plt.o; kw...)
# plot(::GadflyPackage, y; kw...) = Gadfly.plot(; x = 1:length(y), y = y, kw...)
# plot(::GadflyPackage, x, y; kw...) = Gadfly.plot(; x = x, y = y, kw...)

View File

@ -8,10 +8,8 @@ using Requires
# ---------------------------------------------------------
abstract PlottingPackage
const AVAILABLE_PACKAGES = [:Qwt, :Gadfly]
const AVAILABLE_PACKAGES = [:qwt, :gadfly]
const INITIALIZED_PACKAGES = Set{Symbol}()
type CurrentPackage

View File

@ -4,6 +4,6 @@
immutable QwtPackage <: PlottingPackage end
newplot(pkg::QwtPackage) = Plot(Qwt.plot(zeros(0,0)), pkg, AVec[], AVec[])
plot(::QwtPackage, plt::Plot; kw...) = Qwt.oplot(plt.o; kw...)
plot!(::QwtPackage, plt::Plot; kw...) = Qwt.oplot(plt.o; kw...)
# subplot(::QwtPackage, args...; kw...) = Qwt.subplot(args...; kw...)
# savepng(::QwtPackage, plt, fn::String, args...) = Qwt.savepng(plt, fn)

View File

@ -7,13 +7,14 @@ using FactCheck
facts("Qwt") do
@fact plotter!(:qwt) --> nothing
@fact plotter() --> Plots.QwtPackage()
@fact tpye(plot(1:10, show=false)) --> Plot
@fact typeof(plot(1:10, show=false)) --> Plot
end
facts("Gadfly") do
@fact plotter!(:gadfly) --> nothing
@fact plotter() --> Plots.GadflyPackage()
@fact tpye(plot(1:10, show=false)) --> Plot
@fact typeof(plot(1:10, show=false)) --> Plot
end
FactCheck.exitstatus()
end # module