Module:Graph - Revision history

Frietjes: Undid revision 1141810373 by Frietjes (talk)

2023-02-26T22:56:05Z

Undid revision 1141810373 by Frietjes (talk)

← Previous revision		Revision as of 22:56, 26 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 ~~chartType~~ == "line" then		if chartype == "line" then
	chartvis.properties.update["strokeWidth"].field = "series"		chartvis.properties.update["strokeWidth"].field = "series"
	end		end

Frietjes: looks like a typo, "chartype" appears nowhere else in the module

2023-02-26T22:55:34Z

looks like a typo, "chartype" appears nowhere else in the module

← Previous revision		Revision as of 22:55, 26 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

MusikAnimal: Changed protection settings for "Module:Graph": High-risk Lua module ([Edit=Require template editor access] (indefinite))

2021-08-17T00:25:18Z

Changed protection settings for "Module:Graph": High-risk Lua module ([Edit=Require template editor access] (indefinite))

← Previous revision	Revision as of 00:25, 17 August 2021
(No difference)

Pietrasagh: v an h-line annotations, fix for bug Template_talk:Graph:Chart#Repeated y-values - special thanks to User:Timbaaa

2020-09-01T16:51:45Z

v an h-line annotations, fix for bug Template_talk:Graph:Chart#Repeated y-values - special thanks to User:Timbaaa

Show changes

Pietrasagh: symbols disabled for bar charts

2020-08-20T17:32:16Z

symbols disabled for bar charts

← Previous revision		Revision as of 17:32, 20 August 2020
Line 1,129:		Line 1,129:

	-- symbol marks		-- symbol marks
	if showSymbols then		if showSymbols and chartType ~= "rect" then
	local chartmarks = chartvis		local chartmarks = chartvis
	if chartmarks.marks then chartmarks = chartmarks.marks[1] end		if chartmarks.marks then chartmarks = chartmarks.marks[1] end

Pietrasagh: fixed showSymbols and linewidths "" argument bug

2020-08-15T13:44:09Z

fixed showSymbols and linewidths "" argument bug

← Previous revision		Revision as of 13:44, 15 August 2020
Line 1:		Line 1:

	-- ATTENTION: Please edit this code at https://de.wikipedia.org/wiki/Modul:Graph		-- ATTENTION: Please edit this code at https://de.wikipedia.org/wiki/Modul:Graph
	-- This way all wiki languages can stay in sync. Thank you!		-- This way all wiki languages can stay in sync. Thank you!
Line 287:		Line 288:
	if not xType then xType = "string" end		if not xType then xType = "string" end
	end		end

	return x, xType, xMin, xMax		return x, xType, xMin, xMax
	end		end
Line 956:		Line 956:
	local linewidthsString = frame.args.linewidths		local linewidthsString = frame.args.linewidths
	local linewidths		local linewidths
	if linewidthsString then linewidths = numericArray(linewidthsString) end		if linewidthsString and linewidthsString ~= "" then linewidths = numericArray(linewidthsString) or false end
	-- x and y axis caption		-- x and y axis caption
	local xTitle = frame.args.xAxisTitle or frame.args.xaxistitle		local xTitle = frame.args.xAxisTitle or frame.args.xaxistitle
Line 1,109:		Line 1,109:
	end		end
	end		end


	-- grids		-- grids
	if xGrid then		if xGrid then
Line 1,127:		Line 1,127:
	end		end
	end		end


	-- symbol marks		-- symbol marks
	if showSymbols then		if showSymbols then
Line 1,134:		Line 1,134:

	if type(showSymbols) == "string" then		if type(showSymbols) == "string" then
	showSymbols = ~~numericArray(~~showSymbols)		if showSymbols == "" then showSymbols = true
			else showSymbols = numericArray(showSymbols)
			end
	else		else
	showSymbols = tonumber(showSymbols)		showSymbols = tonumber(showSymbols)
	end		end


	-- custom size		-- custom size
Line 1,151:		Line 1,152:
	else		else
	symSize = 50		symSize = 50
	end		end
	-- symSizeScale		-- symSizeScale
	local symSizeScale = {}		local symSizeScale = {}

Pietrasagh: synh with Modul:Graph, other symbols shapes, symbols and line-widths serialization, see update notes, lowercase args names, new "nice" and "xGrid" / "yGrid" logic

2020-08-08T09:48:14Z

synh with Modul:Graph, other symbols shapes, symbols and line-widths serialization, see update notes, lowercase args names, new "nice" and "xGrid" / "yGrid" logic

Show changes

Mps at 20:10, 27 May 2020

2020-05-27T20:10:23Z

← Previous revision		Revision as of 20:10, 27 May 2020
Line 3:		Line 3:
	--		--
	-- Version History (_PLEASE UPDATE when modifying anything_):		-- Version History (_PLEASE UPDATE when modifying anything_):
			-- 2020-05-27 Map: allow specification which feature to display and changing the map center
	-- 2020-04-08 Change default showValues.fontcolor from black to persistentGrey		-- 2020-04-08 Change default showValues.fontcolor from black to persistentGrey
			-- 2020-04-06 Logarithmic scale outputs wrong axis labels when "nice"=true
	-- 2020-03-11 Allow user-defined scale types, e.g. logarithmic scale		-- 2020-03-11 Allow user-defined scale types, e.g. logarithmic scale
	-- 2019-11-08 Apply color-inversion-friendliness to legend title, labels, and xGrid		-- 2019-11-08 Apply color-inversion-friendliness to legend title, labels, and xGrid
Line 75:		Line 77:
	local defaultValue = frame.args.defaultValue		local defaultValue = frame.args.defaultValue
	local scaleType = frame.args.scaleType or "linear"		local scaleType = frame.args.scaleType or "linear"
			-- smallest value (only for numeric data)
	-- minimaler Wertebereich (nur für numerische Daten)
	local domainMin = tonumber(frame.args.domainMin)		local domainMin = tonumber(frame.args.domainMin)
			-- largest value (only for numeric data)
	-- maximaler Wertebereich (nur für numerische Daten)
	local domainMax = tonumber(frame.args.domainMax)		local domainMax = tonumber(frame.args.domainMax)
			-- color scale (only for numeric data)
	-- Farbwerte der Farbskala (nur für numerische Daten)
	local colorScale = frame.args.colorScale or "category10"		local colorScale = frame.args.colorScale or "category10"
	-- show legend		-- show legend
	local legend = frame.args.legend		local legend = frame.args.legend
			-- the map feature to display
			local feature = frame.args.feature or "countries"
			-- map center
			local center = numericArray(frame.args.center)
	-- format JSON output		-- format JSON output
	local formatJson = frame.args.formatjson		local formatJson = frame.args.formatjson
Line 172:		Line 178:
	{		{
	-- data source for map paths data		-- data source for map paths data
	name = ~~"countries"~~,		name = feature,
	url = basemapUrl,		url = basemapUrl,
	format = { type = "topojson", feature = ~~"countries"~~ },		format = { type = "topojson", feature = feature },
	transform =		transform =
	{		{
Line 182:		Line 188:
	value = "data", -- data source		value = "data", -- data source
	scale = scale,		scale = scale,
	translate = { 0, 0 },		translate = { 0, 0 },
			center = center,
	projection = projection		projection = projection
	},		},
Line 202:		Line 209:
	{		{
	type = "path",		type = "path",
	from = { data = ~~"countries"~~ },		from = { data = feature },
	properties =		properties =
	{		{
Line 320:		Line 327:
	local xscale =		local xscale =
	{		{
	name = "x",		name = "x",
			type = xScaleType or "linear",
	range = "width",		range = "width",
	zero = false, -- do not include zero value		zero = false, -- do not include zero value
	nice = ~~true~~, -- force round numbers for y scale		nice = xScaleType ~= "log", -- force round numbers for x scale, but log scale outputs a wrong "nice" scale
	domain = { data = "chart", field = "x" }		domain = { data = "chart", field = "x" }
	}		}
	if xScaleType then xscale.type = xScaleType else xscale.type = "linear" end
	if xMin then xscale.domainMin = xMin end		if xMin then xscale.domainMin = xMin end
	if xMax then xscale.domainMax = xMax end		if xMax then xscale.domainMax = xMax end
Line 352:		Line 359:
	local yscale =		local yscale =
	{		{
	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
	zero = chartType ~= "line",		zero = chartType ~= "line",
			nice = yScaleType ~= "log" -- force round numbers for y scale, but log scale outputs a wrong "nice" scale
	nice = true
	}		}
	if yScaleType then yscale.type = yScaleType else yscale.type = "linear" end
	if yMin then yscale.domainMin = yMin end		if yMin then yscale.domainMin = yMin end
	if yMax then yscale.domainMax = yMax end		if yMax then yscale.domainMax = yMax end

Tom.Reding: Change default showValues.fontcolor from black to persistentGrey, from sandbox

2020-04-08T11:02:35Z

Change default showValues.fontcolor from black to persistentGrey, from sandbox

← Previous revision		Revision as of 11:02, 8 April 2020
Line 3:		Line 3:
	--		--
	-- Version History (_PLEASE UPDATE when modifying anything_):		-- Version History (_PLEASE UPDATE when modifying anything_):
			-- 2020-04-08 Change default showValues.fontcolor from black to persistentGrey
	-- 2020-03-11 Allow user-defined scale types, e.g. logarithmic scale		-- 2020-03-11 Allow user-defined scale types, e.g. logarithmic scale
	-- 2019-11-08 Apply color-inversion-friendliness to legend title, labels, and xGrid		-- 2019-11-08 Apply color-inversion-friendliness to legend title, labels, and xGrid
Line 587:		Line 588:
	else		else
	properties.align.value = "left"		properties.align.value = "left"
	properties.fill.value = showValues.fontcolor or ~~"black"~~		properties.fill.value = showValues.fontcolor or persistentGrey
	end		end
	elseif chartType == "pie" then		elseif chartType == "pie" then
Line 596:		Line 597:
	radius = { offset = tonumber(showValues.offset) or -4 },		radius = { offset = tonumber(showValues.offset) or -4 },
	theta = { field = "layout_mid" },		theta = { field = "layout_mid" },
	fill = { value = showValues.fontcolor or ~~"black"~~ },		fill = { value = showValues.fontcolor or persistentGrey },
	baseline = { },		baseline = { },
	angle = { },		angle = { },

Boud: local basemap = frame.args.basemap or "Template:Graph:Map/Inner/Worldmap2c-json" - after checking on Template:Graph:Chart/testcases and the Template:Graph:Map/testcases

2020-03-29T14:24:50Z

local basemap = frame.args.basemap or "Template:Graph:Map/Inner/Worldmap2c-json" - after checking on Template:Graph:Chart/testcases and the Template:Graph:Map/testcases

← Previous revision		Revision as of 14:24, 29 March 2020
Line 66:		Line 66:
	function p.map(frame)		function p.map(frame)
	-- map path data for geographic objects		-- map path data for geographic objects
	local basemap = frame.args.basemap or "~~WorldMap~~-~~iso2.~~json" -- WorldMap name and/or location may vary from wiki to wiki		local basemap = frame.args.basemap or "Template:Graph:Map/Inner/Worldmap2c-json" -- WorldMap name and/or location may vary from wiki to wiki
	-- scaling factor		-- scaling factor
	local scale = tonumber(frame.args.scale) or 100		local scale = tonumber(frame.args.scale) or 100