mantao/Plots.jl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Daniel Schwabeneder 2018-10-14 15:50:10 +02:00
commit 1cc84672e7
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/backends.jl
View File

@ -544,7 +544,11 @@ const _pgfplots_attr = merge_with_base_supported([
# :bar_width, :bar_edges, # :bar_width, :bar_edges,
:title, :title,
# :window_title, # :window_title,
<<<<<<< HEAD
:guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation, :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
=======
:guide, :lims, :ticks, :scale, :flip, :rotation,
>>>>>>> fc51c355a5c1db860ae18146a33f17f784031a4b
:tickfont, :guidefont, :legendfont, :tickfont, :guidefont, :legendfont,
:grid, :legend, :grid, :legend,
:colorbar, :colorbar_title, :colorbar, :colorbar_title,
@ -560,7 +564,11 @@ const _pgfplots_attr = merge_with_base_supported([
:framestyle, :framestyle,
:camera, :camera,
:contour_labels, :contour_labels,
<<<<<<< HEAD
]) ])
=======
])
>>>>>>> fc51c355a5c1db860ae18146a33f17f784031a4b
const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape, :straightline,] const _pgfplots_seriestype = [:path, :path3d, :scatter, :steppre, :stepmid, :steppost, :histogram2d, :ysticks, :xsticks, :contour, :shape, :straightline,]
const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot] const _pgfplots_style = [:auto, :solid, :dash, :dot, :dashdot, :dashdotdot]
const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline] #vcat(_allMarkers, Shape) const _pgfplots_marker = [:none, :auto, :circle, :rect, :diamond, :utriangle, :dtriangle, :cross, :xcross, :star5, :pentagon, :hline] #vcat(_allMarkers, Shape)
@ -633,7 +641,11 @@ const _pyplot_attr = merge_with_base_supported([
:bins, :bar_width, :bar_edges, :bar_position, :bins, :bar_width, :bar_edges, :bar_position,
:title, :title_location, :titlefont, :title, :title_location, :titlefont,
:window_title, :window_title,
<<<<<<< HEAD
:guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation, :guide, :guide_position, :lims, :ticks, :scale, :flip, :rotation,
=======
:guide, :lims, :ticks, :scale, :flip, :rotation,
>>>>>>> fc51c355a5c1db860ae18146a33f17f784031a4b
:titlefontfamily, :titlefontsize, :titlefontcolor, :titlefontfamily, :titlefontsize, :titlefontcolor,
:legendfontfamily, :legendfontsize, :legendfontcolor, :legendfontfamily, :legendfontsize, :legendfontcolor,
:tickfontfamily, :tickfontsize, :tickfontcolor, :tickfontfamily, :tickfontsize, :tickfontcolor,
@ -757,7 +769,10 @@ const _inspectdr_attr = merge_with_base_supported([
:foreground_color_legend, :foreground_color_title, :foreground_color_legend, :foreground_color_title,
:foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text, :foreground_color_axis, :foreground_color_border, :foreground_color_guide, :foreground_color_text,
:label, :label,
<<<<<<< HEAD
:seriescolor, :seriesalpha, :seriescolor, :seriesalpha,
=======
>>>>>>> fc51c355a5c1db860ae18146a33f17f784031a4b
:linecolor, :linestyle, :linewidth, :linealpha, :linecolor, :linestyle, :linewidth, :linealpha,
:markershape, :markercolor, :markersize, :markeralpha, :markershape, :markercolor, :markersize, :markeralpha,
:markerstrokewidth, :markerstrokecolor, :markerstrokealpha, :markerstrokewidth, :markerstrokecolor, :markerstrokealpha,
@ -771,8 +786,12 @@ const _inspectdr_attr = merge_with_base_supported([
:legendfontfamily, :legendfontsize, :legendfontcolor, :legendfontfamily, :legendfontsize, :legendfontcolor,
:tickfontfamily, :tickfontsize, :tickfontcolor, :tickfontfamily, :tickfontsize, :tickfontcolor,
:guidefontfamily, :guidefontsize, :guidefontcolor, :guidefontfamily, :guidefontsize, :guidefontcolor,
<<<<<<< HEAD
:grid, #:gridalpha, :gridstyle, :gridlinewidth, #alhpa & linewidth are per plot - not per subplot :grid, #:gridalpha, :gridstyle, :gridlinewidth, #alhpa & linewidth are per plot - not per subplot
:legend, #:legendtitle, :colorbar, :legend, #:legendtitle, :colorbar,
=======
:grid, :legend, #:colorbar,
>>>>>>> fc51c355a5c1db860ae18146a33f17f784031a4b
# :marker_z, # :marker_z,
# :line_z, # :line_z,
# :levels, # :levels,

3
src/examples.jl
View File

@ -443,7 +443,10 @@ _backend_skips = Dict(
:gr => [25, 30], :gr => [25, 30],
:pyplot => [25, 30], :pyplot => [25, 30],
:plotlyjs => [2, 21, 25, 30, 31], :plotlyjs => [2, 21, 25, 30, 31],
<<<<<<< HEAD
:pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30], :pgfplots => [2, 5, 6, 10, 16, 20, 22, 23, 25, 28, 30],
=======
>>>>>>> fc51c355a5c1db860ae18146a33f17f784031a4b
) )
# --------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------