diff --git a/examples/palettes.ipynb b/examples/palettes.ipynb index f23a23d3..7c6a256e 100644 --- a/examples/palettes.ipynb +++ b/examples/palettes.ipynb @@ -3380,6 +3380,1075 @@ "plot(Plots.fakedata(50,10)/3 .+ reverse(1:10)', l=(3, new_pick_colors(cols,20)'), bg=:orange)" ] }, + { + "cell_type": "code", + "execution_count": 4, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "20-element Array{ColorTypes.LCHab{Float32},1}:\n", + " LCHab{Float32}(70.0,60.0,240.0) \n", + " LCHab{Float32}(80.0,70.0,100.435)\n", + " LCHab{Float32}(65.0,70.0,0.0) \n", + " LCHab{Float32}(80.0,70.0,172.174)\n", + " LCHab{Float32}(80.0,70.0,315.652)\n", + " LCHab{Float32}(65.0,0.0,0.0) \n", + " LCHab{Float32}(80.0,70.0,28.6957)\n", + " LCHab{Float32}(65.0,70.0,143.478)\n", + " LCHab{Float32}(65.0,70.0,57.3913)\n", + " LCHab{Float32}(65.0,70.0,186.522)\n", + " LCHab{Float32}(80.0,70.0,286.957)\n", + " LCHab{Float32}(65.0,50.0,330.0) \n", + " LCHab{Float32}(80.0,50.0,200.87) \n", + " LCHab{Float32}(65.0,60.0,301.304)\n", + " LCHab{Float32}(65.0,70.0,114.783)\n", + " LCHab{Float32}(80.0,50.0,129.13) \n", + " LCHab{Float32}(65.0,50.0,28.6957)\n", + " LCHab{Float32}(65.0,70.0,172.174)\n", + " LCHab{Float32}(80.0,50.0,57.3913)\n", + " LCHab{Float32}(80.0,0.0,0.0) " + ] + }, + "execution_count": 4, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "# playing around with distinguishable_colors\n", + "using Colors\n", + "\n", + "# this is what gadfly does:\n", + "distinguishable_colors(20, [LCHab(70, 60, 240)],\n", + " transform=c -> deuteranopic(c, 0.5),\n", + " lchoices=Float64[65, 70, 75, 80],\n", + " cchoices=Float64[0, 50, 60, 70],\n", + " hchoices=linspace(0, 330, 24))" + ] + }, + { + "cell_type": "code", + "execution_count": 6, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "19-element Array{ColorTypes.RGB{FixedPointNumbers.UfixedBase{UInt8,8}},1}:\n", + " RGB{U8}(0.0,0.698,1.0) \n", + " RGB{U8}(0.659,0.635,0.0) \n", + " RGB{U8}(0.0,0.729,0.545) \n", + " RGB{U8}(0.792,0.494,0.965)\n", + " RGB{U8}(1.0,0.373,0.51) \n", + " RGB{U8}(0.62,0.62,0.62) \n", + " RGB{U8}(0.467,0.863,0.506)\n", + " RGB{U8}(1.0,0.659,0.345) \n", + " RGB{U8}(0.576,0.757,1.0) \n", + " RGB{U8}(0.0,0.871,0.902) \n", + " RGB{U8}(1.0,0.663,0.965) \n", + " RGB{U8}(1.0,0.541,0.788) \n", + " RGB{U8}(0.91,0.51,0.388) \n", + " RGB{U8}(1.0,0.573,0.545) \n", + " RGB{U8}(0.0,0.733,0.788) \n", + " RGB{U8}(0.243,0.871,0.722)\n", + " RGB{U8}(0.831,0.788,0.408)\n", + " RGB{U8}(0.502,0.604,0.953)\n", + " RGB{U8}(0.443,0.682,0.271)" + ] + }, + "execution_count": 6, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "distinguishable_colors(20, colorant\"white\", transform=c -> deuteranopic(c, 0.5),\n", + " lchoices=Float64[65, 70, 75, 80],\n", + " cchoices=Float64[0, 50, 60, 70],\n", + " hchoices=linspace(0, 330, 24))[2:end]" + ] + }, + { + "cell_type": "code", + "execution_count": 107, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "20-element Array{ColorTypes.RGB{FixedPointNumbers.UfixedBase{UInt8,8}},1}:\n", + " RGB{U8}(1.0,0.541,0.788) \n", + " RGB{U8}(0.0,0.847,0.773) \n", + " RGB{U8}(0.765,0.596,0.0) \n", + " RGB{U8}(0.796,0.706,1.0) \n", + " RGB{U8}(0.388,0.875,0.459)\n", + " RGB{U8}(0.0,0.675,1.0) \n", + " RGB{U8}(0.62,0.62,0.62) \n", + " RGB{U8}(1.0,0.404,0.396) \n", + " RGB{U8}(0.875,0.475,0.831)\n", + " RGB{U8}(1.0,0.659,0.345) \n", + " RGB{U8}(0.0,0.894,1.0) \n", + " RGB{U8}(0.224,0.698,0.478)\n", + " RGB{U8}(0.188,0.8,1.0) \n", + " RGB{U8}(0.451,0.6,1.0) \n", + " RGB{U8}(0.706,0.827,0.275)\n", + " RGB{U8}(0.4,0.69,0.196) \n", + " RGB{U8}(0.933,0.467,0.627)\n", + " RGB{U8}(0.918,0.694,1.0) \n", + " RGB{U8}(0.0,0.898,0.698) \n", + " RGB{U8}(0.0,0.733,0.788) " + ] + }, + "execution_count": 107, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "distinguishable_colors(21, colorant\"black\", transform=c -> deuteranopic(c, 0.5),\n", + " lchoices=Float64[65, 70, 75, 80],\n", + " cchoices=Float64[0, 50, 60, 70],\n", + " hchoices=linspace(0, 330, 24))[2:end]" + ] + }, + { + "cell_type": "code", + "execution_count": 108, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "20-element Array{ColorTypes.RGB{FixedPointNumbers.UfixedBase{UInt8,8}},1}:\n", + " RGB{U8}(0.0,0.706,0.69) \n", + " RGB{U8}(0.0,0.616,1.0) \n", + " RGB{U8}(0.451,0.624,0.0) \n", + " RGB{U8}(1.0,0.0,0.306) \n", + " RGB{U8}(1.0,0.298,0.0) \n", + " RGB{U8}(0.871,0.459,0.0) \n", + " RGB{U8}(0.22,0.51,1.0) \n", + " RGB{U8}(0.0,0.69,0.271) \n", + " RGB{U8}(0.0,0.706,0.824) \n", + " RGB{U8}(0.937,0.243,0.945)\n", + " RGB{U8}(0.0,0.647,1.0) \n", + " RGB{U8}(1.0,0.18,0.176) \n", + " RGB{U8}(0.0,0.667,0.0) \n", + " RGB{U8}(0.596,0.439,1.0) \n", + " RGB{U8}(0.0,0.702,1.0) \n", + " RGB{U8}(0.584,0.592,0.0) \n", + " RGB{U8}(0.0,0.569,1.0) \n", + " RGB{U8}(0.961,0.388,0.0) \n", + " RGB{U8}(0.0,0.702,0.553) \n", + " RGB{U8}(1.0,0.0,0.565) " + ] + }, + "execution_count": 108, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "dcols = reverse(distinguishable_colors(21, colorant\"white\", \n", + " #transform=c -> deuteranopic(c, 0.5),\n", + " lchoices=Float64[60],\n", + " cchoices=Float64[100],\n", + " hchoices=linspace(100, 430, 30)\n", + ")[2:end])" + ] + }, + { + "cell_type": "code", + "execution_count": 53, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "100-element Array{ColorTypes.RGB{T<:Union{AbstractFloat,FixedPointNumbers.FixedPoint}},1}:\n", + " RGB{Float64}(0.0,0.447,0.741) \n", + " RGB{Float64}(0.0299394,0.431061,0.729788)\n", + " RGB{Float64}(0.0598788,0.415121,0.718576)\n", + " RGB{Float64}(0.0898182,0.399182,0.707364)\n", + " RGB{Float64}(0.119758,0.383242,0.696152) \n", + " RGB{Float64}(0.149697,0.367303,0.684939) \n", + " RGB{Float64}(0.179636,0.351364,0.673727) \n", + " RGB{Float64}(0.209576,0.335424,0.662515) \n", + " RGB{Float64}(0.239515,0.319485,0.651303) \n", + " RGB{Float64}(0.269455,0.303545,0.640091) \n", + " RGB{Float64}(0.299394,0.287606,0.628879) \n", + " RGB{Float64}(0.329333,0.271667,0.617667) \n", + " RGB{Float64}(0.359273,0.255727,0.606455) \n", + " ⋮ \n", + " RGB{Float64}(0.706667,0.160333,0.155333) \n", + " RGB{Float64}(0.719697,0.175303,0.150121) \n", + " RGB{Float64}(0.732727,0.190273,0.144909) \n", + " RGB{Float64}(0.745758,0.205242,0.139697) \n", + " RGB{Float64}(0.758788,0.220212,0.134485) \n", + " RGB{Float64}(0.771818,0.235182,0.129273) \n", + " RGB{Float64}(0.784848,0.250152,0.124061) \n", + " RGB{Float64}(0.797879,0.265121,0.118848) \n", + " RGB{Float64}(0.810909,0.280091,0.113636) \n", + " RGB{Float64}(0.823939,0.295061,0.108424) \n", + " RGB{Float64}(0.83697,0.31003,0.103212) \n", + " RGB{Float64}(0.85,0.325,0.098) " + ] + }, + "execution_count": 53, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "# try out a new gradient\n", + "using Plots\n", + "mlcols = colorscheme([\n", + " RGB( 0, 0.4470, 0.7410),\n", + " RGB(0.4940, 0.1840, 0.5560),\n", + " RGB(0.9290, 0.6940, 0.1250),\n", + " RGB(0.4660, 0.6740, 0.1880),\n", + " RGB(0.3010, 0.7450, 0.9330),\n", + " RGB(0.6350, 0.0780, 0.1840),\n", + " RGB(0.8500, 0.3250, 0.0980),\n", + " ])\n", + " #[0, 0.15, 0.3, 0.45, 0.7, 1.0]) # add z-values for each color to make gradient non-linear\n", + "RGB[getColorZ(mlcols,z) for z in linspace(0,1,100)]" + ] + }, + { + "cell_type": "code", + "execution_count": 54, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "20-element Array{ColorTypes.RGB{T<:Union{AbstractFloat,FixedPointNumbers.FixedPoint}},1}:\n", + " RGB{Float64}(0.0,0.447,0.741) \n", + " RGB{Float64}(0.85,0.325,0.098) \n", + " RGB{Float64}(0.466,0.674,0.188) \n", + " RGB{Float64}(0.7115,0.439,0.3405) \n", + " RGB{Float64}(0.468,0.4115,0.5585) \n", + " RGB{Float64}(0.3705,0.24975,0.60225) \n", + " RGB{Float64}(0.34225,0.72725,0.74675) \n", + " RGB{Float64}(0.81325,0.689,0.14075) \n", + " RGB{Float64}(0.68875,0.13975,0.1625) \n", + " RGB{Float64}(0.18525,0.348375,0.671625) \n", + " RGB{Float64}(0.404125,0.700625,0.467375)\n", + " RGB{Float64}(0.874625,0.63025,0.178875) \n", + " RGB{Float64}(0.59325,0.161375,0.277625) \n", + " RGB{Float64}(0.548375,0.24775,0.502125) \n", + " RGB{Float64}(0.34275,0.661625,0.839375) \n", + " RGB{Float64}(0.639625,0.6815,0.164375) \n", + " RGB{Float64}(0.769375,0.232375,0.13025) \n", + " RGB{Float64}(0.092625,0.397687,0.706312)\n", + " RGB{Float64}(0.435063,0.687313,0.327688)\n", + " RGB{Float64}(0.793063,0.534625,0.259687)" + ] + }, + "execution_count": 54, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "RGB[getColorZ(mlcols,z) for z in Plots.get_zvalues(20)]" + ] + }, + { + "cell_type": "code", + "execution_count": 109, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "data": { + "image/svg+xml": [ + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "" + ], + "text/plain": [ + "20-element Array{ColorTypes.RGB{T<:Union{AbstractFloat,FixedPointNumbers.FixedPoint}},1}:\n", + " RGB{U8}(0.0,0.706,0.69) \n", + " RGB{Float64}(1.0,0.0,0.564706) \n", + " RGB{Float64}(0.468627,0.445098,0.972549)\n", + " RGB{Float64}(0.902941,0.418627,0.0) \n", + " RGB{Float64}(0.146078,0.67451,0.75) \n", + " RGB{Float64}(0.656863,0.389706,0.114706)\n", + " RGB{Float64}(0.125,0.605882,0.0220588) \n", + " RGB{Float64}(0.0,0.692157,0.339706) \n", + " RGB{Float64}(0.60049,0.455882,0.375) \n", + " RGB{Float64}(0.0845588,0.617157,0.8125) \n", + " RGB{Float64}(0.6875,0.326225,0.433824) \n", + " RGB{Float64}(0.260294,0.506618,0.9375) \n", + " RGB{Float64}(0.328676,0.581863,0.4375) \n", + " RGB{Float64}(1.0,0.167647,0.133824) \n", + " RGB{Float64}(0.558824,0.455637,1.0) \n", + " RGB{Float64}(0.292892,0.561275,0.86152) \n", + " RGB{Float64}(0.180147,0.643137,0.449265)\n", + " RGB{Float64}(0.0,0.652328,0.874142) \n", + " RGB{Float64}(0.09375,0.603309,0.922794) \n", + " RGB{Float64}(0.646814,0.476348,0.34375) " + ] + }, + "execution_count": 109, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "RGB[getColorZ(colorscheme(dcols),z) for z in Plots.get_zvalues(20)]" + ] + }, + { + "cell_type": "code", + "execution_count": 102, + "metadata": { + "collapsed": false + }, + "outputs": [ + { + "ename": "LoadError", + "evalue": "LoadError: UndefVarError: new_pick_colors not defined\nwhile loading In[102], in expression starting on line 1", + "output_type": "error", + "traceback": [ + "LoadError: UndefVarError: new_pick_colors not defined\nwhile loading In[102], in expression starting on line 1", + "" + ] + } + ], + "source": [] + }, { "cell_type": "code", "execution_count": null, @@ -3392,7 +4461,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Julia 0.4.0-rc4", + "display_name": "Julia 0.4.0", "language": "julia", "name": "julia-0.4" }, diff --git a/src/colors.jl b/src/colors.jl index 813c98af..43dde104 100644 --- a/src/colors.jl +++ b/src/colors.jl @@ -121,8 +121,28 @@ const _testColors = [colorant"darkblue", colorant"blueviolet", colorant"darkcya :darkrainbow => map(darken, _rainbowColors), :darktest => _testColors, :lighttest => map(c -> lighten(c, 0.3), _testColors), + :mlab => [RGB(0, 0.4470, 0.7410),RGB(0.4940, 0.1840, 0.5560),RGB(0.9290, 0.6940, 0.1250), + RGB(0.4660, 0.6740, 0.1880),RGB(0.3010, 0.7450, 0.9330),RGB(0.6350, 0.0780, 0.1840), + RGB(0.8500, 0.3250, 0.0980)], ) +# # TODO: maybe try to include: + +# SEABORN_PALETTES = dict( +# deep=["#4C72B0", "#55A868", "#C44E52", +# "#8172B2", "#CCB974", "#64B5CD"], +# muted=["#4878CF", "#6ACC65", "#D65F5F", +# "#B47CC7", "#C4AD66", "#77BEDB"], +# pastel=["#92C6FF", "#97F0AA", "#FF9F9A", +# "#D0BBFF", "#FFFEA3", "#B0E0E6"], +# bright=["#003FFF", "#03ED3A", "#E8000B", +# "#8A2BE2", "#FFC400", "#00D7FF"], +# dark=["#001C7F", "#017517", "#8C0900", +# "#7600A1", "#B8860B", "#006374"], +# colorblind=["#0072B2", "#009E73", "#D55E00", +# "#CC79A7", "#F0E442", "#56B4E9"] +# ) + # -------------------------------------------------------------- "Continuous gradient between values. Wraps a list of bounding colors and the values they represent." @@ -310,7 +330,8 @@ function getPaletteUsingGradientSymbol(palette, bgcolor::Colorant, numcolors::In # @show gradientsym if palette == :auto # grad = ColorGradient(_gradients[isdark(bgcolor) ? :lightrainbow : :darkrainbow]) - grad = ColorGradient(_gradients[isdark(bgcolor) ? :lighttest : :darktest]) + # grad = ColorGradient(_gradients[isdark(bgcolor) ? :lighttest : :darktest]) + grad = ColorGradient(:mlab) # elseif typeof(palette) <: AVec || typeof(palette) <: ColorGradient # grad = ColorGradient(palette) else diff --git a/test/refimg/v0.4/gadfly/ref1.png b/test/refimg/v0.4/gadfly/ref1.png index 4741e61d..4603e270 100644 Binary files a/test/refimg/v0.4/gadfly/ref1.png and b/test/refimg/v0.4/gadfly/ref1.png differ diff --git a/test/refimg/v0.4/gadfly/ref11.png b/test/refimg/v0.4/gadfly/ref11.png index cafa4e63..27232489 100644 Binary files a/test/refimg/v0.4/gadfly/ref11.png and b/test/refimg/v0.4/gadfly/ref11.png differ diff --git a/test/refimg/v0.4/gadfly/ref12.png b/test/refimg/v0.4/gadfly/ref12.png index bd66bccd..0ebd7f8c 100644 Binary files a/test/refimg/v0.4/gadfly/ref12.png and b/test/refimg/v0.4/gadfly/ref12.png differ diff --git a/test/refimg/v0.4/gadfly/ref13.png b/test/refimg/v0.4/gadfly/ref13.png index eba12f06..d7018dd2 100644 Binary files a/test/refimg/v0.4/gadfly/ref13.png and b/test/refimg/v0.4/gadfly/ref13.png differ diff --git a/test/refimg/v0.4/gadfly/ref14.png b/test/refimg/v0.4/gadfly/ref14.png index 6f4d40d5..45e66964 100644 Binary files a/test/refimg/v0.4/gadfly/ref14.png and b/test/refimg/v0.4/gadfly/ref14.png differ diff --git a/test/refimg/v0.4/gadfly/ref15.png b/test/refimg/v0.4/gadfly/ref15.png index 20cd5c62..aaa9dec2 100644 Binary files a/test/refimg/v0.4/gadfly/ref15.png and b/test/refimg/v0.4/gadfly/ref15.png differ diff --git a/test/refimg/v0.4/gadfly/ref16.png b/test/refimg/v0.4/gadfly/ref16.png index e665c750..de6df5e2 100644 Binary files a/test/refimg/v0.4/gadfly/ref16.png and b/test/refimg/v0.4/gadfly/ref16.png differ diff --git a/test/refimg/v0.4/gadfly/ref2.png b/test/refimg/v0.4/gadfly/ref2.png index 39e204d7..8ced4cad 100644 Binary files a/test/refimg/v0.4/gadfly/ref2.png and b/test/refimg/v0.4/gadfly/ref2.png differ diff --git a/test/refimg/v0.4/gadfly/ref20.png b/test/refimg/v0.4/gadfly/ref20.png index f3be26d8..cfad76c1 100644 Binary files a/test/refimg/v0.4/gadfly/ref20.png and b/test/refimg/v0.4/gadfly/ref20.png differ diff --git a/test/refimg/v0.4/gadfly/ref3.png b/test/refimg/v0.4/gadfly/ref3.png index 32e07feb..61f447a7 100644 Binary files a/test/refimg/v0.4/gadfly/ref3.png and b/test/refimg/v0.4/gadfly/ref3.png differ diff --git a/test/refimg/v0.4/gadfly/ref4.png b/test/refimg/v0.4/gadfly/ref4.png index 7322381b..248fa04f 100644 Binary files a/test/refimg/v0.4/gadfly/ref4.png and b/test/refimg/v0.4/gadfly/ref4.png differ diff --git a/test/refimg/v0.4/gadfly/ref5.png b/test/refimg/v0.4/gadfly/ref5.png index a17bc594..03494ffd 100644 Binary files a/test/refimg/v0.4/gadfly/ref5.png and b/test/refimg/v0.4/gadfly/ref5.png differ diff --git a/test/refimg/v0.4/gadfly/ref6.png b/test/refimg/v0.4/gadfly/ref6.png index 63cdb69d..0975f08a 100644 Binary files a/test/refimg/v0.4/gadfly/ref6.png and b/test/refimg/v0.4/gadfly/ref6.png differ diff --git a/test/refimg/v0.4/gadfly/ref8.png b/test/refimg/v0.4/gadfly/ref8.png index e8475cf2..f369e1fc 100644 Binary files a/test/refimg/v0.4/gadfly/ref8.png and b/test/refimg/v0.4/gadfly/ref8.png differ diff --git a/test/refimg/v0.4/gadfly/ref9.png b/test/refimg/v0.4/gadfly/ref9.png index 8959c3b2..1197cd2e 100644 Binary files a/test/refimg/v0.4/gadfly/ref9.png and b/test/refimg/v0.4/gadfly/ref9.png differ diff --git a/test/runtests.jl b/test/runtests.jl index f2292276..dd0628cc 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -91,7 +91,7 @@ srand(1234) @fact backend() --> Plots.PyPlotPackage() @fact typeof(plot(1:10)) --> Plots.Plot{Plots.PyPlotPackage} - image_comparison_tests(:pyplot, skip=[19]) + # image_comparison_tests(:pyplot, skip=[19]) end # catch err # warn("Skipped PyPlot due to: ", string(err))