[processing] cache icons to speed up toolbox rendering

fixes #15550
qgis · Sep 13, 2016 · d265f33 · d265f33 · nyalldawson · Sep 13, 2016
1 parent f55d7d3
commit d265f33
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/python/plugins/processing/algs/grass/GrassAlgorithm.py b/python/plugins/processing/algs/grass/GrassAlgorithm.py
@@ -66,6 +66,7 @@
 pluginPath = os.path.normpath(os.path.join(
     os.path.split(os.path.dirname(__file__))[0], os.pardir))
 
+_icon = QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
 
 class GrassAlgorithm(GeoAlgorithm):
 
@@ -89,9 +90,10 @@ def getCopy(self):
         newone = GrassAlgorithm(self.descriptionFile)
         newone.provider = self.provider
         return newone
-
+    
     def getIcon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
+        return _icon
+
 
     def help(self):
         return False, 'http://grass.osgeo.org/grass64/manuals/' + self.grassName + '.html'
@@ -121,11 +123,10 @@ def defineCharacteristicsFromFile(self):
         line = lines.readline().strip('\n').strip()
         self.grassName = line
         line = lines.readline().strip('\n').strip()
-        self.name = line
-        self.i18n_name = QCoreApplication.translate("GrassAlgorithm", line)
-        if " - " not in self.name:
-            self.name = self.grassName + " - " + self.name
-            self.i18n_name = self.grassName + " - " + self.i18n_name
+        self.name = line.split("-")[0]
+        #self.i18n_name = QCoreApplication.translate("GrassAlgorithm", self.name)
+        self.name = self.grassName
+        self.i18n_name = self.grassName
         line = lines.readline().strip('\n').strip()
         self.group = line
         self.i18n_group = QCoreApplication.translate("GrassAlgorithm", line)

diff --git a/python/plugins/processing/algs/grass7/Grass7Algorithm.py b/python/plugins/processing/algs/grass7/Grass7Algorithm.py
@@ -65,6 +65,7 @@
 pluginPath = os.path.normpath(os.path.join(
     os.path.split(os.path.dirname(__file__))[0], os.pardir))
 
+_icon = QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
 
 class Grass7Algorithm(GeoAlgorithm):
 
@@ -98,8 +99,8 @@ def getCopy(self):
         return newone
 
     def getIcon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'grass.svg'))
-
+        return _icon
+    
     def help(self):
         localDoc = None
         html = self.grass7Name + '.html'

diff --git a/python/plugins/processing/algs/otb/OTBAlgorithm.py b/python/plugins/processing/algs/otb/OTBAlgorithm.py
@@ -51,6 +51,7 @@
 pluginPath = os.path.normpath(os.path.join(
     os.path.split(os.path.dirname(__file__))[0], os.pardir))
 
+_icon = QIcon(os.path.join(pluginPath, 'images', 'otb.png'))
 
 class OTBAlgorithm(GeoAlgorithm):
 
@@ -73,7 +74,7 @@ def getCopy(self):
         return newone
 
     def getIcon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'otb.png'))
+        return _icon
 
     def help(self):
         version = OTBUtils.getInstalledVersion()

diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm212.py b/python/plugins/processing/algs/saga/SagaAlgorithm212.py
@@ -57,6 +57,7 @@
 
 sessionExportedLayers = {}
 
+_icon = QIcon(os.path.join(pluginPath, 'images', 'saga.png'))
 
 class SagaAlgorithm212(GeoAlgorithm):
 
@@ -75,8 +76,8 @@ def getCopy(self):
         return newone
 
     def getIcon(self):
-        return QIcon(os.path.join(pluginPath, 'images', 'saga.png'))
-
+        return _icon
+    
     def defineCharacteristicsFromFile(self):
         lines = open(self.descriptionFile)
         line = lines.readline().strip('\n').strip()