raoul
/
openlp
forked from openlp/openlp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented the binary chop algorithm to speed up 'word by word' rendering. 

bzr-revno: 1567
This commit is contained in:
Andreas Preikschat 2011-05-24 21:33:12 +02:00
parent 721def9b10 2377a5f5ff
commit 0db69c93ed
1 changed files with 49 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
openlp/core/lib/renderer.py
View File

@ -335,7 +335,7 @@ class Renderer(object):
styled_text += styled_line styled_text += styled_line
html = self.page_shell + styled_text + HTML_END html = self.page_shell + styled_text + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
# Text too long so go to next page # Text too long so go to next page.
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
if force_page and line_count > 0: if force_page and line_count > 0:
Receiver.send_message(u'theme_line_count', line_count) Receiver.send_message(u'theme_line_count', line_count)
@ -366,7 +366,7 @@ class Renderer(object):
""" """
log.debug(u'_paginate_slide_words - Start') log.debug(u'_paginate_slide_words - Start')
line_end = u'' line_end = u' '
if line_break: if line_break:
line_end = u'<br>' line_end = u'<br>'
formatted = [] formatted = []
@ -374,10 +374,11 @@ class Renderer(object):
previous_raw = u'' previous_raw = u''
lines = text.split(u'\n') lines = text.split(u'\n')
for line in lines: for line in lines:
line = line.strip()
styled_line = expand_tags(line) styled_line = expand_tags(line)
html = self.page_shell + previous_html + styled_line + HTML_END html = self.page_shell + previous_html + styled_line + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
# Text too long so go to next page # Text too long so go to next page.
if self.web_frame.contentsSize().height() > self.page_height: if self.web_frame.contentsSize().height() > self.page_height:
# Check if there was a verse before the current one and append # Check if there was a verse before the current one and append
# it, when it fits on the page. # it, when it fits on the page.
@ -401,24 +402,56 @@ class Renderer(object):
previous_html = styled_line + line_end previous_html = styled_line + line_end
previous_raw = line + line_end previous_raw = line + line_end
continue continue
words = self._words_split(line) # Figure out how many words of the line will fit on screen by
for word in words: # using the algorithm known as "binary chop".
styled_word = expand_tags(word) raw_words = self._words_split(line)
html = self.page_shell + previous_html + styled_word + \ html_words = [expand_tags(word) for word in raw_words]
HTML_END smallest_index = 0
highest_index = len(html_words) - 1
index = int(highest_index / 2)
while True:
html = self.page_shell + previous_html + \
u''.join(html_words[:index + 1]).strip() + HTML_END
self.web.setHtml(html) self.web.setHtml(html)
# Text too long so go to next page
if self.web_frame.contentsSize().height() > \ if self.web_frame.contentsSize().height() > \
self.page_height: self.page_height:
while previous_raw.endswith(u'<br>'): # We know that it does not fit, so change/calculate the
previous_raw = previous_raw[:-4] # new index and highest_index accordingly.
formatted.append(previous_raw) highest_index = index
index = int(index - (index - smallest_index) / 2)
else:
smallest_index = index
index = int(index + (highest_index - index) / 2)
# We found the number of words which will fit.
if smallest_index == index or highest_index == index:
index = smallest_index
formatted.append(previous_raw.rstrip(u'<br>') +
u''.join(raw_words[:index + 1]))
previous_html = u'' previous_html = u''
previous_raw = u'' previous_raw = u''
previous_html += styled_word else:
previous_raw += word continue
previous_html += line_end # Check if the rest of the line fits on the slide. If it
previous_raw += line_end # does we do not have to do the much more intensive "word by
# word" checking.
html = self.page_shell + \
u''.join(html_words[index + 1:]).strip() + HTML_END
self.web.setHtml(html)
if self.web_frame.contentsSize().height() <= \
self.page_height:
previous_html = \
u''.join(html_words[index + 1:]).strip() + line_end
previous_raw = \
u''.join(raw_words[index + 1:]).strip() + line_end
break
else:
# The other words do not fit, thus reset the indexes,
# create a new list and continue with "word by word".
raw_words = raw_words[index + 1:]
html_words = html_words[index + 1:]
smallest_index = 0
highest_index = len(html_words) - 1
index = int(highest_index / 2)
else: else:
previous_html += styled_line + line_end previous_html += styled_line + line_end
previous_raw += line + line_end previous_raw += line + line_end