Rendering fixes

openlp/core/lib/renderer.py

@@ -221,7 +221,6 @@ class Renderer:
                 by = 0
                 for (x, y) in bboxes[startline:endline]:
                     by += y
-                print "A ", by, bottom , bboxes
                 if by > bottom:
                     good=0
                     break
@@ -306,7 +305,6 @@ class Renderer:
             # render after current bottom, but at original left edge
             # keep track of right edge to see which is biggest
             (thisx, bry) = self._render_single_line(line, footer, (x , bry))
-            print thisx ,  bry
             if (thisx > brx):
                 brx = thisx
         retval = QtCore.QRect(x, y,brx-x, bry-y)
@@ -334,13 +332,12 @@ class Renderer:
         # We draw the text to see how big it is and then iterate to make it fit
         # when we line wrap we do in in the "lyrics" style, so the second line is
         # right aligned with a "hanging indent"
-
-        print "before ", line
         words = line.split(u' ')
         thisline = u' '.join(words)
         lastword = len(words)
         lines = []
-        maxx = self._rect.width(); maxy=self._rect.height();
+        maxx = self._rect.width();
+        maxy = self._rect.height();
         while (len(words)>0):
             w , h = self._get_extent_and_render(thisline, footer)
             rhs = w + x
@@ -358,14 +355,12 @@ class Renderer:
         if footer: # dont allow alignment messing with footers
             align = 0
         else:
-            align = self._theme .display_horizontalAlign
+            align = int(self._theme .display_horizontalAlign)
 
         for linenum in range(len(lines)):
             line = lines[linenum]
-            print "render line ",  line
             #find out how wide line is
             w , h = self._get_extent_and_render(line, footer,  tlcorner=(x, y), draw=False)
-
             if self._theme.display_shadow:
                 w += self._shadow_offset
                 h += self._shadow_offset
@@ -379,7 +374,6 @@ class Renderer:
                     if rightextent > maxx:
                         rightextent = maxx
                     x = rightextent - w
-
             elif align == 1: # right align
                 rightextent = maxx
                 x = maxx-w
@@ -410,7 +404,6 @@ class Renderer:
                         color = self._theme.display_outline_color)
 
             self._get_extent_and_render(line, footer,tlcorner=(x, y), draw=True)
-#             log.debug(u'Line %2d: Render '%s' at (%d, %d) wh=(%d,%d)' % ( linenum, line, x, y,w,h)
             y += h
             if linenum == 0:
                 self._first_line_right_extent = rightextent

openlp/core/lib/rendermanager.py

@@ -29,6 +29,9 @@ import sys
 import linecache
 
 def traceit(frame, event, arg):
+    """
+    Code to allow calls to be traced by python runtime
+    """
     if event == "line":
         lineno = frame.f_lineno
         filename = frame.f_globals["__file__"]
@@ -118,12 +121,14 @@ class RenderManager:
     def format_slide(self, words, footer):
         log.debug(u'format slide')
         self.calculate_default(self.screen_list[self.current_display]['size'])
+        self.build_text_rectangle(self.themedata)
         self.renderer.set_frame_dest(self.width, self.height)
         return self.renderer.format_slide(words, footer)
 
     def generate_slide(self,main_text, footer_text):
         log.debug(u'generate slide')
         self.calculate_default(self.screen_list[self.current_display]['size'])
+        self.build_text_rectangle(self.themedata)
         self.renderer.set_frame_dest(self.width, self.height)
         return self.renderer.render_lines(main_text, footer_text)