BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the presentation name/page number to match shapes to pages, not time.

Browse Source 
The previous code assumed that if a shape event's timestamp was during the
time when a particular slide was visible, then the shape belonged to that
slide. This isn't always true with the text shapes, since a final close
event can be sent after the slide has switched.

For a more future-proof matching, use the presentation name and page number
fields on the shape events when available to match them with the appropriate
slide image.
This commit is contained in:
Calvin Walton 2017-04-26 11:21:29 -04:00
parent 7eba006345
commit a5adebd3e0
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
record-and-playback/presentation/scripts/publish/presentation.rb
View File

@ -664,7 +664,7 @@ def processSlideEvents
# Is this a new image or one previously viewed? # Is this a new image or one previously viewed?
if($slides_compiled[[slide_src, slide_size[1], slide_size[0]]] == nil) if($slides_compiled[[slide_src, slide_size[1], slide_size[0]]] == nil)
# If it is, add it to the list with all the data. # If it is, add it to the list with all the data.
$slides_compiled[[slide_src, slide_size[1], slide_size[0]]] = [[slide_start], [slide_end], $global_slide_count, slide_text, [orig_slide_start], [orig_slide_end]] $slides_compiled[[slide_src, slide_size[1], slide_size[0]]] = [[slide_start], [slide_end], $global_slide_count, slide_text, [orig_slide_start], [orig_slide_end], $presentation_name, slide_number]
$global_slide_count = $global_slide_count + 1 $global_slide_count = $global_slide_count + 1
else else
# If not, append new in and out times to the old entry # If not, append new in and out times to the old entry
@ -728,16 +728,28 @@ def processShapesAndClears
$shapeCreationTime = ( translateTimestamp($shapeTimestamp) / 1000 ).round(1) $shapeCreationTime = ( translateTimestamp($shapeTimestamp) / 1000 ).round(1)
orig_shapeCreationTime = ( $shapeTimestamp.to_f / 1000 ).round(1) orig_shapeCreationTime = ( $shapeTimestamp.to_f / 1000 ).round(1)
in_this_image = false in_this_image = false
# Check if the current shape is to be drawn in the current image
presentation = shape.at_xpath(".//presentation")
pageNumber = shape.at_xpath(".//pageNumber")
if presentation and pageNumber
# If we have the presentation and page number available, match
# against that.
if presentation.text() == $val[6] and pageNumber.text().to_i == $val[7]
in_this_image = true
end
else
# Otherwise check if the shape is within one of the time ranges
# when the current image is visible
index = 0 index = 0
numOfTimes = $val[0].length numOfTimes = $val[0].length
# Check if the current shape is to be drawn in this particular image
while((in_this_image == false) && (index < numOfTimes)) do while((in_this_image == false) && (index < numOfTimes)) do
if((($val[4][index].to_f)..($val[5][index].to_f)) === orig_shapeCreationTime) # is the shape within the certain time of the image if((($val[4][index].to_f)..($val[5][index].to_f)) === orig_shapeCreationTime)
in_this_image = true in_this_image = true
end end
index+=1 index+=1
end end
end
if(in_this_image) if(in_this_image)
# Get variables # Get variables