Module:Graph: Difference between revisions

Revision as of 14:50, 16 May 2016

Revision as of 06:15, 9 August 2017

Line 7:

-- 2016-03-20 Allow omitted data for charts, labels for line charts with string (ordinal) scale at point ___location

-- 2016-05-16 Added encodeTitleForPath() to help all path-based APIs graphs like pageviews

-- 2017-08-08 Added showSymbols param to show symbols on line charts

local p = {}

Line 635 ⟶ 636:

return textmarks

end

end

local function getSymbolMarks(chartvis)

local symbolmarks =

{

type = "symbol",

properties =

{

enter =

{

x = { scale = "x", field = "x" },

y = { scale = "y", field = "y" },

fill = { scale = "color", field = "series" },

shape = "circle",

size = { value = 49 }

}

}

}

if chartvis.from then symbolmarks.from = copy(chartvis.from) end

return symbolmarks

end

Line 702 ⟶ 724:

local xAxisFormat = frame.args.xAxisFormat

local yAxisFormat = frame.args.yAxisFormat

-- for line chart, show a symbol at each data point

local showSymbols = frame.args.showSymbols

-- show legend with given title

local legendTitle = frame.args.legend

Line 788 ⟶ 812:

-- create chart markings

local chartvis = getChartVisualisation(chartType, stacked, colorField, #y, innerRadius, outerRadius, linewidth, alphaScale, radiusScale, interpolate)

local marks = { chartvis }

-- text marks

local textmarks

if showValues then

if type(showValues) == "string" then -- deserialize as table

Line 803 ⟶ 827:

local chartmarks = chartvis

if chartmarks.marks then chartmarks = chartmarks.marks[1] end

local textmarks = getTextMarks(chartmarks, chartType, outerRadius, scales, radiusScale, yType, showValues)

if chartmarks ~= chartvis then

table.insert(chartvis.marks, textmarks)

else

textmarks = nil

table.insert(marks, textmarks)

end

end

-- symbol marks

if chartType == "line" and showSymbols then

local chartmarks = chartvis

if chartmarks.marks then chartmarks = chartmarks.marks[1] end

local symbolmarks = getSymbolMarks(chartmarks)

if chartmarks ~= chartvis then

table.insert(chartvis.marks, symbolmarks)

else

table.insert(marks, symbolmarks)

end

end

Line 826 ⟶ 863:

scales = scales,

axes = { xAxis, yAxis },

marks = { chartvis, textmarks }marks,

legends = { legend }

}