Module:Chart/sandbox - Revision history

Pppery at 15:52, 17 October 2021

2021-10-17T15:52:28Z

← Previous revision		Revision as of 15:52, 17 October 2021
Line 321:		Line 321:
	base = math.floor( chartHeight * rawbase / yscales[gi] ) -- normally, and especially if it's "stack", all the yscales must be equal.		base = math.floor( chartHeight * rawbase / yscales[gi] ) -- normally, and especially if it's "stack", all the yscales must be equal.
	end		end
			if barHeight < 2 then
			barHeight = 2 -- Otherwise the template would try to create a bar with a negative height
			end
	return barHeight, top - base		return barHeight, top - base
	end		end

Johnuniq: fix unintended globals and other minor issues

2021-05-26T05:15:37Z

fix unintended globals and other minor issues

Show changes

Johnuniq: restore tab indents

2021-05-26T05:13:28Z

restore tab indents

Show changes

Guarapiranga: mw.ustring -> string

2021-05-25T22:56:45Z

mw.ustring -> string

Show changes

Johnuniq: remove unintended globals and a couple of unused variables

2021-05-15T01:45:55Z

remove unintended globals and a couple of unused variables

Show changes

Johnuniq: use tabs for indents

2021-05-15T01:44:16Z

use tabs for indents

Show changes

Johnuniq: copy from Module:Chart

2021-05-15T01:43:31Z

copy from Module:Chart

← Previous revision		Revision as of 01:43, 15 May 2021
Line 1:		Line 1:
	--<source lang=lua>
	--[[		--[[
	keywords are used for languages: they are the names of the actual		keywords are used for languages: they are the names of the actual
Line 31:		Line 30:
	} -- here is what you want to translate		} -- here is what you want to translate

	local defColors = ~~require~~ "Module:~~Plotter~~/~~DefaultColors~~"		local defColors = mw.loadData("Module:Chart/Default colors")
	local hideGroupLegends		local hideGroupLegends

Line 49:		Line 48:
	table.insert( tab,		table.insert( tab,
	mw.text.tag( 'ul',		mw.text.tag( 'ul',
	{style="width:100%;list-style:none~~;-webkit-column-width:12em;-moz-column-width:12em~~;column-width:12em;"},		{style="width:100%;list-style:none;column-width:12em;"},
	table.concat( list, '\n' )		table.concat( list, '\n' )
	)		)
Line 79:		Line 78:
	links[i] = link		links[i] = link
	end		end


	radius = getArg( 'radius', 150 )		radius = getArg( 'radius', 150 )
	hideGroupLegends = not nulOrWhitespace( args[keywords.hideGroupLegends] )		hideGroupLegends = not nulOrWhitespace( args[keywords.hideGroupLegends] )
Line 92:		Line 91:
	addSlice( i, mw.ustring.match( slice, '^%(%s(.-)%s%)$' ) )		addSlice( i, mw.ustring.match( slice, '^%(%s(.-)%s%)$' ) )
	end		end


	for k, v in pairs(args) do		for k, v in pairs(args) do
	local ind = mw.ustring.match( k, '^' .. keywords.slice .. '%s+(%d+)$' )		local ind = mw.ustring.match( k, '^' .. keywords.slice .. '%s+(%d+)$' )
	if ind then addSlice( tonumber( ind ), v ) end		if ind then addSlice( tonumber( ind ), v ) end
	end		end


	for _, val in ipairs( values ) do sum = sum + val end		for _, val in ipairs( values ) do sum = sum + val end
	for i, value in ipairs( values ) do		for i, value in ipairs( values ) do
Line 309:		Line 308:
	function tooltip( gi, i, val )		function tooltip( gi, i, val )
	if tooltips and tooltips[gi] and not nulOrWhitespace( tooltips[gi][i] ) then return tooltips[gi][i], true end		if tooltips and tooltips[gi] and not nulOrWhitespace( tooltips[gi][i] ) then return tooltips[gi][i], true end
	local groupName = not nulOrWhitespace( groupNames[gi] ) and groupNames[gi] .. ': ' or ''		local groupName = mw.text.killMarkers(not nulOrWhitespace( groupNames[gi] ) and groupNames[gi] .. ': ' or '')
	local prefix = unitsPrefix[gi] or unitsPrefix[1] or ''		local prefix = unitsPrefix[gi] or unitsPrefix[1] or ''
	local suffix = unitsSuffix[gi] or unitsSuffix[1] or ''		local suffix = unitsSuffix[gi] or unitsSuffix[1] or ''
Line 350:		Line 349:
	local left, barWidth = calcx( gi, i )		local left, barWidth = calcx( gi, i )
	local barHeight, top = calcHeights( gi, i, val )		local barHeight, top = calcHeights( gi, i, val )


	-- borders so it shows up when printing		-- borders so it shows up when printing
	local style = string.format("position:absolute;left:%spx;top:%spx;height:%spx;min-width:%spx;max-width:%spx;background-color:%s;-webkit-print-color-adjust:exact;border:1px solid %s;border-bottom:none;overflow:hidden;",		local style = string.format("position:absolute;left:%spx;top:%spx;height:%spx;min-width:%spx;max-width:%spx;background-color:%s;-webkit-print-color-adjust:exact;border:1px solid %s;border-bottom:none;overflow:hidden;",
Line 447:		Line 446:
	[keywords.pieChart] = pieChart,		[keywords.pieChart] = pieChart,
	}		}
	--</source>

Frietjes at 20:02, 5 June 2019

2019-06-05T20:02:45Z

← Previous revision		Revision as of 20:02, 5 June 2019
Line 14:		Line 14:
	group = 'group',		group = 'group',
	xlegend = 'x legends',		xlegend = 'x legends',
	yticks = 'y ~~ticks~~',		yticks = 'y tick marks',
	tooltip = 'tooltip',		tooltip = 'tooltip',
	accumulateTooltip = 'tooltip value accumulation',		accumulateTooltip = 'tooltip value accumulation',

Frietjes at 20:00, 5 June 2019

2019-06-05T20:00:52Z

← Previous revision		Revision as of 20:00, 5 June 2019
Line 261:		Line 261:
	end		end
	elseif k == keywords.stack then stack = true		elseif k == keywords.stack then stack = true
	elseif k == ~~keyworks~~.yticks then yticks = tonumber(v) or -1		elseif k == keywords.yticks then yticks = tonumber(v) or -1
	elseif k == keywords.scalePerGroup then scalePerGroup = true		elseif k == keywords.scalePerGroup then scalePerGroup = true
	elseif k == keywords.defcolor then defcolor = v		elseif k == keywords.defcolor then defcolor = v

Frietjes at 20:00, 5 June 2019

2019-06-05T20:00:13Z

← Previous revision		Revision as of 20:00, 5 June 2019
Line 14:		Line 14:
	group = 'group',		group = 'group',
	xlegend = 'x legends',		xlegend = 'x legends',
			yticks = 'y ticks',
	tooltip = 'tooltip',		tooltip = 'tooltip',
	accumulateTooltip = 'tooltip value accumulation',		accumulateTooltip = 'tooltip value accumulation',
Line 192:		Line 193:
	local values, xlegends, colors, tooltips, yscales = {}, {}, {}, {} ,{}, {}, {}		local values, xlegends, colors, tooltips, yscales = {}, {}, {}, {} ,{}, {}, {}
	local groupNames, unitsSuffix, unitsPrefix, links = {}, {}, {}, {}		local groupNames, unitsSuffix, unitsPrefix, links = {}, {}, {}, {}
	local width, height, stack, delimiter = 500, 350, false, args.delimiter or ':'		local width, height, yticks, stack, delimiter = 500, 350, -1, false, args.delimiter or ':'
	local chartWidth, chartHeight, defcolor, scalePerGroup, accumulateTooltip		local chartWidth, chartHeight, defcolor, scalePerGroup, accumulateTooltip

Line 260:		Line 261:
	end		end
	elseif k == keywords.stack then stack = true		elseif k == keywords.stack then stack = true
			elseif k == keyworks.yticks then yticks = tonumber(v) or -1
	elseif k == keywords.scalePerGroup then scalePerGroup = true		elseif k == keywords.scalePerGroup then scalePerGroup = true
	elseif k == keywords.defcolor then defcolor = v		elseif k == keywords.defcolor then defcolor = v
Line 359:		Line 361:

	function drawYScale()		function drawYScale()
	function drawSingle( gi, color, width, single )		function drawSingle( gi, color, width, yticks, single )
	local yscale = yscales[gi]		local yscale = yscales[gi]
	local _, top, ordermag = roundup( yscale * 0.999 )		local _, top, ordermag = roundup( yscale * 0.999 )
	local numnotches = ~~top~~ <= ~~1.5~~ and ~~top~~ * 4		local numnotches = yticks >= 0 and yticks or
	or top < 4 and top * 2		(top <= 1.5 and top * 4
	~~or top~~		or top < 4 and top * 2
			or top)
	local valStyleStr =		local valStyleStr =
	single and 'position:absolute;height=20px;text-align:right;vertical-align:middle;width:%spx;top:%spx;padding:0 2px'		single and 'position:absolute;height=20px;text-align:right;vertical-align:middle;width:%spx;top:%spx;padding:0 2px'
Line 386:		Line 389:
	local color = colors[gi] or defcolor		local color = colors[gi] or defcolor
	table.insert( res, mw.text.tag( 'div', { style = string.format( colStyle, chartHeight, colWidth, left, color, color ) } ) )		table.insert( res, mw.text.tag( 'div', { style = string.format( colStyle, chartHeight, colWidth, left, color, color ) } ) )
	drawSingle( gi, color, colWidth )		drawSingle( gi, color, colWidth, yticks )
	table.insert( res, '</div>' )		table.insert( res, '</div>' )
	end		end
	else		else
	drawSingle( 1, 'black', scaleWidth, true )		drawSingle( 1, 'black', scaleWidth, yticks, true )
	end		end
	end		end