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

render improvments part 3

This commit is contained in:
Tim Bentley 2009-09-15 20:06:40 +01:00
parent 1074f4b98f
commit 41ec7a2108
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,9 @@ class Renderer(object):
self._theme = None
self._bg_image_filename = None
self._frame = None
self._bg_frame = None
self.bg_frame = None
self.bg_image = None
self._bg_frame_small = None
#self.bg_frame_small = None
def set_debug(self, debug):
"""
@ -73,7 +73,7 @@ class Renderer(object):
"""
log.debug(u'set theme')
self._theme = theme
self._bg_frame = None
self.bg_frame = None
self.bg_image = None
self.theme_name = theme.theme_name
self._set_theme_font()
@ -131,14 +131,14 @@ class Renderer(object):
Defaults to *False*. Whether or not to generate a preview.
"""
if preview == True:
self._bg_frame = None
self.bg_frame = None
log.debug(u'set frame dest (frame) w %d h %d', frame_width,
frame_height)
self._frame = QtGui.QImage(frame_width, frame_height,
QtGui.QImage.Format_ARGB32_Premultiplied)
if self._bg_image_filename is not None and self.bg_image is None:
self.scale_bg_image()
if self._bg_frame is None:
if self.bg_frame is None:
self._generate_background_frame()
def format_slide(self, words, footer):
@ -257,7 +257,7 @@ class Renderer(object):
if footer_lines is not None:
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)
self._frame = QtGui.QImage(self.bg_frame)
x, y = self._correctAlignment(self._rect, bbox)
bbox = self._render_lines_unaligned(lines, False, (x, y), True)
if footer_lines is not None:
@ -272,11 +272,11 @@ class Renderer(object):
Results are cached for performance reasons.
"""
assert(self._theme)
self._bg_frame = QtGui.QImage(self._frame.width(), self._frame.height(),
self.bg_frame = QtGui.QImage(self._frame.width(), self._frame.height(),
QtGui.QImage.Format_ARGB32_Premultiplied)
log.debug(u'render background %s start', self._theme.background_type)
painter = QtGui.QPainter()
painter.begin(self._bg_frame)
painter.begin(self.bg_frame)
if self._theme.background_mode == u'transparent':
painter.fillRect(self._frame.rect(), QtCore.Qt.transparent)
else:
@ -321,8 +321,8 @@ class Renderer(object):
if self.bg_image is not None:
painter.drawImage(0, 0, self.bg_image)
painter.end()
self._bg_frame_small = self._bg_frame.scaled(QtCore.QSize(280, 210),
QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
# self.bg_frame_small = self.bg_frame.scaled(QtCore.QSize(280, 210),
# QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation)
log.debug(u'render background End')
def _correctAlignment(self, rect, bbox):

10
openlp/core/lib/serviceitem.py
View File

@ -61,14 +61,11 @@ class ServiceItem(object):
self.items = []
self.iconic_representation = None
self.raw_slides = None
self.frame_titles = []
self.command_files = []
self.frames = []
self.raw_footer = None
self.theme = None
self.service_item_path = None
self.service_item_type = None
#log.debug(u'Service item created for %s ', self.shortname)
self.service_frames = []
def addIcon(self, icon):
@ -120,6 +117,11 @@ class ServiceItem(object):
log.error(u'Invalid value renderer :%s' % self.service_item_type)
def render_individual(self, row):
log.debug(u'render individual')
if self.theme == None:
self.RenderManager.set_override_theme(None)
else:
self.RenderManager.set_override_theme(self.theme)
format = self.frames[row][u'text'].split(u'\n')
frame = self.RenderManager.generate_slide(format,
self.raw_footer)
@ -140,7 +142,7 @@ class ServiceItem(object):
"""
self.service_item_type = ServiceType.Image
self.service_item_path = path
self.service_frames.append({u'title': frame_title, u'image': image})
self.service_frames.append({u'title': frame_title, u'text':None, u'image': image})
def add_from_text(self, frame_title, raw_slide):
"""

12
openlp/core/ui/slidecontroller.py
View File

@ -293,13 +293,15 @@ class SlideController(QtGui.QWidget):
self.PreviewListWidget.setColumnWidth(0, slide_width)
for framenumber, frame in enumerate(self.serviceitem.frames):
self.PreviewListWidget.setRowCount(self.PreviewListWidget.rowCount() + 1)
#pixmap = self.parent.RenderManager.resize_image(frame[u'image'], slide_width, slide_height)
item = QtGui.QTableWidgetItem()
label = QtGui.QLabel()
label.setMargin(8)
#label.setScaledContents(True)
label.setText(frame[u'text'])
#label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
if frame[u'text'] == None:
pixmap = self.parent.RenderManager.resize_image(frame[u'image'], slide_width, slide_height)
label.setScaledContents(True)
label.setPixmap(QtGui.QPixmap.fromImage(pixmap))
else:
label.setText(frame[u'text'])
self.PreviewListWidget.setCellWidget(framenumber, 0, label)
self.PreviewListWidget.setItem(framenumber, 0, item)
self.PreviewListWidget.setRowHeight(framenumber, slide_height)
@ -337,9 +339,11 @@ class SlideController(QtGui.QWidget):
if row > -1 and row < self.PreviewListWidget.rowCount():
label = self.PreviewListWidget.cellWidget(row, 0)
frame = self.serviceitem.frames[row][u'image']
before = time.time()
if frame == None:
frame = self.serviceitem.render_individual(row)
self.SlidePreview.setPixmap(QtGui.QPixmap.fromImage(frame))
log.info(u'Slide Rendering took %4s' % (time.time() - before))
if self.isLive:
self.parent.mainDisplay.frameView(frame)