Remove comments and simplify

This commit is contained in:
Tim Bentley 2010-05-10 19:29:51 +01:00
parent 51728db0b6
commit f7244c5e6e
1 changed files with 8 additions and 18 deletions

View File

@ -38,12 +38,12 @@ log = logging.getLogger(__name__)
class SlideThread(QtCore.QThread): class SlideThread(QtCore.QThread):
""" """
A special Qt thread class to fetch the version of OpenLP from the website. A special Qt thread class to speed up the display of text based frames.
This is threaded so that it doesn't affect the loading time of OpenLP. This is threaded so it loads the frames in background
""" """
def __init__(self, parent, isLive, count): def __init__(self, parent, prefix, count):
QtCore.QThread.__init__(self, parent) QtCore.QThread.__init__(self, parent)
self.isLive = isLive self.prefix = prefix
self.count = count self.count = count
def run(self): def run(self):
@ -52,13 +52,7 @@ class SlideThread(QtCore.QThread):
""" """
time.sleep(1) time.sleep(1)
for i in range(0, self.count): for i in range(0, self.count):
if self.isLive: Receiver.send_message(u'%s_slide_cache' % self.prefix, i)
Receiver.send_message(u'live_slide_cache', i)
else:
Receiver.send_message(u'preview_slide_cache', i)
# for framenumber, frame in enumerate(self.serviceItem.get_frames()):
# self.serviceItem.get_rendered_frame(framenumber)
class SlideList(QtGui.QTableWidget): class SlideList(QtGui.QTableWidget):
""" """
@ -378,12 +372,8 @@ class SlideController(QtGui.QWidget):
QtCore.SIGNAL(u'splitterMoved(int, int)'), self.trackSplitter) QtCore.SIGNAL(u'splitterMoved(int, int)'), self.trackSplitter)
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'config_updated'), self.refreshServiceItem) QtCore.SIGNAL(u'config_updated'), self.refreshServiceItem)
if self.isLive: QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.SIGNAL(u'%s_slide_cache' % self.typePrefix), self.slideCache)
QtCore.SIGNAL(u'live_slide_cache'), self.slideCache)
else:
QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'preview_slide_cache'), self.slideCache)
def widthChanged(self): def widthChanged(self):
""" """
@ -603,7 +593,7 @@ class SlideController(QtGui.QWidget):
[serviceItem]) [serviceItem])
if self.serviceItem.is_text(): if self.serviceItem.is_text():
st = SlideThread( st = SlideThread(
self, self.isLive, len(self.serviceItem.get_frames())) self, self.typePrefix, len(self.serviceItem.get_frames()))
st.start() st.start()
log.log(15, u'Display Rendering took %4s' % (time.time() - before)) log.log(15, u'Display Rendering took %4s' % (time.time() - before))