From e0a1c081387339a2704effe500734876ae72a9ae Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sat, 13 Sep 2014 16:44:36 +0200 Subject: [PATCH] fix typo in mrmcd-pause --- mrmcd2014/__init__.py | 37 +++++++++++++++++++------------------ mrmcd2014/artwork/pause.svg | 16 ++++++++-------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/mrmcd2014/__init__.py b/mrmcd2014/__init__.py index 5e53f82..ca4a209 100644 --- a/mrmcd2014/__init__.py +++ b/mrmcd2014/__init__.py @@ -99,29 +99,29 @@ def outroFrames(parameters): def pauseFrames(parameters): - frames = int(2*fps) + frames = int(4*fps) for i in range(0, frames): yield ( - ('marquee', 'attr', 'x', '%.4f' % easeLinear(i, -108.66403, 110.3719675, frames)), - ('marquee', 'attr', 'y', '%.4f' % easeLinear(i, -6.3296866, -0.0262695, frames)), + ('marquee', 'attr', 'x', '%.4f' % easeLinear(i, -108.66403, 6.9679418+108.66403, frames)), + ('marquee', 'attr', 'y', '%.4f' % easeLinear(i, -6.3296866, 6.3296866-6.4861546, frames)), ) def debug(): - render('intro.svg', - '../intro.dv', - introFrames, - { - '$id': 5924, - '$title': 'Eliminating DOM-based XSS', - '$subtitle': '', - '$personnames': 'Tobias Mueller' - } - ) + # render('intro.svg', + # '../intro.dv', + # introFrames, + # { + # '$id': 5924, + # '$title': 'Eliminating DOM-based XSS', + # '$subtitle': '', + # '$personnames': 'Tobias Mueller' + # } + # ) - render('outro.svg', - '../outro.dv', - outroFrames - ) + # render('outro.svg', + # '../outro.dv', + # outroFrames + # ) render('pause.svg', '../pause.dv', @@ -131,7 +131,8 @@ def debug(): def tasks(queue): # iterate over all events extracted from the schedule xml-export for event in events(scheduleUrl): - + if event['id'] != 6034: + continue # generate a task description and put them into the queue queue.put(Rendertask( infile = 'intro.svg', diff --git a/mrmcd2014/artwork/pause.svg b/mrmcd2014/artwork/pause.svg index ffae17e..9eaff1a 100644 --- a/mrmcd2014/artwork/pause.svg +++ b/mrmcd2014/artwork/pause.svg @@ -111,9 +111,9 @@ inkscape:window-height="993" id="namedview520" showgrid="false" - inkscape:zoom="0.92320413" - inkscape:cx="454.71576" - inkscape:cy="137.93314" + inkscape:zoom="2.6112156" + inkscape:cx="-29.281387" + inkscape:cy="498.43526" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" @@ -1031,13 +1031,13 @@ transform="matrix(0.99541079,-0.09569414,0.09569414,0.99541079,0,0)" sodipodi:linespacing="125%" id="marquee" - y="-6.3296866" - x="-108.66403" + y="-6.4861546" + x="6.9679418" style="font-size:9.66172123px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:DINMittelschrift;-inkscape-font-specification:DINMittelschrift" xml:space="preserve">MITTASPAUSE MITTASPAUSE MITTASPAUSE MITTASPAUSE + sodipodi:role="line">MITTAGSPAUSE MITTAGSPAUSE MITTAGSPAUSE MITTAGSPAUSE \ No newline at end of file