sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-15 00:02:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

missing changes of QgsMapLayer::Type => QgsMapLayerType

Browse Source
This commit is contained in:
Denis Rouzaud 2019-03-26 14:08:37 -05:00
parent 60682885c0
commit 8d51a693a1
14 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/plugins/db_manager/db_manager.py
View File

@ -172,7 +172,7 @@ class DBManager(QMainWindow):
return
inLayer = table.toMapLayer()
if inLayer.type() != QgsMapLayer.VectorLayer:
if inLayer.type() != QgsMapLayerType.VectorLayer:
self.infoBar.pushMessage(
self.tr("Select a vector or a tabular layer you want export."),
Qgis.Warning, self.iface.messageTimeout())

2
python/plugins/db_manager/db_manager_plugin.py
View File

@ -56,7 +56,7 @@ class DBManagerPlugin(object):
self.iface.mainWindow())
self.layerAction.setObjectName("dbManagerUpdateSqlLayer")
self.layerAction.triggered.connect(self.onUpdateSqlLayer)
self.iface.addCustomActionForLayerType(self.layerAction, "", QgsMapLayer.VectorLayer, False)
self.iface.addCustomActionForLayerType(self.layerAction, "", QgsMapLayerType.VectorLayer, False)
for l in list(QgsProject.instance().mapLayers().values()):
self.onLayerWasAdded(l)
QgsProject.instance().layerWasAdded.connect(self.onLayerWasAdded)

2
python/plugins/db_manager/db_plugins/plugin.py
View File

@ -290,7 +290,7 @@ class Database(DbItemObject):
if avoidSelectById:
uri.disableSelectAtId(True)
provider = self.dbplugin().providerName()
if layerType == QgsMapLayer.RasterLayer:
if layerType == QgsMapLayerType.RasterLayer:
return QgsRasterLayer(uri.uri(False), layerName, provider)
return QgsVectorLayer(uri.uri(False), layerName, provider)

2
python/plugins/db_manager/db_plugins/vlayers/connector.py
View File

@ -194,7 +194,7 @@ class VLayerConnector(DBConnector):
VLayerRegistry.instance().reset()
lst = []
for _, l in QgsProject.instance().mapLayers().items():
if l.type() == QgsMapLayer.VectorLayer:
if l.type() == QgsMapLayerType.VectorLayer:
lname = l.name()
# if there is already a layer with this name, use the layer id

4
python/plugins/db_manager/dlg_import_vector.py
View File

@ -132,7 +132,7 @@ class DlgImportVector(QDialog, Ui_Dialog):
for nodeLayer in QgsProject.instance().layerTreeRoot().findLayers():
layer = nodeLayer.layer()
# TODO: add import raster support!
if layer.type() == QgsMapLayer.VectorLayer:
if layer.type() == QgsMapLayerType.VectorLayer:
self.cboInputLayer.addItem(layer.name(), layer.id())
def deleteInputLayer(self):
@ -177,7 +177,7 @@ class DlgImportVector(QDialog, Ui_Dialog):
layerName = QFileInfo(filename).completeBaseName()
layer = QgsVectorLayer(filename, layerName, "ogr")
if not layer.isValid() or layer.type() != QgsMapLayer.VectorLayer:
if not layer.isValid() or layer.type() != QgsMapLayerType.VectorLayer:
layer.deleteLater()
return False

2
python/plugins/db_manager/dlg_sql_layer_window.py
View File

@ -303,7 +303,7 @@ class DlgSqlLayerWindow(QWidget, Ui_Dialog):
from qgis.core import QgsMapLayer
layerType = QgsMapLayer.VectorLayer if self.vectorRadio.isChecked() else QgsMapLayer.RasterLayer
layerType = QgsMapLayerType.VectorLayer if self.vectorRadio.isChecked() else QgsMapLayerType.RasterLayer
# get a new layer name
names = []

2
python/plugins/db_manager/dlg_sql_window.py
View File

@ -403,7 +403,7 @@ class DlgSqlWindow(QWidget, Ui_Dialog):
from qgis.core import QgsMapLayer
layerType = QgsMapLayer.VectorLayer if self.vectorRadio.isChecked() else QgsMapLayer.RasterLayer
layerType = QgsMapLayerType.VectorLayer if self.vectorRadio.isChecked() else QgsMapLayerType.RasterLayer
# get a new layer name
names = []

2
python/plugins/processing/ProcessingPlugin.py
View File

@ -289,7 +289,7 @@ class ProcessingPlugin:
old_enabled_state = self.editInPlaceAction.isEnabled()
new_enabled_state = layer is not None and layer.type() == QgsMapLayer.VectorLayer
new_enabled_state = layer is not None and layer.type() == QgsMapLayerType.VectorLayer
self.editInPlaceAction.setEnabled(new_enabled_state)
if new_enabled_state != old_enabled_state:

4
python/plugins/processing/algs/grass7/Grass7Algorithm.py
View File

@ -479,10 +479,10 @@ class Grass7Algorithm(QgsProcessingAlgorithm):
for idx, layer in enumerate(layers):
layerName = '{}_{}'.format(paramName, idx)
# Add a raster layer
if layer.type() == QgsMapLayer.RasterLayer:
if layer.type() == QgsMapLayerType.RasterLayer:
self.loadRasterLayer(layerName, layer)
# Add a vector layer
elif layer.type() == QgsMapLayer.VectorLayer:
elif layer.type() == QgsMapLayerType.VectorLayer:
self.loadVectorLayer(layerName, layer, external=None, feedback=feedback)
self.postInputs()

2
python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py
View File

@ -88,7 +88,7 @@ class FieldsCalculatorDialog(BASE, WIDGET):
self.cmbInputLayer.setFilters(QgsMapLayerProxyModel.VectorLayer)
try:
if iface.activeLayer().type() == QgsMapLayer.VectorLayer:
if iface.activeLayer().type() == QgsMapLayerType.VectorLayer:
self.cmbInputLayer.setLayer(iface.activeLayer())
except:
pass

2
python/plugins/processing/gui/AlgorithmLocatorFilter.py
View File

@ -141,7 +141,7 @@ class InPlaceAlgorithmLocatorFilter(QgsLocatorFilter):
# collect results in main thread, since this method is inexpensive and
# accessing the processing registry/current layer is not thread safe
if iface.activeLayer() is None or iface.activeLayer().type() != QgsMapLayer.VectorLayer:
if iface.activeLayer() is None or iface.activeLayer().type() != QgsMapLayerType.VectorLayer:
return
for a in QgsApplication.processingRegistry().algorithms():

2
python/plugins/processing/gui/Postprocessing.py
View File

@ -110,7 +110,7 @@ def handleAlgorithmResults(alg, context, feedback=None, showResults=True, parame
if outputName:
style = RenderingStyles.getStyle(alg.id(), outputName)
if style is None:
if layer.type() == QgsMapLayer.RasterLayer:
if layer.type() == QgsMapLayerType.RasterLayer:
style = ProcessingConfig.getSetting(ProcessingConfig.RASTER_STYLE)
else:
if layer.geometryType() == QgsWkbTypes.PointGeometry:

2
python/plugins/processing/gui/ProcessingToolbox.py
View File

@ -138,7 +138,7 @@ class ProcessingToolbox(QgsDockWidget, WIDGET):
self.in_place_mode = enabled
def layer_changed(self, layer):
if layer is None or layer.type() != QgsMapLayer.VectorLayer:
if layer is None or layer.type() != QgsMapLayerType.VectorLayer:
return
self.algorithmTree.setInPlaceLayer(layer)

6
python/plugins/processing/gui/wrappers.py
View File

@ -1133,7 +1133,7 @@ class FeatureSourceWidgetWrapper(WidgetWrapper):
filters = QgsMapLayerProxyModel.VectorLayer
try:
if iface.activeLayer().type() == QgsMapLayer.VectorLayer:
if iface.activeLayer().type() == QgsMapLayerType.VectorLayer:
self.combo.setLayer(iface.activeLayer())
self.use_selection_checkbox.setEnabled(iface.activeLayer().selectedFeatureCount() > 0)
@ -1184,7 +1184,7 @@ class FeatureSourceWidgetWrapper(WidgetWrapper):
return widget
def layerChanged(self, layer):
if layer is None or layer.type() != QgsMapLayer.VectorLayer or layer.selectedFeatureCount() == 0:
if layer is None or layer.type() != QgsMapLayerType.VectorLayer or layer.selectedFeatureCount() == 0:
self.use_selection_checkbox.setChecked(False)
self.use_selection_checkbox.setEnabled(False)
else:
@ -1470,7 +1470,7 @@ class VectorLayerWidgetWrapper(WidgetWrapper):
self.combo.setExcludedProviders(['grass'])
try:
if iface.activeLayer().type() == QgsMapLayer.VectorLayer:
if iface.activeLayer().type() == QgsMapLayerType.VectorLayer:
self.combo.setLayer(iface.activeLayer())
except:
pass