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

more simplifications

Browse Source
This commit is contained in:
Andreas Preikschat 2011-06-22 18:13:07 +02:00
parent 99da6e48f2
commit 63242b4191
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openlp/core/lib/imagemanager.py
View File

@ -121,7 +121,6 @@ class ImageManager(QtCore.QObject):
self.width = current_screen[u'size'].width() self.width = current_screen[u'size'].width()
self.height = current_screen[u'size'].height() self.height = current_screen[u'size'].height()
self._cache = {} self._cache = {}
self._cache_dirty = False
self._image_thread = ImageThread(self) self._image_thread = ImageThread(self)
self._clean_queue = PriorityQueue() self._clean_queue = PriorityQueue()
@ -141,7 +140,6 @@ class ImageManager(QtCore.QObject):
image.image = None image.image = None
image.image_bytes = None image.image_bytes = None
self._clean_queue.put((image.priority, image)) self._clean_queue.put((image.priority, image))
self._cache_dirty = True
# We want only one thread. # We want only one thread.
if not self._image_thread.isRunning(): if not self._image_thread.isRunning():
self._image_thread.start() self._image_thread.start()
@ -198,7 +196,6 @@ class ImageManager(QtCore.QObject):
self._clean_queue.put((image.priority, image)) self._clean_queue.put((image.priority, image))
else: else:
log.debug(u'Image in cache %s:%s' % (name, path)) log.debug(u'Image in cache %s:%s' % (name, path))
self._cache_dirty = True
# We want only one thread. # We want only one thread.
if not self._image_thread.isRunning(): if not self._image_thread.isRunning():
self._image_thread.start() self._image_thread.start()
@ -208,7 +205,7 @@ class ImageManager(QtCore.QObject):
Controls the processing called from a ``QtCore.QThread``. Controls the processing called from a ``QtCore.QThread``.
""" """
log.debug(u'_process - started') log.debug(u'_process - started')
while self._cache_dirty: while not self._clean_queue.empty():
log.debug(u'_process - recycle') log.debug(u'_process - recycle')
self._clean_cache() self._clean_cache()
log.debug(u'_process - ended') log.debug(u'_process - ended')
@ -218,10 +215,6 @@ class ImageManager(QtCore.QObject):
Actually does the work. Actually does the work.
""" """
log.debug(u'_clean_cache') log.debug(u'_clean_cache')
if self._clean_queue.empty():
print u'empty'
self._cache_dirty = False
return
image = self._clean_queue.get()[1] image = self._clean_queue.get()[1]
if image.image is None: if image.image is None:
print u'processing (image):', image.name, image.priority print u'processing (image):', image.name, image.priority