From d1f11138511c7807354c92ee9af530669ff26d8d Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 18 Jun 2012 14:27:04 +0200 Subject: [PATCH] use the update mechanism to reset images instead of deleting them (leading to a time advantage when the image did not change) --- openlp/core/lib/imagemanager.py | 9 --------- openlp/core/lib/renderer.py | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/openlp/core/lib/imagemanager.py b/openlp/core/lib/imagemanager.py index 1922cef34..fe1cd00f6 100644 --- a/openlp/core/lib/imagemanager.py +++ b/openlp/core/lib/imagemanager.py @@ -286,15 +286,6 @@ class ImageManager(QtCore.QObject): time.sleep(0.1) return image.image_bytes - def deleteImage(self, name): - """ - Delete the Image from the cache. - """ - log.debug(u'deleteImage %s' % name) - if name in self._cache: - self._conversionQueue.remove(self._cache[name]) - del self._cache[name] - def addImage(self, name, path, source, background): """ Add image to cache if it is not already there. diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py index e35c78559..8fe2eed9b 100644 --- a/openlp/core/lib/renderer.py +++ b/openlp/core/lib/renderer.py @@ -134,6 +134,7 @@ class Renderer(object): else: theme_data, main_rect, footer_rect = \ self._theme_dimensions[theme_name] + #FIXME: REMOVE deleteImage() call which will be added soon. # if No file do not update cache if theme_data.background_filename: self.image_manager.addImage(theme_data.theme_name, @@ -236,7 +237,6 @@ class Renderer(object): # make big page for theme edit dialog to get line count serviceItem.add_from_text(VERSE_FOR_LINE_COUNT) else: - self.image_manager.deleteImage(theme_data.theme_name) serviceItem.add_from_text(VERSE) serviceItem.renderer = self serviceItem.raw_footer = FOOTER