Skip to content

Commit e9e1530

Browse files
jef-njef-n
committedJul 19, 2013
GdalTools: use int to compare versions (fixes #8323)
·
ltr-3_40archive/master_2
1 parent 51074d7 commit e9e1530

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed
 

‎python/plugins/GdalTools/tools/doBuildVRT.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ def __init__(self, iface):
5252
(self.inSelector, SIGNAL("filenameChanged()")),
5353
(self.outSelector, SIGNAL("filenameChanged()")),
5454
(self.resolutionComboBox, SIGNAL("currentIndexChanged(int)"), self.resolutionCheck),
55-
(self.srcNoDataSpin, SIGNAL("valueChanged(int)"), self.srcNoDataCheck, "1.7.0"),
55+
(self.srcNoDataSpin, SIGNAL("valueChanged(int)"), self.srcNoDataCheck, 1700),
5656
(self.inputDirCheck, SIGNAL("stateChanged(int)")),
57-
(self.separateCheck, SIGNAL("stateChanged(int)"), None, "1.7.0"),
58-
(self.allowProjDiffCheck, SIGNAL("stateChanged(int)"), None, "1.7.0"),
57+
(self.separateCheck, SIGNAL("stateChanged(int)"), None, 1700),
58+
(self.allowProjDiffCheck, SIGNAL("stateChanged(int)"), None, 1700),
5959
(self.recurseCheck, SIGNAL("stateChanged(int)"), self.inputDirCheck),
6060
(self.inputSelLayersCheck, SIGNAL("stateChanged(int)"))
6161
]

‎python/plugins/GdalTools/tools/doClipper.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def __init__(self, iface):
5050
[
5151
(self.inSelector, SIGNAL("filenameChanged()") ),
5252
(self.outSelector, SIGNAL("filenameChanged()") ),
53-
(self.noDataSpin, SIGNAL("valueChanged(int)"), self.noDataCheck, "1.7.0"),
54-
(self.maskSelector, SIGNAL("filenameChanged()"), self.maskModeRadio, "1.6.0"),
53+
(self.noDataSpin, SIGNAL("valueChanged(int)"), self.noDataCheck, 1700),
54+
(self.maskSelector, SIGNAL("filenameChanged()"), self.maskModeRadio, 1600),
5555
(self.alphaBandCheck, SIGNAL( "stateChanged( int )") ),
5656
(self.extentSelector, [SIGNAL("selectionStarted()"), SIGNAL("newExtentDefined()")], self.extentModeRadio),
5757
(self.modeStackedWidget, SIGNAL("currentIndexChanged(int)"))
@@ -168,7 +168,7 @@ def getArgsModeMask(self):
168168
arguments.append("-q")
169169
arguments.append("-cutline")
170170
arguments.append(mask)
171-
if Utils.GdalConfig.version() >= "1.8.0":
171+
if Utils.GdalConfig.versionNum() >= 1800:
172172
arguments.append("-crop_to_cutline")
173173
if self.alphaBandCheck.isChecked():
174174
arguments.append("-dstalpha")

‎python/plugins/GdalTools/tools/doContour.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def __init__(self, iface):
4141
self.setupUi(self)
4242
BasePluginWidget.__init__(self, self.iface, "gdal_contour")
4343

44-
gdalVersion = Utils.GdalConfig.version()
45-
self.useDirAsOutput = gdalVersion < "1.7.0"
44+
gdalVersion = Utils.GdalConfig.versionNum()
45+
self.useDirAsOutput = gdalVersion < 1700
4646
if self.useDirAsOutput:
4747
self.label_2.setText( QApplication.translate("GdalToolsWidget", "&Output directory for contour lines (shapefile)") )
4848

‎python/plugins/GdalTools/tools/doRasterize.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ def fillOutputFileEdit(self):
9393
lastUsedFilter = Utils.FileFilter.lastUsedRasterFilter()
9494

9595
# rasterize supports output file creation for GDAL 1.8
96-
gdalVersion = Utils.GdalConfig.version()
97-
if gdalVersion >= "1.8.0":
96+
gdalVersion = Utils.GdalConfig.versionNum()
97+
if gdalVersion >= 1800:
9898
fileDialogFunc = Utils.FileDialog.getSaveFileName
9999
else:
100100
fileDialogFunc = Utils.FileDialog.getOpenFileName
@@ -107,7 +107,7 @@ def fillOutputFileEdit(self):
107107
self.outSelector.setFilename(outputFile)
108108

109109
# required either -ts or -tr to create the output file
110-
if gdalVersion >= "1.8.0":
110+
if gdalVersion >= 1800:
111111
if not QFileInfo(outputFile).exists():
112112
QMessageBox.information( self, self.tr( "Output size or resolution required" ), self.tr( "The output file doesn't exist. You must set up the output size or resolution to create it." ) )
113113
self.radioSetSize.setChecked(True)

‎python/plugins/GdalTools/tools/doTileIndex.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ def __init__( self, iface ):
5252
#( self.recurseCheck, SIGNAL( "stateChanged( int )" ),
5353
( self.outSelector, SIGNAL( "filenameChanged()" ) ),
5454
( self.indexFieldEdit, SIGNAL( "textChanged( const QString & )" ), self.indexFieldCheck),
55-
( self.absolutePathCheck, SIGNAL( "stateChanged( int )" ), None, "1.5.0" ),
56-
( self.skipDifferentProjCheck, SIGNAL( "stateChanged( int )" ), None, "1.5.0" )
55+
( self.absolutePathCheck, SIGNAL( "stateChanged( int )" ), None, 1500 ),
56+
( self.skipDifferentProjCheck, SIGNAL( "stateChanged( int )" ), None, 1500 )
5757
]
5858
)
5959

‎python/plugins/GdalTools/tools/doTranslate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def __init__(self, iface):
5656
self.formatLabel.hide()
5757
self.formatCombo.hide()
5858

59-
if Utils.Version( Utils.GdalConfig.version() ) < "1.7":
59+
if Utils.GdalConfig.versionNum() < 1700:
6060
index = self.expandCombo.findText('gray', Qt.MatchFixedString)
6161
if index >= 0:
6262
self.expandCombo.removeItem(index)

‎python/plugins/GdalTools/tools/doWarp.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def __init__(self, iface):
6767
( [self.widthSpin, self.heightSpin], SIGNAL( "valueChanged(int)" ), self.resizeGroupBox ),
6868
(self.multithreadCheck, SIGNAL("stateChanged(int)")),
6969
(self.noDataEdit, SIGNAL( "textChanged( const QString & )" ), self.noDataCheck),
70-
(self.maskSelector, SIGNAL("filenameChanged()"), self.maskCheck, "1.6.0"),
70+
(self.maskSelector, SIGNAL("filenameChanged()"), self.maskCheck, 1600),
7171
]
7272
)
7373

0 commit comments

Comments
 (0)
Please sign in to comment.