From 17979e4c67be148faf11a4396232f25edb3a3c98 Mon Sep 17 00:00:00 2001 From: marceloandrioni Date: Wed, 23 Oct 2019 22:26:04 -0300 Subject: [PATCH] replacing QgsMessageLog.LEVEL by Qgis.Level --- Visor_UI.py | 4 ++-- libvisor/ThreddsMapperGeneric.py | 2 +- libvisor/VisorController.py | 20 ++++++++++---------- libvisor/animation/AnimationController2.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Visor_UI.py b/Visor_UI.py index c126e60..5de23d3 100644 --- a/Visor_UI.py +++ b/Visor_UI.py @@ -620,9 +620,9 @@ def showNewImage(self, image): self.postInformationMessageToUser("Layer '"+image[1]+"' ["+image[2]+"]retrieved") layer = image[0] if layer and layer.isValid(): - QgsMapLayerRegistry.instance().addMapLayer(layer) + QgsProject.instance().addMapLayer(layer) iface.zoomToActiveLayer() - iface.legendInterface().refreshLayerSymbology(layer) + iface.layerTreeView().refreshLayerSymbology(layer.id()) else: self.postInformationMessageToUser("There was a problem loading the layer.") diff --git a/libvisor/ThreddsMapperGeneric.py b/libvisor/ThreddsMapperGeneric.py index 172503a..94626c8 100644 --- a/libvisor/ThreddsMapperGeneric.py +++ b/libvisor/ThreddsMapperGeneric.py @@ -249,7 +249,7 @@ def fetchAvailableDatasets(self, depth = -1): page = urllib.request.urlopen(self.threddsMainCatalog+r'/'+self.threddsCatalogFileName, timeout=self.NetworkRequestTimeout) except (HTTPException, URLError, ValueError) as e: - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) raise e string = page.read() diff --git a/libvisor/VisorController.py b/libvisor/VisorController.py index 92c5c95..a59600a 100644 --- a/libvisor/VisorController.py +++ b/libvisor/VisorController.py @@ -93,7 +93,7 @@ def _loadServerDatasets(self, threddsServerInfoObj, depth=0): self.serverDataService.hide() except (HTTPException, URLError, ValueError, timeout): self.errorMessage.emit("Error fetching datasets: Server unreachable") - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) def asyncQueryDataset(self, depth=0): """Will request an asynchronous update of the underlying @@ -107,14 +107,14 @@ def asyncQueryDataset(self, depth=0): threading.Thread(target = self._fetchDatasetList, args=(depth,)).start() except (HTTPException, URLError, ValueError, timeout): self.errorMessage.emit("Error fetching datasets: Server unreachable or corrupt data found.") - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) def _fetchDatasetList(self, depth): try: self.InfoService.fetchAvailableDatasets(depth) except (HTTPException, URLError, ValueError, timeout) as e: self.errorMessage.emit("Error fetching datasets: URL not found") - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) @pyqtSlot(list, str) def _onNewDataSetListRetrieved(self, dataSetList, serverName): @@ -157,7 +157,7 @@ def mapDataSet(self, dataSetObject, depth=-1): self.threddsDataSetUpdated.emit(dataSetObject) except (HTTPException, URLError, ValueError, timeout): self.errorMessage.emit("Error fetching datasets: Server unreachable") - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) def getMapObject(self, mapName, parentSetName, projectDataSet): """Will take the requested map name (mapName), the map parent sub set @@ -212,7 +212,7 @@ def getMapObject(self, mapName, parentSetName, projectDataSet): #print("emitting from controller... "+str(mapInfoList.values()[0])) self.mapInfoRetrieved.emit(list(mapInfoList.values())[0]) except IndexError: - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) return None @@ -244,7 +244,7 @@ def getWMSMapInfo(self, mapObject): def notAuthorized(self): notAuth = NotAuthorized.NotAuthorized() if notAuth.exec_() == QtWidgets.QDialog.Accepted: - QgsMessageLog.logMessage(traceback.format_exc(), "Protected dataset, not authorized", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "Protected dataset, not authorized", Qgis.Critical ) self.standardMessage.emit("Protected dataset, not authorized") @@ -263,8 +263,8 @@ def _retrieveWMSMapImage(self, threddsMapObject, layerName, styleName, timeReque lectorWMS = WMS.WMSparser(threddsMapObject.getWMS()) lectorWMS.createMapLayer(layerName,styleName,boundingBox, timeRequested) resultImage = (lectorWMS.getLastCreatedMapLayer(),layerName,"WMS") - QgsMessageLog.logMessage("WMS Layer Name: " + layerName, "THREDDS Explorer", QgsMessageLog.INFO ) - QgsMessageLog.logMessage("WMS timeRequested: " + timeRequested, "THREDDS Explorer", QgsMessageLog.INFO ) + QgsMessageLog.logMessage("WMS Layer Name: " + layerName, "THREDDS Explorer", Qgis.Info ) + QgsMessageLog.logMessage("WMS timeRequested: " + timeRequested, "THREDDS Explorer", Qgis.Info ) self.mapImageRetrieved.emit(resultImage) def asyncFetchWMSImageFile(self, threddsMapObject, layerName, styleName, timeRangeRequested, boundingBox): @@ -365,7 +365,7 @@ def _retrieveWCSMapImage(self, threddsMapObject, coverageName, timeRequested, bb msg = "WCS capabilities URL: {img}\n".format(img=imageurl) msg += "WCS timeRequested: {tr}\n".format(tr=timeRequested) msg += "WCS coverage: {cn}".format(cn=coverageName) - QgsMessageLog.logMessage(msg, "THREDDS Explorer", QgsMessageLog.INFO) + QgsMessageLog.logMessage(msg, "THREDDS Explorer", Qgis.Info) resultImage = (lectorWCS.generateLayer(coverageName, timeRequested, boundingBox=bbox), coverageName, "WCS") self.mapImageRetrieved.emit(resultImage) @@ -401,7 +401,7 @@ def BatchWorkerThreadDone(self, layerDictionary, workerObject): try: self.batchDownloadFinished.emit(list(layerDictionary.values()), workerObject.getJobName()) except KeyError: - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) # Might happen if a thread is cancelled in the last frame download, # as it'll already have been queued for removal from the threadsInUse dict pass diff --git a/libvisor/animation/AnimationController2.py b/libvisor/animation/AnimationController2.py index 8e9de7e..138d344 100644 --- a/libvisor/animation/AnimationController2.py +++ b/libvisor/animation/AnimationController2.py @@ -160,7 +160,7 @@ def onNextFrameRequested(self): self.pause() self.errorSignal.emit("A layer for this animation was not found.\nWas it removed?"\ " Please, click\nagain on prepare animation to fix this issue.") - QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL ) + QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", Qgis.Critical ) self.framesShown.append(layer) except KeyError: #QgsMessageLog.logMessage(traceback.format_exc(), "THREDDS Explorer", QgsMessageLog.CRITICAL )