Module:ImportProtein - Revision history

Lemondoge: Simplified module by flattening unnecessarily nested conditionals

2023-04-02T21:38:17Z

Simplified module by flattening unnecessarily nested conditionals

← Previous revision		Revision as of 21:38, 2 April 2023
Line 100:		Line 100:
	local output		local output
	local tlegend="" -- legend for top row entries only, shown above table		local tlegend="" -- legend for top row entries only, shown above table
			if tableoutput == "collapsed" then
	if tableoutput=="collapsed" then output=[[{\| class="wikitable mw-collapsible mw-collapsed" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else if tableoutput=="collapsible" then output=[[{\| class="wikitable collapsible" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else output=[[{\| class="wikitable"]] end end
			output=[[{\| class="wikitable mw-collapsible mw-collapsed" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]]
			elseif tableoutput=="collapsible" then
			output=[[{\| class="wikitable collapsible" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]]
			else
			output=[[{\| class="wikitable"]]
			end
	local graphics=[[<div style="position:relative;background-color:]].. background .. [[;width:]] .. width .. [[px;height:]] .. height .. [[px;">]]		local graphics=[[<div style="position:relative;background-color:]].. background .. [[;width:]] .. width .. [[px;height:]] .. height .. [[px;">]]
	---- MAIN LOOP ----		---- MAIN LOOP ----
Line 137:		Line 143:
	if e>cdsend then e=cdsend end		if e>cdsend then e=cdsend end
	if s==cdsstart and e==cdsend then showthismotif=nil end		if s==cdsstart and e==cdsend then showthismotif=nil end
	if include ~~then if~~ not (tinclude[n]) then showthismotif=nil ~~end~~ end -- if include is set, and n isn't in it, don't add to table or graphic		if include and not tinclude[n] then showthismotif=nil end -- if include is set, and n isn't in it, don't add to table or graphic
	if exclude ~~then if~~ texclude[n] then showthismotif=nil ~~end~~ end -- if exclude is set and n is in it don't add		if exclude and texclude[n] then showthismotif=nil end -- if exclude is set and n is in it don't add
	if showthismotif then		if showthismotif then
	---- update the table output for the legend		---- update the table output for the legend
Line 211:		Line 217:
	end		end
	if not(tableoutput) then output = "" end		if not(tableoutput) then output = "" end
	if tlegend == "" then ~~else~~ tlegend = [[<div style="width:]]..width..[[;">]] .. [[''Top row:'' ]] .. tlegend .. [[</div>]] end		if tlegend ~= "" then tlegend = [[<div style="width:]]..width..[[;">]] .. [[''Top row:'' ]] .. tlegend .. [[</div>]] end
	if vprotest == "" then ~~else~~ vprotest = "''Overlapping vertical annotations not shown above: " .. vprotest .. "''" end		if vprotest ~= "" then vprotest = "''Overlapping vertical annotations not shown above: " .. vprotest .. "''" end
	if debuglog == "\|}\|}" then debuglog="" else debuglog = debuglog .. "\n" end		if debuglog == "\|}\|}" then debuglog="" else debuglog = debuglog .. "\n" end
	if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.		if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.
Line 218:		Line 224:
	if nowiki then output = frame.preprocess(frame,"<pre><nowiki>"..output.."</nowiki></pre>") end		if nowiki then output = frame.preprocess(frame,"<pre><nowiki>"..output.."</nowiki></pre>") end
	return output		return output

	end		end

Jonesey95: div for multi-line legend

2021-10-02T19:55:46Z

div for multi-line legend

← Previous revision		Revision as of 19:55, 2 October 2021
Line 211:		Line 211:
	end		end
	if not(tableoutput) then output = "" end		if not(tableoutput) then output = "" end
	if tlegend == "" then else tlegend = [[<~~span~~ style="width:]]..width..[[;">]] .. [[''Top row:'' ]] .. tlegend .. [[</~~span~~>]] end		if tlegend == "" then else tlegend = [[<div style="width:]]..width..[[;">]] .. [[''Top row:'' ]] .. tlegend .. [[</div>]] end
	if vprotest == "" then else vprotest = "''Overlapping vertical annotations not shown above: " .. vprotest .. "''" end		if vprotest == "" then else vprotest = "''Overlapping vertical annotations not shown above: " .. vprotest .. "''" end
	if debuglog == "\|}\|}" then debuglog="" else debuglog = debuglog .. "\n" end		if debuglog == "\|}\|}" then debuglog="" else debuglog = debuglog .. "\n" end

Jonesey95: Fix Linter errors (span tag wrapping multiple lines)

2021-10-02T19:54:05Z

Fix Linter errors (span tag wrapping multiple lines)

← Previous revision		Revision as of 19:54, 2 October 2021
Line 215:		Line 215:
	if debuglog == "\|}\|}" then debuglog="" else debuglog = debuglog .. "\n" end		if debuglog == "\|}\|}" then debuglog="" else debuglog = debuglog .. "\n" end
	if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.		if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.
	local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><~~span~~ style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</~~span~~>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"		local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><div style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</div>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"
	if nowiki then output = frame.preprocess(frame,"<pre><nowiki>"..output.."</nowiki></pre>") end		if nowiki then output = frame.preprocess(frame,"<pre><nowiki>"..output.."</nowiki></pre>") end
	return output		return output

TheDJ: mw-collapsible

2021-04-12T14:49:34Z

mw-collapsible

← Previous revision		Revision as of 14:49, 12 April 2021
Line 14:		Line 14:
	local largeonlyregion=args.largeonlyregion or pargs.largeonlyregion or 20		local largeonlyregion=args.largeonlyregion or pargs.largeonlyregion or 20
	local vtext=tonumber(vtext) -- no meaning except as a number		local vtext=tonumber(vtext) -- no meaning except as a number
	local tableoutput=args.tableoutput or pargs.tableoutput or "collapsed" -- I've decided to use the table as the legend much of the time after all, I think. (previously defaulted to "nil" to suppress)		local tableoutput=args.tableoutput or pargs.tableoutput or "mw-collapsed" -- I've decided to use the table as the legend much of the time after all, I think. (previously defaulted to "nil" to suppress)
	if tableoutput=="no" then tableoutput=nil end		if tableoutput=="no" then tableoutput=nil end
	local vwidth=args.vwidth or pargs.vwidth or 4 -- number of PIXELS to tag as not overwriteable with vertical text.		local vwidth=args.vwidth or pargs.vwidth or 4 -- number of PIXELS to tag as not overwriteable with vertical text.
Line 100:		Line 100:
	local output		local output
	local tlegend="" -- legend for top row entries only, shown above table		local tlegend="" -- legend for top row entries only, shown above table
	if tableoutput=="collapsed" then output=[[{\| class="wikitable collapsible collapsed" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else if tableoutput=="collapsible" then output=[[{\| class="wikitable collapsible" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else output=[[{\| class="wikitable"]] end end		if tableoutput=="collapsed" then output=[[{\| class="wikitable mw-collapsible mw-collapsed" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else if tableoutput=="collapsible" then output=[[{\| class="wikitable collapsible" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else output=[[{\| class="wikitable"]] end end
	local graphics=[[<div style="position:relative;background-color:]].. background .. [[;width:]] .. width .. [[px;height:]] .. height .. [[px;">]]		local graphics=[[<div style="position:relative;background-color:]].. background .. [[;width:]] .. width .. [[px;height:]] .. height .. [[px;">]]
	---- MAIN LOOP ----		---- MAIN LOOP ----

Wnt: phooey, I don't quite remember...

2013-04-28T02:29:07Z

phooey, I don't quite remember...

← Previous revision		Revision as of 02:29, 28 April 2013
Line 216:		Line 216:
	if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.		if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.
	local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><span style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</span>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"		local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><span style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</span>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"
	if nowiki then output = frame.preprocess(frame,"<nowiki>"..output.."</nowiki>") end		if nowiki then output = frame.preprocess(frame,"<pre><nowiki>"..output.."</nowiki></pre>") end
	return output		return output

Wnt: hmmm, that didn't take.

2013-04-28T02:27:39Z

hmmm, that didn't take.

← Previous revision		Revision as of 02:27, 28 April 2013
Line 216:		Line 216:
	if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.		if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.
	local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><span style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</span>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"		local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><span style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</span>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"
	if nowiki then output = "<nowiki>"..output.."</nowiki>" end		if nowiki then output = frame.preprocess(frame,"<nowiki>"..output.."</nowiki>") end
	return output		return output

Wnt: Adding a nowiki option to view raw html

2013-04-28T02:25:57Z

Adding a nowiki option to view raw html

← Previous revision		Revision as of 02:25, 28 April 2013
Line 19:		Line 19:
	local vclaim={} --- if vclaim[pixel] is true, that pixel is taken		local vclaim={} --- if vclaim[pixel] is true, that pixel is taken
	local vprotest='' --- list of positions not shown separated by spaces		local vprotest='' --- list of positions not shown separated by spaces
			local nowiki=args.nowiki or pargs.nowiki

	---- These parameters send text that needs to be processed into tables		---- These parameters send text that needs to be processed into tables
Line 215:		Line 216:
	if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.		if vtext>2 then vtext=vtext-2 end -- make up for extra return required to start a table at the end there.
	local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><span style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</span>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"		local output = [=[{\| style="width:]=]..width..[[px;"]] .. "\n\|".. graphics .. [[</div><span style="line-height:90%;font-size:85%;">]] .. mw.ustring.rep("\n",vtext) .. "</span>" .. tlegend .. vprotest .. "\n" .. output .. "\n\|}\n" .. debuglog .. "\|}\n"
			if nowiki then output = "<nowiki>"..output.."</nowiki>" end
	return output		return output

Wnt: I think the 1px border throws things off ever so slightly and isn't really mattering in two examples so far. Might try again at some point.

2013-03-25T18:45:54Z

I think the 1px border throws things off ever so slightly and isn't really mattering in two examples so far. Might try again at some point.

← Previous revision		Revision as of 18:45, 25 March 2013
Line 100:		Line 100:
	local tlegend="" -- legend for top row entries only, shown above table		local tlegend="" -- legend for top row entries only, shown above table
	if tableoutput=="collapsed" then output=[[{\| class="wikitable collapsible collapsed" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else if tableoutput=="collapsible" then output=[[{\| class="wikitable collapsible" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else output=[[{\| class="wikitable"]] end end		if tableoutput=="collapsed" then output=[[{\| class="wikitable collapsible collapsed" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else if tableoutput=="collapsible" then output=[[{\| class="wikitable collapsible" style="width:]].. width .. [[px;"]] .. "\n" .. [[!colspan=4\|List of protein features]] .. "\n" .. [[\|-]] else output=[[{\| class="wikitable"]] end end
	local graphics=[[<div style="position:relative~~;border:1px;border-style:solid;border-color: #000000~~;background-color:]].. background .. [[;width:]] .. width .. [[px;height:]] .. height .. [[px;">]]		local graphics=[[<div style="position:relative;background-color:]].. background .. [[;width:]] .. width .. [[px;height:]] .. height .. [[px;">]]
	---- MAIN LOOP ----		---- MAIN LOOP ----
	---- this goes through features one by one and marks them down in "output" (legend/table) and "graphics" (protein box and vertical annotation)		---- this goes through features one by one and marks them down in "output" (legend/table) and "graphics" (protein box and vertical annotation)

Wnt: Moving default color profile to template: space

2013-03-24T13:16:04Z

Moving default color profile to template: space

← Previous revision		Revision as of 13:16, 24 March 2013
Line 83:		Line 83:
	---- Load a set of colors to use for the different motifs.		---- Load a set of colors to use for the different motifs.
	---- Any unicode separator changes them. No format expectations.		---- Any unicode separator changes them. No format expectations.
	local colorpage=mw.title.new("~~Module talk~~:ImportProtein/DefaultColors")		local colorpage=mw.title.new("Template:ImportProtein/DefaultColors")
	local content		local content
	local color={}		local color={}

Wnt: Allowing substitution of blank text to a feature in order to make room for others without removing it from the table

2013-03-19T19:18:19Z

Allowing substitution of blank text to a feature in order to make room for others without removing it from the table

← Previous revision		Revision as of 19:18, 19 March 2013
Line 170:		Line 170:
	graphics = graphics .. [[<div style="position:absolute;overflow:hidden;z-index:]] .. z .. [[;left:]] .. boxleft .. [[px;border-top:0px;border-bottom:0px;border-left:1px;border-right:1px;border-style:solid;border-color:]].. c .. [[;background-color:]].. c .. [[;width:]] .. boxwidth .. [[px;height:]] .. vertical .. [[px;text-align:center;">]] .. annot .. [[</div>]]		graphics = graphics .. [[<div style="position:absolute;overflow:hidden;z-index:]] .. z .. [[;left:]] .. boxleft .. [[px;border-top:0px;border-bottom:0px;border-left:1px;border-right:1px;border-style:solid;border-color:]].. c .. [[;background-color:]].. c .. [[;width:]] .. boxwidth .. [[px;height:]] .. vertical .. [[px;text-align:center;">]] .. annot .. [[</div>]]
	-- draw annotations vertically below it		-- draw annotations vertically below it
	-- don't do at all if on the top row		-- don't do at all if no text (nkey=="", such as on the top row)
	if not (~~ttoprow[n]~~) then		if not (nkey=="") then
	-- first decide if in a replaceregion - if so, don't draw		-- first decide if in a replaceregion - if so, don't draw
	local toreplace;local ri=1		local toreplace;local ri=1