Skip to content

Commit 4eab185

Browse files
volayavolaya
committed
[processing] all gdal algs now have the same icon
Did some code cleaning in gdal package
1 parent 45c0be1 commit 4eab185

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+74
-233
lines changed

‎python/plugins/processing/algs/gdal/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
FILE(GLOB PY_FILES *.py)
2-
FILE(GLOB ICON_FILES icons/*.png)
32

4-
ADD_SUBDIRECTORY(scripts)
53
ADD_SUBDIRECTORY(pyogr)
64

7-
PLUGIN_INSTALL(processing ./algs/gdal ${PY_FILES})
8-
PLUGIN_INSTALL(processing ./algs/gdal/icons ${ICON_FILES})
5+
PLUGIN_INSTALL(processing ./algs/gdal ${PY_FILES})

‎python/plugins/processing/algs/gdal/ClipByExtent.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from PyQt4 import QtGui
3030
from qgis.core import *
3131

32-
from processing.core.GeoAlgorithm import GeoAlgorithm
32+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3333

3434
from processing.parameters.ParameterRaster import ParameterRaster
3535
from processing.parameters.ParameterExtent import ParameterExtent
@@ -39,18 +39,14 @@
3939
from processing.algs.gdal.GdalUtils import GdalUtils
4040

4141

42-
class ClipByExtent(GeoAlgorithm):
42+
class ClipByExtent(GdalAlgorithm):
4343

4444
INPUT = 'INPUT'
4545
OUTPUT = 'OUTPUT'
4646
NO_DATA = 'NO_DATA'
4747
PROJWIN = 'PROJWIN'
4848
EXTRA = 'EXTRA'
4949

50-
def getIcon(self):
51-
filepath = os.path.dirname(__file__) + '/icons/raster-clip.png'
52-
return QtGui.QIcon(filepath)
53-
5450
def defineCharacteristics(self):
5551
self.name = 'Clip raster by extent'
5652
self.group = '[GDAL] Extraction'

‎python/plugins/processing/algs/gdal/ClipByMask.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from osgeo import gdal
3131
from qgis.core import *
3232

33-
from processing.core.GeoAlgorithm import GeoAlgorithm
33+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3434

3535
from processing.parameters.ParameterRaster import ParameterRaster
3636
from processing.parameters.ParameterVector import ParameterVector
@@ -42,7 +42,7 @@
4242
from processing.algs.gdal.GdalUtils import GdalUtils
4343

4444

45-
class ClipByMask(GeoAlgorithm):
45+
class ClipByMask(GdalAlgorithm):
4646

4747
INPUT = 'INPUT'
4848
OUTPUT = 'OUTPUT'
@@ -52,10 +52,6 @@ class ClipByMask(GeoAlgorithm):
5252
KEEP_RESOLUTION = 'KEEP_RESOLUTION'
5353
EXTRA = 'EXTRA'
5454

55-
def getIcon(self):
56-
filepath = os.path.dirname(__file__) + '/icons/raster-clip.png'
57-
return QtGui.QIcon(filepath)
58-
5955
def defineCharacteristics(self):
6056
self.name = 'Clip raster by mask layer'
6157
self.group = '[GDAL] Extraction'

‎python/plugins/processing/algs/gdal/ColorRelief.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from PyQt4.QtGui import *
3030

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3232
from processing.parameters.ParameterRaster import ParameterRaster
3333
from processing.parameters.ParameterBoolean import ParameterBoolean
3434
from processing.parameters.ParameterNumber import ParameterNumber
@@ -39,7 +39,7 @@
3939
from processing.tools.system import *
4040

4141

42-
class ColorRelief(GeoAlgorithm):
42+
class ColorRelief(GdalAlgorithm):
4343

4444
INPUT = 'INPUT'
4545
BAND = 'BAND'

‎python/plugins/processing/algs/gdal/GdalAlgorithm.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
import os
2929
from PyQt4 import QtGui
3030
from processing.script.ScriptAlgorithm import ScriptAlgorithm
31+
from processing.core.GeoAlgorithm import GeoAlgorithm
3132

3233

33-
class GdalAlgorithm(ScriptAlgorithm):
34-
"""Just a ScriptAlgorithm that automatically takes its icon
35-
filename for the script filename.
36-
"""
34+
class GdalAlgorithm(GeoAlgorithm):
35+
36+
def getIcon(self):
37+
return QtGui.QIcon(os.path.dirname(__file__) + '/../../images/gdal.png')
3738

39+
class GdalScriptAlgorithm(ScriptAlgorithm):
40+
3841
def getIcon(self):
39-
filename = os.path.basename(self.descriptionFile[:-2] + 'png')
40-
filepath = os.path.dirname(__file__) + '/icons/' + filename
41-
return QtGui.QIcon(filepath)
42+
return QtGui.QIcon(os.path.dirname(__file__) + '/../../images/gdal.png')

‎python/plugins/processing/algs/gdal/GdalOgrAlgorithmProvider.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
from processing.core.AlgorithmProvider import AlgorithmProvider
3333
from processing.core.ProcessingLog import ProcessingLog
3434
from processing.script.WrongScriptException import WrongScriptException
35-
36-
from GdalAlgorithm import GdalAlgorithm
35+
from processing.algs.gdal.GdalAlgorithm import GdalScriptAlgorithm
3736
from GdalUtils import GdalUtils
3837

3938
from nearblack import nearblack
@@ -103,7 +102,7 @@ def getName(self):
103102
return 'gdalogr'
104103

105104
def getIcon(self):
106-
return QIcon(os.path.dirname(__file__) + '/icons/gdalicon.png')
105+
return QIcon(os.path.dirname(__file__) + '/../../images/gdal.png')
107106

108107
def _loadAlgorithms(self):
109108
self.algs = self.preloadedAlgs
@@ -131,7 +130,7 @@ def createAlgsList(self):
131130
try:
132131
fullpath = os.path.join(self.scriptsFolder(),
133132
descriptionFile)
134-
alg = GdalAlgorithm(fullpath)
133+
alg = GdalScriptAlgorithm(fullpath)
135134
self.preloadedAlgs.append(alg)
136135
except WrongScriptException, e:
137136
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR, e.msg)

‎python/plugins/processing/algs/gdal/GridAverage.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from PyQt4.QtGui import *
3030

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3232
from processing.parameters.ParameterVector import ParameterVector
3333
from processing.parameters.ParameterTableField import ParameterTableField
3434
from processing.parameters.ParameterNumber import ParameterNumber
@@ -37,7 +37,7 @@
3737
from processing.tools.system import *
3838

3939

40-
class GridAverage(GeoAlgorithm):
40+
class GridAverage(GdalAlgorithm):
4141

4242
INPUT = 'INPUT'
4343
Z_FIELD = 'Z_FIELD'
@@ -48,10 +48,6 @@ class GridAverage(GeoAlgorithm):
4848
NODATA = 'NODATA'
4949
OUTPUT = 'OUTPUT'
5050

51-
#def getIcon(self):
52-
# filepath = os.path.dirname(__file__) + '/icons/dem.png'
53-
# return QIcon(filepath)
54-
5551
def defineCharacteristics(self):
5652
self.name = 'Grid (Moving average)'
5753
self.group = '[GDAL] Analysis'

‎python/plugins/processing/algs/gdal/GridDataMetrics.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from PyQt4.QtGui import *
3030

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3232
from processing.parameters.ParameterVector import ParameterVector
3333
from processing.parameters.ParameterTableField import ParameterTableField
3434
from processing.parameters.ParameterSelection import ParameterSelection
@@ -38,7 +38,7 @@
3838
from processing.tools.system import *
3939

4040

41-
class GridDataMetrics(GeoAlgorithm):
41+
class GridDataMetrics(GdalAlgorithm):
4242

4343
INPUT = 'INPUT'
4444
Z_FIELD = 'Z_FIELD'
@@ -53,10 +53,6 @@ class GridDataMetrics(GeoAlgorithm):
5353
DATA_METRICS = ['Minimum', 'Maximum', 'Range', 'Count', 'Average distance',
5454
'Average distance between points']
5555

56-
#def getIcon(self):
57-
# filepath = os.path.dirname(__file__) + '/icons/dem.png'
58-
# return QIcon(filepath)
59-
6056
def defineCharacteristics(self):
6157
self.name = 'Grid (Data metrics)'
6258
self.group = '[GDAL] Analysis'

‎python/plugins/processing/algs/gdal/GridInvDist.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from PyQt4.QtGui import *
3030

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3232
from processing.parameters.ParameterVector import ParameterVector
3333
from processing.parameters.ParameterTableField import ParameterTableField
3434
from processing.parameters.ParameterNumber import ParameterNumber
@@ -37,7 +37,7 @@
3737
from processing.tools.system import *
3838

3939

40-
class GridInvDist(GeoAlgorithm):
40+
class GridInvDist(GdalAlgorithm):
4141

4242
INPUT = 'INPUT'
4343
Z_FIELD = 'Z_FIELD'
@@ -51,10 +51,6 @@ class GridInvDist(GeoAlgorithm):
5151
NODATA = 'NODATA'
5252
OUTPUT = 'OUTPUT'
5353

54-
#def getIcon(self):
55-
# filepath = os.path.dirname(__file__) + '/icons/dem.png'
56-
# return QIcon(filepath)
57-
5854
def defineCharacteristics(self):
5955
self.name = 'Grid (Inverse distance to a power)'
6056
self.group = '[GDAL] Analysis'

‎python/plugins/processing/algs/gdal/GridNearest.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from PyQt4.QtGui import *
3030

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3232
from processing.parameters.ParameterVector import ParameterVector
3333
from processing.parameters.ParameterTableField import ParameterTableField
3434
from processing.parameters.ParameterNumber import ParameterNumber
@@ -37,7 +37,7 @@
3737
from processing.tools.system import *
3838

3939

40-
class GridNearest(GeoAlgorithm):
40+
class GridNearest(GdalAlgorithm):
4141

4242
INPUT = 'INPUT'
4343
Z_FIELD = 'Z_FIELD'
@@ -47,10 +47,6 @@ class GridNearest(GeoAlgorithm):
4747
NODATA = 'NODATA'
4848
OUTPUT = 'OUTPUT'
4949

50-
#def getIcon(self):
51-
# filepath = os.path.dirname(__file__) + '/icons/dem.png'
52-
# return QIcon(filepath)
53-
5450
def defineCharacteristics(self):
5551
self.name = 'Grid (Nearest neighbor)'
5652
self.group = '[GDAL] Analysis'

‎python/plugins/processing/algs/gdal/OgrAlgorithm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
from PyQt4.QtGui import *
3939
from qgis.core import *
4040

41-
from processing.core.GeoAlgorithm import GeoAlgorithm
41+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
4242
from processing.tools import dataobjects
4343

4444

45-
class OgrAlgorithm(GeoAlgorithm):
45+
class OgrAlgorithm(GdalAlgorithm):
4646

4747
DB = 'DB'
4848

‎python/plugins/processing/algs/gdal/aspect.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
from PyQt4.QtGui import *
3030

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3232
from processing.parameters.ParameterRaster import ParameterRaster
3333
from processing.parameters.ParameterBoolean import ParameterBoolean
3434
from processing.parameters.ParameterNumber import ParameterNumber
@@ -37,7 +37,7 @@
3737
from processing.tools.system import *
3838

3939

40-
class aspect(GeoAlgorithm):
40+
class aspect(GdalAlgorithm):
4141

4242
INPUT = 'INPUT'
4343
BAND = 'BAND'

‎python/plugins/processing/algs/gdal/contour.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from PyQt4 import QtGui
3030
from qgis.core import *
3131

32-
from processing.core.GeoAlgorithm import GeoAlgorithm
32+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3333

3434
from processing.parameters.ParameterRaster import ParameterRaster
3535
from processing.parameters.ParameterNumber import ParameterNumber
@@ -40,18 +40,14 @@
4040
from processing.algs.gdal.GdalUtils import GdalUtils
4141

4242

43-
class contour(GeoAlgorithm):
43+
class contour(GdalAlgorithm):
4444

4545
INPUT_RASTER = 'INPUT_RASTER'
4646
OUTPUT_VECTOR = 'OUTPUT_VECTOR'
4747
INTERVAL = 'INTERVAL'
4848
FIELD_NAME = 'FIELD_NAME'
4949
EXTRA = 'EXTRA'
5050

51-
def getIcon(self):
52-
filepath = os.path.dirname(__file__) + '/icons/contour.png'
53-
return QtGui.QIcon(filepath)
54-
5551
def defineCharacteristics(self):
5652
self.name = 'Contour'
5753
self.group = '[GDAL] Extraction'

‎python/plugins/processing/algs/gdal/extractprojection.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,16 @@
3030
from osgeo import gdal, osr
3131
from PyQt4.QtGui import *
3232

33-
from processing.core.GeoAlgorithm import GeoAlgorithm
33+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3434
from processing.parameters.ParameterRaster import ParameterRaster
3535
from processing.parameters.ParameterBoolean import ParameterBoolean
3636

3737

38-
class ExtractProjection(GeoAlgorithm):
38+
class ExtractProjection(GdalAlgorithm):
3939

4040
INPUT = 'INPUT'
4141
PRJ_FILE = 'PRJ_FILE'
4242

43-
def getIcon(self):
44-
return QIcon(os.path.dirname(__file__) + '/icons/projection-export.png'
45-
)
46-
4743
def defineCharacteristics(self):
4844
self.name = 'Extract projection'
4945
self.group = '[GDAL] Projections'

‎python/plugins/processing/algs/gdal/fillnodata.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525

2626
__revision__ = '$Format:%H$'
2727

28-
import os
29-
from PyQt4 import QtGui, QtCore
3028

31-
from processing.core.GeoAlgorithm import GeoAlgorithm
29+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3230

3331
from processing.parameters.ParameterRaster import ParameterRaster
3432
from processing.parameters.ParameterNumber import ParameterNumber
@@ -40,7 +38,7 @@
4038
from processing.algs.gdal.GdalUtils import GdalUtils
4139

4240

43-
class fillnodata(GeoAlgorithm):
41+
class fillnodata(GdalAlgorithm):
4442

4543
INPUT = 'INPUT'
4644
DISTANCE = 'DISTANCE'
@@ -50,10 +48,6 @@ class fillnodata(GeoAlgorithm):
5048
NO_DEFAULT_MASK = 'NO_DEFAULT_MASK'
5149
OUTPUT = 'OUTPUT'
5250

53-
#def getIcon(self):
54-
# filepath = os.path.dirname(__file__) + '/icons/fillnodata.png'
55-
# return QtGui.QIcon(filepath)
56-
5751
def defineCharacteristics(self):
5852
self.name = 'Fill nodata'
5953
self.group = '[GDAL] Analysis'

‎python/plugins/processing/algs/gdal/gdal2xyz.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,10 @@
2525

2626
__revision__ = '$Format:%H$'
2727

28-
import os
2928
from PyQt4.QtGui import *
3029
from PyQt4.QtCore import *
3130

32-
from processing.core.GeoAlgorithm import GeoAlgorithm
31+
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3332

3433
from processing.parameters.ParameterRaster import ParameterRaster
3534
from processing.parameters.ParameterNumber import ParameterNumber
@@ -40,15 +39,12 @@
4039
from processing.algs.gdal.GdalUtils import GdalUtils
4140

4241

43-
class gdal2xyz(GeoAlgorithm):
42+
class gdal2xyz(GdalAlgorithm):
4443

4544
INPUT = 'INPUT'
4645
BAND = 'BAND'
4746
OUTPUT = 'OUTPUT'
4847

49-
#def getIcon(self):
50-
# return QIcon(os.path.dirname(__file__) + "/icons/gdal2xyz.png")
51-
5248
def defineCharacteristics(self):
5349
self.name = 'gdal2xyz'
5450
self.group = '[GDAL] Conversion'

0 commit comments

Comments
 (0)