Skip to content

Commit 28ca48c

Browse files
jef-njef-n
committedJan 4, 2013
more API updates to the python plugins
1 parent a572f3c commit 28ca48c

File tree

17 files changed

+33
-33
lines changed

17 files changed

+33
-33
lines changed
 

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,17 @@ def __init__(self, title, parent=None):
4444
self.connect(buttonBox, SIGNAL("accepted()"), self.accept)
4545
self.connect(buttonBox, SIGNAL("rejected()"), self.reject)
4646

47-
def epsg(self):
48-
return "EPSG:" + str(self.selector.selectedEpsg())
47+
def authid(self):
48+
return str(self.selector.selectedAuthId()
4949

5050
def proj4string(self):
5151
return self.selector.selectedProj4String()
5252

5353
def getProjection(self):
54-
if self.selector.selectedEpsg() != 0:
55-
return self.epsg()
54+
if self.authid().startsWith("EPSG:", Qt.CaseInsensitive):
55+
return self.authid()
5656

5757
if not self.selector.selectedProj4String().isEmpty():
5858
return self.proj4string()
5959

6060
return QString()
61-

‎python/plugins/db_manager/layer_preview.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ def _loadTablePreview(self, table, limit=False):
105105
if not vl.isValid():
106106
self.setLayerSet( [] )
107107
else:
108-
newLayerId = vl.id() if hasattr(vl, 'id') else vl.getLayerID()
108+
newLayerId = vl.id() if hasattr(vl, 'id') else vl.id()
109109
self.setLayerSet( [ QgsMapCanvasLayer(vl) ] )
110110
QgsMapLayerRegistry.instance().addMapLayers([vl], False)
111111
self.zoomToFullExtent()
112112

113113
# remove old layer (if any) and set new
114114
if self.currentLayerId:
115-
QgsMapLayerRegistry.instance().removeMapLayer(self.currentLayerId, False)
115+
QgsMapLayerRegistry.instance().removeMapLayers([self.currentLayerId], False)
116116
self.currentLayerId = newLayerId
117117

118118
self.setRenderFlag(True)

‎python/plugins/fTools/tools/doGeometry.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -992,7 +992,7 @@ def simpleMeasure( self, inGeom, calcType, ellips, crs ):
992992
if calcType == 2:
993993
measure.setSourceCrs( crs )
994994
measure.setEllipsoid( ellips )
995-
measure.setProjectionsEnabled( True )
995+
measure.setEllipsoidalMode( True )
996996

997997
attr1 = measure.measure( inGeom )
998998
if inGeom.type() == QGis.Polygon:
@@ -1174,6 +1174,7 @@ def findOrCreateFields( self, vlayer ):
11741174
else:
11751175
index2 = len( fieldKeys ) + 1
11761176
newFields.append( field )
1177+
# FIXME: addAttributes was deprecated and removed
11771178
vprovider.addAttributes( newFields )
11781179
vlayer.updateFieldMap()
11791180
return ( index1, index2 )

‎python/plugins/fTools/tools/doRandPoints.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def accept(self):
128128
self.tr("Created output point shapefile:\n%1\n\nWould you like to add the new layer to the TOC?").arg(outPath), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
129129
if addToTOC == QMessageBox.Yes:
130130
self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
131-
QgsMapLayerRegistry.instance().addMapLayer([self.vlayer])
131+
QgsMapLayerRegistry.instance().addMapLayers([self.vlayer])
132132
self.populateLayers()
133133
self.progressBar.setValue(0)
134134
self.buttonOk.setEnabled( True )

‎python/plugins/fTools/tools/doRegPoints.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def accept(self):
9292
addToTOC = QMessageBox.question(self, self.tr("Generate Regular Points"), self.tr("Created output point shapefile:\n%1\n\nWould you like to add the new layer to the TOC?").arg( outPath ), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
9393
if addToTOC == QMessageBox.Yes:
9494
self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
95-
QgsMapLayerRegistry.instance().addMapLayer([self.vlayer])
95+
QgsMapLayerRegistry.instance().addMapLayers([self.vlayer])
9696
self.populateLayers()
9797
self.progressBar.setValue(0)
9898
self.buttonOk.setEnabled( True )

‎python/plugins/fTools/tools/doSpatialJoin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def accept(self):
109109
.arg(unicode(outPath)), QMessageBox.Yes, QMessageBox.No, QMessageBox.NoButton)
110110
if addToTOC == QMessageBox.Yes:
111111
self.vlayer = QgsVectorLayer(outPath, unicode(outName), "ogr")
112-
QgsMapLayerRegistry.instance().addMapLayer([self.vlayer])
112+
QgsMapLayerRegistry.instance().addMapLayers([self.vlayer])
113113
self.progressBar.setValue(0)
114114
self.buttonOk.setEnabled( True )
115115

‎python/plugins/fTools/tools/ftools_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def writeVectorLayerToShape( vlayer, outputPath, encoding ):
104104
if not mCodec:
105105
return False
106106
#Here we should check that the output path is valid
107-
QgsVectorFileWriter.writeAsShapefile( vlayer, outputPath, encoding, vlayer.dataProvider().crs(), False )
107+
QgsVectorFileWriter.writeAsVectorFormat( vlayer, outputPath, encoding, vlayer.dataProvider().crs(), "ESRI Shapefile", False )
108108
return True
109109

110110
# For use with memory provider/layer, converts QGis vector type definition to simple string

‎python/plugins/osm/OsmLoadDlg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def onOK(self):
156156

157157
if replacing:
158158
# remove layers of current data first
159-
QgsMapLayerRegistry.instance().removeMapLayer(self.canvas.currentLayer().id(),True)
159+
QgsMapLayerRegistry.instance().removeMapLayers([self.canvas.currentLayer().id()],True)
160160

161161
if self.chkCustomRenderer.isChecked():
162162
styleFile=self.styleFiles[self.styleCombo.currentIndex()]

‎python/plugins/sextante/algs/ftools/ExportGeometryInfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def simpleMeasure(self, geom, method, ellips, crs):
151151
if method == 2:
152152
measure.setSourceCrs(crs)
153153
measure.setEllipsoid(ellips)
154-
measure.setProjectionsEnabled(True)
154+
measure.setEllipsoidalMode(True)
155155

156156
attr1 = measure.measure(geom)
157157
if geom.type() == QGis.Polygon:

‎python/plugins/sextante/algs/ftools/ftools_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ def writeVectorLayerToShape( vlayer, outputPath, encoding ):
9696
if not mCodec:
9797
return False
9898
#Here we should check that the output path is valid
99-
QgsVectorFileWriter.writeAsShapefile( vlayer, outputPath, encoding, vlayer.dataProvider().crs(), False )
99+
QgsVectorFileWriter.writeAsVectorFormat( vlayer, outputPath, encoding, vlayer.dataProvider().crs(), "ESRI Shapefile", False )
100100
return True
101101

102102
# For use with memory provider/layer, converts QGis vector type definition to simple string

‎python/plugins/sextante/algs/mmqgisx/mmqgisx_library.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ def mmqgisx_hub_distance(progress, sourcelayer, hubslayer, nameattributename, un
13871387
source = feature.geometry().boundingBox().center()
13881388
distance = QgsDistanceArea()
13891389
distance.setSourceCrs(sourcelayer.dataProvider().crs().srsid())
1390-
distance.setProjectionsEnabled(1)
1390+
distance.setEllipsoidalMode(True)
13911391

13921392
closest = hubs[0]
13931393
hubdist = distance.measureLine(source, closest.point)

‎python/plugins/sextante/core/SextanteVectorWriter.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ def __init__(self, fileName, encoding, fields, geometryType, crs, options=None):
5757
uri += "?crs=" + crs.authid()
5858
self.memLayer = QgsVectorLayer(uri, self.fileName, "memory")
5959
self.writer = self.memLayer.dataProvider()
60+
# FIXME: addAttributes was deprecated and removed
6061
self.writer.addAttributes(fields.values())
6162
self.memLayer.updateFieldMap()
6263
else:

‎python/plugins/sextante/gdal/warp.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ def defineCharacteristics(self):
5050
self.name = "Warp (reproject)"
5151
self.group = "[GDAL] Projections"
5252
self.addParameter(ParameterRaster(warp.INPUT, "Input layer", False))
53-
self.addParameter(ParameterCrs(warp.SOURCE_SRS, "Source SRS (EPSG Code)", "4326"))
54-
self.addParameter(ParameterCrs(warp.DEST_SRS, "Destination SRS (EPSG Code)", "4326"))
53+
self.addParameter(ParameterCrs(warp.SOURCE_SRS, "Source SRS (EPSG Code)", "EPSG:4326"))
54+
self.addParameter(ParameterCrs(warp.DEST_SRS, "Destination SRS (EPSG Code)", "EPSG:4326"))
5555
self.addParameter(ParameterSelection(warp.METHOD, "Resampling method", warp.METHOD_OPTIONS))
5656
self.addOutput(OutputRaster(warp.OUTPUT, "Output layer"))
5757

@@ -60,9 +60,9 @@ def processAlgorithm(self, progress):
6060
self.crs = QgsCoordinateReferenceSystem(int(srs))
6161
commands = ["gdalwarp"]
6262
commands.append("-s_srs")
63-
commands.append("EPSG:" + str(self.getParameterValue(warp.SOURCE_SRS)))
63+
commands.append(str(self.getParameterValue(warp.SOURCE_SRS)))
6464
commands.append("-t_srs")
65-
commands.append("EPSG:" + str(srs))
65+
commands.append(str(srs))
6666
commands.append("-r")
6767
commands.append(warp.METHOD_OPTIONS[self.getParameterValue(warp.METHOD)])
6868
commands.append("-of")

‎python/plugins/sextante/gui/CrsSelectionDialog.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class CrsSelectionDialog(QDialog):
3232

3333
def __init__(self):
3434
QDialog.__init__(self)
35-
self.epsg = None
35+
self.authid = None
3636
layout = QVBoxLayout()
3737
self.selector = QgsProjectionSelector(self)
3838
buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Close)
@@ -44,9 +44,9 @@ def __init__(self):
4444
self.connect(buttonBox, SIGNAL("rejected()"), self.cancelPressed)
4545

4646
def okPressed(self):
47-
self.epsg = self.selector.selectedEpsg()
47+
self.authid = self.selector.selectedAuthId()
4848
self.close()
4949

5050
def cancelPressed(self):
51-
self.epsg = None
52-
self.close()
51+
self.authid = None
52+
self.close()

‎python/plugins/sextante/gui/CrsSelectionPanel.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class CrsSelectionPanel(QtGui.QWidget):
3030

3131
def __init__(self, default):
3232
super(CrsSelectionPanel, self).__init__(None)
33-
self.epsg = default
33+
self.authid = default
3434
self.horizontalLayout = QtGui.QHBoxLayout(self)
3535
self.horizontalLayout.setSpacing(2)
3636
self.horizontalLayout.setMargin(0)
@@ -48,12 +48,12 @@ def __init__(self, default):
4848
def showSelectionDialog(self):
4949
dialog = CrsSelectionDialog()
5050
dialog.exec_()
51-
if dialog.epsg:
52-
self.epsg = str(dialog.epsg)
51+
if dialog.authid:
52+
self.authid = str(dialog.authid)
5353
self.setText()
5454

5555
def setText(self):
56-
self.text.setText("EPSG:" + str(self.epsg))
56+
self.text.setText(str(self.authid))
5757

5858
def getValue(self):
59-
return self.epsg
59+
return self.authid

‎python/plugins/sextante/parameters/ParameterCrs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
class ParameterCrs(Parameter):
2929

30-
def __init__(self, name="", description="", default = "4326"):
31-
'''The value is the EPSG code of the CRS'''
30+
def __init__(self, name="", description="", default = "EPSG:4326"):
31+
'''The value is the auth id of the CRS'''
3232
Parameter.__init__(self, name, description)
3333
self.value = None
3434
self.default = default

‎python/plugins/sextante/tests/qgis_interface.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ def __init__(self, canvas):
4141
self.canvas = canvas
4242
self.testRaster = QgsRasterLayer('data/raster', "raster")
4343
self.testVector = QgsVectorLayer('data/vector', "vector", 'ogr')
44-
QgsMapLayerRegistry.instance().addMapLayer(self.testRaster)
45-
QgsMapLayerRegistry.instance().addMapLayer(self.testVector)
44+
QgsMapLayerRegistry.instance().addMapLayers([self.testRaster,self.testVector])
4645

4746
self.statusBar = type('FakeStatusBar', (),
4847
{'showMessage' : lambda _, m: None

0 commit comments

Comments
 (0)