Modul:Graph - Versionsgeschichte

CalendulaAsteraceae am 7. September 2023 um 21:26 Uhr

2023-09-07T21:26:28Z

← Nächstältere Version		Version vom 7. September 2023, 23:26 Uhr
Zeile 1.035:		Zeile 1.035:
	local linewidths		local linewidths
	if linewidthsString and linewidthsString ~= "" then linewidths = numericArray(linewidthsString) or false end		if linewidthsString and linewidthsString ~= "" then linewidths = numericArray(linewidthsString) or false end
			local linecolor = frame.args.linecolor or 'white'
	-- 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
Zeile 1.222:		Zeile 1.223:

	-- create chart markings		-- create chart markings
	local chartvis = getChartVisualisation(chartType, stacked, colorField, #y, innerRadius, outerRadius, linewidth, alphaScale, radiusScale, lineScale, interpolate)		local chartvis = getChartVisualisation(chartType, stacked, colorField, #y, innerRadius, outerRadius, linewidth, linecolor, alphaScale, radiusScale, lineScale, interpolate)
	local marks = { chartvis }		local marks = { chartvis }

CalendulaAsteraceae am 7. September 2023 um 21:25 Uhr

2023-09-07T21:25:29Z

← Nächstältere Version		Version vom 7. September 2023, 23:25 Uhr
Zeile 520:		Zeile 520:
	end		end

	local function getPieChartVisualisation(yCount, innerRadius, outerRadius, linewidth, radiusScale)		local function getPieChartVisualisation(yCount, innerRadius, outerRadius, linewidth, linecolor, radiusScale)
	local chartvis =		local chartvis =
	{		{
Zeile 533:		Zeile 533:
	startAngle = { field = "layout_start" },		startAngle = { field = "layout_start" },
	endAngle = { field = "layout_end" },		endAngle = { field = "layout_end" },
	stroke = { value = "white" },		stroke = { value = linecolor or "white" },
	strokeWidth = { value = linewidth or 1 }		strokeWidth = { value = linewidth or 1 }
	}		}
Zeile 551:		Zeile 551:
	end		end

	local function getChartVisualisation(chartType, stacked, colorField, yCount, innerRadius, outerRadius, linewidth, alphaScale, radiusScale, lineScale, interpolate)		local function getChartVisualisation(chartType, stacked, colorField, yCount, innerRadius, outerRadius, linewidth, linecolor, alphaScale, radiusScale, lineScale, interpolate)
	if chartType == "pie" then return getPieChartVisualisation(yCount, innerRadius, outerRadius, linewidth, radiusScale) end		if chartType == "pie" then return getPieChartVisualisation(yCount, innerRadius, outerRadius, linewidth, linecolor, radiusScale) end

	local chartvis =		local chartvis =

CalendulaAsteraceae am 7. September 2023 um 21:23 Uhr

2023-09-07T21:23:59Z

← Nächstältere Version		Version vom 7. September 2023, 23:23 Uhr
Zeile 47:		Zeile 47:
	--add debug text to this string with eg. debuglog = debuglog .. "" .. "\n\n" .. "- " .. debug.traceback() .. "result type: ".. type(result) .. " result: \n\n" .. mw.dumpObject(result)		--add debug text to this string with eg. debuglog = debuglog .. "" .. "\n\n" .. "- " .. debug.traceback() .. "result type: ".. type(result) .. " result: \n\n" .. mw.dumpObject(result)
	--invoke chartDebuger() to get graph JSON and this string		--invoke chartDebuger() to get graph JSON and this string
	debuglog = "Debug " .. "\n\n"		local debuglog = "Debug " .. "\n\n"

	local baseMapDirectory = "Module:Graph/"		local baseMapDirectory = "Module:Graph/"

MAyo: Die letzte Textänderung von 217.149.167.64 wurde verworfen und die Version 203313121 von Pietrasagh wiederhergestellt.

2021-03-14T19:04:08Z

Die letzte Textänderung von 217.149.167.64 wurde verworfen und die Version 203313121 von Pietrasagh wiederhergestellt.

@@ Zeile 2: / Zeile 2: @@
 --          	This way all wiki languages can stay in sync. Thank you!
 --
 --   2018-08-26 Use user-defined order for stacked charts
 --   2018-02-11 Force usage of explicitely provided x minimum and/or maximum values, rotation of x labels

217.149.167.64 am 14. März 2021 um 18:26 Uhr

2021-03-14T18:26:36Z

@@ Zeile 2: / Zeile 2: @@
 --          	This way all wiki languages can stay in sync. Thank you!
 --
 --   2018-08-26 Use user-defined order for stacked charts
 --   2018-02-11 Force usage of explicitely provided x minimum and/or maximum values, rotation of x labels

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

2020-09-01T16:51:03Z

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

Änderungen zeigen

Pietrasagh: symbols disabled for bar charts

2020-08-20T17:24:13Z

symbols disabled for bar charts

← Nächstältere Version		Version vom 20. August 2020, 19:24 Uhr
Zeile 1.128:		Zeile 1.128:

	-- 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:33:13Z

fixed showSymbols and linewidths "" argument bug

← Nächstältere Version		Version vom 15. August 2020, 15:33 Uhr
Zeile 287:		Zeile 287:
	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
Zeile 956:		Zeile 955:
	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
Zeile 1.134:		Zeile 1.133:

	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
Zeile 1.151:		Zeile 1.151:
	else		else
	symSize = 50		symSize = 50
	end		end
	-- symSizeScale		-- symSizeScale
	local symSizeScale = {}		local symSizeScale = {}

Pietrasagh: new logic for "xscale.nice" and "xGrid" / "yGrid"

2020-08-08T09:24:00Z

new logic for "xscale.nice" and "xGrid" / "yGrid"

← Nächstältere Version		Version vom 8. August 2020, 11:24 Uhr
Zeile 1:		Zeile 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!
Zeile 19:		Zeile 18:

	-- Version History (_PLEASE UPDATE when modifying anything_):		-- Version History (_PLEASE UPDATE when modifying anything_):
			-- 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
	-- transparent symbosls (from line colour) - buggy (incorrect opacity on overlap with line)		-- transparent symbosls (from line colour) - buggy (incorrect opacity on overlap with line)
Zeile 367:		Zeile 367:
	range = "width",		range = "width",
	zero = false, -- do not include zero value		zero = false, -- do not include zero value
⚫	~~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" }
	}		}
Zeile 380:		Zeile 379:
	xscale.type = "ordinal"		xscale.type = "ordinal"
	if not stacked then xscale.padding = 0.2 end -- pad each bar group		if not stacked then xscale.padding = 0.2 end -- pad each bar group
	else		else
	if xType == "date" then xscale.type = "time"		if xType == "date" then
			xscale.type = "time"
	elseif xType == "string" then		elseif xType == "string" then
	xscale.type = "ordinal"		xscale.type = "ordinal"
Zeile 387:		Zeile 387:
	end		end
	end		end
		⚫	if xType and xType ~= "date" and xScaleType ~= "log" then xscale.nice = true end -- force round numbers for x scale, but "log" and "date" scale outputs a wrong "nice" scale

	return xscale		return xscale
	end		end
Zeile 810:		Zeile 810:
	title = xTitle,		title = xTitle,
	format = xAxisFormat,		format = xAxisFormat,
	grid = xGrid ~~~= "0"~~		grid = xGrid
	}		}
	if xAxisAngle then		if xAxisAngle then
Zeile 876:		Zeile 876:
	title = yTitle,		title = yTitle,
	format = yAxisFormat,		format = yAxisFormat,
	grid = yGrid ~~~= "0"~~		grid = yGrid
	}		}
	yAxis.properties =		yAxis.properties =
Zeile 1.109:		Zeile 1.109:
	end		end
	end		end


			-- grids
			if xGrid then
			if xGrid == "0" then xGrid = false
			elseif xGrid == 0 then xGrid = false
			elseif xGrid == "false" then xGrid = false
			elseif xGrid == "n" then xGrid = false
			else xGrid = true
			end
			end
			if yGrid then
			if yGrid == "0" then yGrid = false
			elseif yGrid == 0 then yGrid = false
			elseif yGrid == "false" then yGrid = false
			elseif yGrid == "n" then yGrid = false
			else yGrid = true
			end
			end

	-- symbol marks		-- symbol marks
	if showSymbols then		if showSymbols then

Pietrasagh: revert to old xGrid and yGrid code

2020-06-26T16:57:11Z

revert to old xGrid and yGrid code

← Nächstältere Version		Version vom 26. Juni 2020, 18:57 Uhr
Zeile 810:		Zeile 810:
	title = xTitle,		title = xTitle,
	format = xAxisFormat,		format = xAxisFormat,
	grid = xGrid		grid = xGrid ~= "0"
	}		}
	if xAxisAngle then		if xAxisAngle then
Zeile 876:		Zeile 876:
	title = yTitle,		title = yTitle,
	format = yAxisFormat,		format = yAxisFormat,
	grid = yGrid		grid = yGrid ~= "0"
	}		}
	yAxis.properties =		yAxis.properties =