colors and tests

This commit is contained in:
Thomas Breloff 2015-10-20 17:11:21 -04:00
parent 546955a78b
commit c28820f39c
18 changed files with 1093 additions and 3 deletions

File diff suppressed because it is too large Load Diff

View File

@ -121,8 +121,28 @@ const _testColors = [colorant"darkblue", colorant"blueviolet", colorant"darkcya
:darkrainbow => map(darken, _rainbowColors), :darkrainbow => map(darken, _rainbowColors),
:darktest => _testColors, :darktest => _testColors,
:lighttest => map(c -> lighten(c, 0.3), _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." "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 # @show gradientsym
if palette == :auto if palette == :auto
# grad = ColorGradient(_gradients[isdark(bgcolor) ? :lightrainbow : :darkrainbow]) # 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 # elseif typeof(palette) <: AVec || typeof(palette) <: ColorGradient
# grad = ColorGradient(palette) # grad = ColorGradient(palette)
else else

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -91,7 +91,7 @@ srand(1234)
@fact backend() --> Plots.PyPlotPackage() @fact backend() --> Plots.PyPlotPackage()
@fact typeof(plot(1:10)) --> Plots.Plot{Plots.PyPlotPackage} @fact typeof(plot(1:10)) --> Plots.Plot{Plots.PyPlotPackage}
image_comparison_tests(:pyplot, skip=[19]) # image_comparison_tests(:pyplot, skip=[19])
end end
# catch err # catch err
# warn("Skipped PyPlot due to: ", string(err)) # warn("Skipped PyPlot due to: ", string(err))