Remove prints for merge

This commit is contained in:
Tim Bentley 2010-01-22 17:54:08 +00:00
parent af3f69afce
commit 56275fbc21
6 changed files with 1 additions and 22 deletions

View File

@ -42,7 +42,7 @@ class Renderer(object):
Initialise the renderer.
"""
self._rect = None
self._debug = True
self._debug = False
self._right_margin = 64 # the amount of right indent
self._display_shadow_size_footer = 0
self._display_outline_size_footer = 0
@ -244,7 +244,6 @@ class Renderer(object):
bbox1 = self._render_lines_unaligned(footer_lines, True)
# reset the frame. first time do not worry about what you paint on.
self._frame = QtGui.QImage(self.bg_frame)
print "generate ", self._frame.size()
self._frameOp = QtGui.QImage(self.bg_frame)
x, y = self._correctAlignment(self._rect, bbox)
bbox = self._render_lines_unaligned(lines, False, (x, y), True)

View File

@ -175,7 +175,6 @@ class RenderManager(object):
footer_rect = QtCore.QRect(theme.font_footer_x,
theme.font_footer_y, theme.font_footer_width - 1,
theme.font_footer_height - 1)
print "build_text_rectangle", main_rect
self.renderer.set_text_rectangle(main_rect, footer_rect)
def generate_preview(self, themedata):
@ -229,7 +228,6 @@ class RenderManager(object):
"""
log.debug(u'generate slide')
self.build_text_rectangle(self.themedata)
print "set_frame_dest", self.width, self.height
self.renderer.set_frame_dest(self.width, self.height)
return self.renderer.generate_frame_from_lines(main_text, footer_text)
@ -248,4 +246,3 @@ class RenderManager(object):
self.width, self.height, self.screen_ratio )
# 90% is start of footer
self.footer_start = int(self.height * 0.90)
print "calculate_default ", self.width, self.height, self.footer_start

View File

@ -133,15 +133,10 @@ class MainDisplay(DisplayWidget):
@param (integer) screen This is the screen number.
"""
log.debug(u'Setup %s for %s ' %(self.screens, screenNumber))
print "all the screen ", self.screens
self.setVisible(False)
self.screen = self.screens.current
#Sort out screen locations and sizes
print "--------- Set screen geom ------------"
print "display ", self.screen[u'size']
self.setGeometry(self.screen[u'size'])
print "main geom", self.geometry()
print "display geom 1", self.display.geometry()
self.alertScreenPosition = self.screen[u'size'].height() * 0.9
self.alertHeight = self.screen[u'size'].height() - self.alertScreenPosition
self.alertDisplay.setGeometry(
@ -150,7 +145,6 @@ class MainDisplay(DisplayWidget):
self.video.setGeometry(self.screen[u'size'])
self.display.resize(self.screen[u'size'].width(),
self.screen[u'size'].height())
print "display geom 2", self.display.geometry()
#Build a custom splash screen
self.InitialFrame = QtGui.QImage(
self.screen[u'size'].width(),
@ -203,31 +197,23 @@ class MainDisplay(DisplayWidget):
``frame``
Image frame to be rendered
"""
# if self.timer_id != 0 :
# self.displayAlert()
print "render display start ", self.display.geometry()
if not self.displayBlank:
if transition:
if self.frame is not None:
print "render frame 1 ", self.frame.size()
self.display.setPixmap(QtGui.QPixmap.fromImage(self.frame))
self.repaint()
self.frame = None
if frame[u'trans'] is not None:
print "render frame 2 ", frame[u'trans'].size()
self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'trans']))
self.repaint()
self.frame = frame[u'trans']
print "render frame 3 ", frame[u'main'].size()
self.display.setPixmap(QtGui.QPixmap.fromImage(frame[u'main']))
self.repaint()
else:
print "render frame 3 ", frame.size()
self.display.setPixmap(QtGui.QPixmap.fromImage(frame))
if not self.isVisible():
self.setVisible(True)
self.showFullScreen()
print "render display end ", self.display.geometry()
def blankDisplay(self, blanked=True):
if blanked:

View File

@ -610,7 +610,6 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
self.settingsForm.exec_()
updated_display = self.getMonitorNumber()
if updated_display != self.screens.current_display:
print "main display screen changed to ", updated_display
self.screens.set_current_display(updated_display)
self.RenderManager.update_display(updated_display)
self.mainDisplay.setup(updated_display)

View File

@ -44,7 +44,6 @@ class Screen(object):
self.current = screen
self.screen_list.append(screen)
self.count += 1
print self.screen_list
def screen_exists(self, number):
for screen in self.screen_list:

View File

@ -109,7 +109,6 @@ class ThemeManager(QtGui.QWidget):
self.path = os.path.join(ConfigHelper.get_data_path(), u'themes')
self.checkThemesExists(self.path)
self.thumbPath = os.path.join(self.path, u'.thumbnails')
print self.thumbPath
self.checkThemesExists(self.thumbPath)
self.amendThemeForm.path = self.path
# Last little bits of setting up