Module:Graph/sandbox - Revision history

Lemondoge: simplification

2023-04-11T02:22:42Z

simplification

← Previous revision		Revision as of 02:22, 11 April 2023
Line 150:		Line 150:
	if isNumbers then		if isNumbers then
	if colorScale then colorScale = string.lower(colorScale) end		if colorScale then colorScale = string.lower(colorScale) end
	if colorScale == "category10" or colorScale == "category20" then ~~else~~ colorScale = stringArray(colorScale) end		if colorScale ~= "category10" and colorScale ~= "category20" then colorScale = stringArray(colorScale) end
	scales =		scales =
	{		{

Lemondoge: used elseif instead of else if

2023-04-03T18:43:16Z

used elseif instead of else if

← Previous revision		Revision as of 18:43, 3 April 2023
Line 303:		Line 303:
	if yValues then		if yValues then
	areAllInteger = areAllInteger and isInteger		areAllInteger = areAllInteger and isInteger
		⚫	elseif yType then
	else
⚫	if yType then
	error("Numbers expected for parameter '" .. name .. "'")		error("Numbers expected for parameter '" .. name .. "'")
	else		else
	return deserializeYData(serializedYs, "string", yMin, yMax)		return deserializeYData(serializedYs, "string", yMin, yMax)
	end
	end		end
	end		end

Lemondoge: Simplified code to increase readibility

2023-04-02T18:59:15Z

Simplified code to increase readibility

← Previous revision		Revision as of 18:59, 2 April 2023
Line 165:		Line 165:
	if domainMax then scales[1].domainMax = domainMax end		if domainMax then scales[1].domainMax = domainMax end

	local exponent = ~~string.~~match(~~scaleType,~~ "pow%s+(%d+%.?%d+)") -- check for exponent		local exponent = scaleType:match("pow%s+(%d+%.?%d+)") -- check for exponent
	if exponent then		if exponent then
	scales[1].type = "pow"		scales[1].type = "pow"
Line 195:		Line 195:
	-- get map url		-- get map url
	local basemapUrl		local basemapUrl
	if (~~string.~~sub(~~basemap,~~ 1, 10) == "wikiraw://") then		if (basemap:sub(1, 10) == "wikiraw://") then
	basemapUrl = basemap		basemapUrl = basemap
	else		else
	-- if not a (supported) url look for a colon as namespace separator. If none prepend default map directory name.		-- if not a (supported) url look for a colon as namespace separator. If none prepend default map directory name.
	if not ~~string.~~find(~~basemap,~~ ":") then basemap = baseMapDirectory .. basemap end		if not basemap:find(":") then basemap = baseMapDirectory .. basemap end
	basemapUrl = "wikiraw:///" .. mw.uri.encode(mw.title.new(basemap).prefixedText, "PATH")		basemapUrl = "wikiraw:///" .. mw.uri.encode(mw.title.new(basemap).prefixedText, "PATH")
	end		end
Line 281:		Line 281:
	if isInteger then xType = "integer" else xType = "number" end		if isInteger then xType = "integer" else xType = "number" end
	end		end
			elseif xType then
	else
	~~if xType then~~ error("Numbers expected for parameter 'x'") ~~end~~		error("Numbers expected for parameter 'x'")
	end		end
	end		end
	if not x then		if not x then
	x = stringArray(serializedX)		x = stringArray(serializedX)
	~~if not~~ xType ~~then~~ xType = "string" ~~end~~		xType = xType or "string"
	end		end
	return x, xType, xMin, xMax		return x, xType, xMin, xMax
Line 311:		Line 311:
	end		end
	end		end
	~~if not~~ yValues ~~then~~ yValues = stringArray(value) ~~end~~		yValues = yValues or stringArray(value)

	y[yNum] = yValues		y[yNum] = yValues
Line 442:		Line 442:
	local hasAlpha = false		local hasAlpha = false
	for i = 1, #colors do		for i = 1, #colors do
	local a, rgb = ~~string.match(~~colors[i], "#(%x%x)(%x%x%x%x%x%x)")		local a, rgb = colors[i]:match("#(%x%x)(%x%x%x%x%x%x)")
	if a then		if a then
	hasAlpha = true		hasAlpha = true
Line 510:		Line 510:
	local function addInteractionToChartVisualisation(plotMarks, colorField, dataField)		local function addInteractionToChartVisualisation(plotMarks, colorField, dataField)
	-- initial setup		-- initial setup
	~~if not~~ plotMarks.properties.enter ~~then~~ plotMarks.properties.enter = {} ~~end~~		plotMarks.properties.enter = plotMarks.properties.enter or {}
	plotMarks.properties.enter[colorField] = { scale = "color", field = dataField }		plotMarks.properties.enter[colorField] = { scale = "color", field = dataField }

	-- action when cursor is over plot mark: highlight		-- action when cursor is over plot mark: highlight
	~~if not~~ plotMarks.properties.hover ~~then~~ plotMarks.properties.hover = {} ~~end~~		plotMarks.properties.hover = plotMarks.properties.hover or {}
	plotMarks.properties.hover[colorField] = { value = "red" }		plotMarks.properties.hover[colorField] = { value = "red" }

	-- action when cursor leaves plot mark: reset to initial setup		-- action when cursor leaves plot mark: reset to initial setup
	~~if not~~ plotMarks.properties.update ~~then~~ plotMarks.properties.update = {} ~~end~~		plotMarks.properties.update = plotMarks.properties.update or {}
	plotMarks.properties.update[colorField] = { scale = "color", field = dataField }		plotMarks.properties.update[colorField] = { scale = "color", field = dataField }
	end		end
Line 572:		Line 572:
	if colorField == "stroke" then		if colorField == "stroke" then
	chartvis.properties.enter.strokeWidth = { value = linewidth or 2.5 }		chartvis.properties.enter.strokeWidth = { value = linewidth or 2.5 }
	if type(lineScale) =="table" then		if type(lineScale) == "table" then
	chartvis.properties.enter.strokeWidth.value = nil		chartvis.properties.enter.strokeWidth.value = nil
	chartvis.properties.enter.strokeWidth =		chartvis.properties.enter.strokeWidth =
Line 1,090:		Line 1,090:

	if xType == "number" or xType == "integer" then		if xType == "number" or xType == "integer" then
	v_annoLine = numericArray(v_annoLineString)		v_annoLine = numericArray(v_annoLineString)

	else		else
	v_annoLine = stringArray(v_annoLineString)		v_annoLine = stringArray(v_annoLineString)

	end		end
	v_annoLabel = stringArray(v_annoLabelString)		v_annoLabel = stringArray(v_annoLabelString)
Line 1,102:		Line 1,100:
	if yType == "number" or yType == "integer" then		if yType == "number" or yType == "integer" then
	h_annoLine = numericArray(h_annoLineString)		h_annoLine = numericArray(h_annoLineString)

	else		else
	h_annoLine = stringArray(h_annoLineString)		h_annoLine = stringArray(h_annoLineString)

	end		end
	h_annoLabel = stringArray(h_annoLabelString)		h_annoLabel = stringArray(h_annoLabelString)
Line 1,129:		Line 1,125:
	for name, value in pairs(frame.args) do		for name, value in pairs(frame.args) do
	local yNum		local yNum
	if name == "y" then yNum = 1 else yNum = tonumber(~~string.~~match(~~name,~~ "^y(%d+)$")) end		if name == "y" then yNum = 1 else yNum = tonumber(name:match("^y(%d+)$")) end
	if yNum then		if yNum then
	yValues[yNum] = value		yValues[yNum] = value
Line 1,151:		Line 1,147:
	local stacked = false		local stacked = false
	local stats		local stats
	if ~~string.~~sub(~~chartType,~~ 1, 7) == "stacked" then		if chartType:sub(1, 7) == "stacked" then
	chartType = ~~string.~~sub(~~chartType,~~ 8)		chartType = chartType:sub(8)
	if #y > 1 then -- ignore stacked charts if there is only one series		if #y > 1 then -- ignore stacked charts if there is only one series
	stacked = true		stacked = true
Line 1,248:		Line 1,244:
	-- grids		-- grids
	if xGrid then		if xGrid then
	if xGrid == "0" ~~then~~ xGrid = false		xGrid = not (xGrid == "0" or xGrid == 0 or xGrid == "false" or xGrid == "n")
	elseif xGrid == 0 then xGrid = false
	elseif xGrid == "false" then xGrid = false
	elseif xGrid == "n" then xGrid = false
	else xGrid = true
	end
	end		end
	if yGrid then		if yGrid then
	if yGrid == "0" ~~then~~ yGrid = false		yGrid = not (yGrid == "0" or yGrid == 0 or yGrid == "false" or yGrid == "n")
	elseif yGrid == 0 then yGrid = false
	elseif yGrid == "false" then yGrid = false
	elseif yGrid == "n" then yGrid = false
	else yGrid = true
	end
	end		end

Gonnym at 19:14, 28 February 2023

2023-02-28T19:14:08Z

← Previous revision		Revision as of 19:14, 28 February 2023
Line 622:		Line 622:

	-- if there are multiple series, connect linewidths to series		-- if there are multiple series, connect linewidths to series
	if ~~charType~~ == "line" then		if chartType == "line" then
	chartvis.properties.update["strokeWidth"].field = "series"		chartvis.properties.update["strokeWidth"].field = "series"
	end		end

Gonnym at 19:13, 28 February 2023

2023-02-28T19:13:34Z

← Previous revision		Revision as of 19:13, 28 February 2023
Line 622:		Line 622:

	-- if there are multiple series, connect linewidths to series		-- if there are multiple series, connect linewidths to series
	if ~~chartype~~ == "line" then		if charType == "line" then
	chartvis.properties.update["strokeWidth"].field = "series"		chartvis.properties.update["strokeWidth"].field = "series"
	end		end

Gonnym at 19:10, 28 February 2023

2023-02-28T19:10:24Z

← Previous revision		Revision as of 19:10, 28 February 2023
Line 1,022:		Line 1,022:
	-- chart type		-- chart type
	local chartType = frame.args.type or "line"		local chartType = frame.args.type or "line"
			mw.log('test')
			mw.log(chartType)
	-- interpolation mode for line and area charts: linear, step-before, step-after, basis, basis-open, basis-closed (type=line only), bundle (type=line only), cardinal, cardinal-open, cardinal-closed (type=line only), monotone		-- interpolation mode for line and area charts: linear, step-before, step-after, basis, basis-open, basis-closed (type=line only), bundle (type=line only), cardinal, cardinal-open, cardinal-closed (type=line only), monotone
	local interpolate = frame.args.interpolate		local interpolate = frame.args.interpolate

Gonnym at 19:06, 28 February 2023

2023-02-28T19:06:17Z

← Previous revision		Revision as of 19:06, 28 February 2023
Line 1,401:		Line 1,401:
	function p.mapWrapper(frame)		function p.mapWrapper(frame)
	return p.map(frame:getParent())		return p.map(frame:getParent())
			end

			function p.chartWrapper2(frame)
			return p.chart(frame)
	end		end

Gonnym: sync with live

2023-02-28T19:05:18Z

sync with live

← Previous revision		Revision as of 19:05, 28 February 2023
Line 13:		Line 13:
	-- - arbitrary SVG path symbol shape as symbolsShape argument		-- - arbitrary SVG path symbol shape as symbolsShape argument
	-- - annotations		-- - annotations
	-- - vertical / horizontal line at specific values		-- - vertical / horizontal line at specific values [DONE] 2020-09-01
	-- - rectangle shape for x,y data range		-- - rectangle shape for x,y data range
	-- - graph type serialization (deep rebuild reqired)		-- - graph type serialization (deep rebuild reqired)
Line 19:		Line 19:

	-- Version History (_PLEASE UPDATE when modifying anything_):		-- Version History (_PLEASE UPDATE when modifying anything_):
			-- 2020-09-01 Vertical and horizontal line annotations
	-- 2020-08-08 New logic for "nice" for x axis (problem with scale when xType = "date") and grid		-- 2020-08-08 New logic for "nice" for x axis (problem with scale when xType = "date") and grid
	-- 2020-06-21 Serializes symbol size		-- 2020-06-21 Serializes symbol size

Pietrasagh at 16:41, 1 September 2020

2020-09-01T16:41:10Z

← Previous revision		Revision as of 16:41, 1 September 2020
Line 1,077:		Line 1,077:
	local v_annoLabelString = frame.args.vAnnotatonsLabel or frame.args.vannotatonslabel		local v_annoLabelString = frame.args.vAnnotatonsLabel or frame.args.vannotatonslabel
	local h_annoLabelString = frame.args.hAnnotatonsLabel or frame.args.hannotatonslabel		local h_annoLabelString = frame.args.hAnnotatonsLabel or frame.args.hannotatonslabel

	debuglog = debuglog .. "" .. "\n\n" .. "- v_annoLineString " .. debug.traceback() .. "result type: ".. type(v_annoLineString) .. " result: \n\n" .. mw.dumpObject(v_annoLineString)

	debuglog = debuglog .. "" .. "\n\n" .. "- h_annoLineString " .. debug.traceback() .. "result type: ".. type(h_annoLineString) .. " result: \n\n" .. mw.dumpObject(h_annoLineString)

	debuglog = debuglog .. "" .. "\n\n" .. "- v_annoLabelString " .. debug.traceback() .. "result type: ".. type(v_annoLabelString) .. " result: \n\n" .. mw.dumpObject(v_annoLabelString)

	debuglog = debuglog .. "" .. "\n\n" .. "- h_annoLabelString " .. debug.traceback() .. "result type: ".. type(h_annoLabelString) .. " result: \n\n" .. mw.dumpObject(h_annoLabelString)

	-- decode annotations cvs		-- decode annotations cvs
	local v_annoLine, v_annoLabel, h_annoLine, h_annoLabel		local v_annoLine, v_annoLabel, h_annoLine, h_annoLabel
	if v_annoLineString and v_annoLineString ~= "" then		if v_annoLineString and v_annoLineString ~= "" then

	debuglog = debuglog .. "" .. "\n\n" .. "- " .. "v_annoLine level 1"
	if xType == "number" or xType == "integer" then		if xType == "number" or xType == "integer" then
	v_annoLine = numericArray(v_annoLineString)		v_annoLine = numericArray(v_annoLineString)

	debuglog = debuglog .. "" .. "\n\n" .. "- " .. "v_annoLine level 2"
	else		else
	v_annoLine = stringArray(v_annoLineString)		v_annoLine = stringArray(v_annoLineString)

	debuglog = debuglog .. "" .. "\n\n" .. "- " .. "v_annoLine level 3"
	end		end
	v_annoLabel = stringArray(v_annoLabelString)		v_annoLabel = stringArray(v_annoLabelString)
	end		end
	if h_annoLineString and h_annoLineString ~= "" then		if h_annoLineString and h_annoLineString ~= "" then

	debuglog = debuglog .. "" .. "\n\n" .. "- " .. "h_annoLine level 1"
	if yType == "number" or yType == "integer" then		if yType == "number" or yType == "integer" then
	h_annoLine = numericArray(h_annoLineString)		h_annoLine = numericArray(h_annoLineString)

	debuglog = debuglog .. "" .. "\n\n" .. "- " .. "h_annoLine level 2"
	else		else
	h_annoLine = stringArray(h_annoLineString)		h_annoLine = stringArray(h_annoLineString)

	debuglog = debuglog .. "" .. "\n\n" .. "- " .. "h_annoLine level 3"
	end		end
	h_annoLabel = stringArray(h_annoLabelString)		h_annoLabel = stringArray(h_annoLabelString)
	end		end

	debuglog = debuglog .. "" .. "\n\n" .. "- v_annoLine " .. debug.traceback() .. "result type: ".. type(v_annoLine) .. " result: \n\n" .. mw.dumpObject(v_annoLine)

	debuglog = debuglog .. "" .. "\n\n" .. "- h_annoLine " .. debug.traceback() .. "result type: ".. type(h_annoLine) .. " result: \n\n" .. mw.dumpObject(h_annoLine)

	debuglog = debuglog .. "" .. "\n\n" .. "- v_annoLabel " .. debug.traceback() .. "result type: ".. type(v_annoLabel) .. " result: \n\n" .. mw.dumpObject(v_annoLabel)

	debuglog = debuglog .. "" .. "\n\n" .. "- h_annoLabel " .. debug.traceback() .. "result type: ".. type(h_annoLabel) .. " result: \n\n" .. mw.dumpObject(h_annoLabel)

	-- pie chart radiuses		-- pie chart radiuses
Line 1,184:		Line 1,184:
	end		end
	end		end

	debuglog = debuglog .. "" .. "\n\n" .. "- vannoData " .. debug.traceback() .. "result type: ".. type(vannoData) .. " result: \n\n" .. mw.dumpObject(vannoData)

	debuglog = debuglog .. "" .. "\n\n" .. "- vannoData " .. debug.traceback() .. "result type: ".. type(hannoData) .. " result: \n\n" .. mw.dumpObject(hannoData)
	-- create scales		-- create scales
	local scales = {}		local scales = {}

Timbaaa: Possible fix for bug report Special:Permalink/974648618, hopefully I didn't break others

2020-08-24T07:36:04Z

Possible fix for bug report Special:Permalink/974648618, hopefully I didn't break others

← Previous revision		Revision as of 07:36, 24 August 2020
Line 397:		Line 397:
	{		{
	name = "y",		name = "y",
			--type = yScaleType or "linear",
	range = "height",		range = "height",
	-- area charts have the lower boundary of their filling at y=0 (see marks.properties.enter.y2), therefore these need to start at zero		-- area charts have the lower boundary of their filling at y=0 (see marks.properties.enter.y2), therefore these need to start at zero
Line 878:		Line 879:
	local xAxis, yAxis		local xAxis, yAxis
	if chartType ~= "pie" then		if chartType ~= "pie" then
	if xType == "integer" then xAxisFormat = "d" end		if xType == "integer" and not xAxisFormat then xAxisFormat = "d" end
	-- if not xAxisFormat then xAxisFormat = "d" end
	xAxis =		xAxis =
	{		{
Line 944:		Line 944:
	end		end

	if yType == "integer" then yAxisFormat = "d" end		if yType == "integer" and not yAxisFormat then yAxisFormat = "d" end
	if not yAxisFormat then yAxisFormat = "d" end
	yAxis =		yAxis =
	{		{