From b7fbd6c20f9ddbb8291bbbb2531efcf7cb22b35c Mon Sep 17 00:00:00 2001 From: "Benjamin Jakimow benjamin.jakimow@geo.hu-berlin.de" <benjamin.jakimow@geo.hu-berlin.de> Date: Thu, 13 Aug 2020 14:59:03 +0200 Subject: [PATCH] fixed temporal properties for raster layer export to QGIS Signed-off-by: Benjamin Jakimow benjamin.jakimow@geo.hu-berlin.de <benjamin.jakimow@geo.hu-berlin.de> --- eotimeseriesviewer/__init__.py | 2 +- eotimeseriesviewer/mapcanvas.py | 8 ++++---- eotimeseriesviewer/mapvisualization.py | 6 ++++-- eotimeseriesviewer/timeseries.py | 3 +-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eotimeseriesviewer/__init__.py b/eotimeseriesviewer/__init__.py index 196846cb..517ade22 100644 --- a/eotimeseriesviewer/__init__.py +++ b/eotimeseriesviewer/__init__.py @@ -21,7 +21,7 @@ # noinspection PyPep8Naming -__version__ = '1.14' # sub-subversion number is added automatically +__version__ = '1.13' # sub-subversion number is added automatically LICENSE = 'GNU GPL-3' TITLE = 'EO Time Series Viewer' LOG_MESSAGE_TAG = TITLE diff --git a/eotimeseriesviewer/mapcanvas.py b/eotimeseriesviewer/mapcanvas.py index 4a96666a..9ec2d646 100644 --- a/eotimeseriesviewer/mapcanvas.py +++ b/eotimeseriesviewer/mapcanvas.py @@ -1212,13 +1212,13 @@ class MapCanvas(QgsMapCanvas): dtg = self.tsd().date().astype(object) dt1 = QDateTime(dtg, QTime(0, 0)) dt2 = QDateTime(dtg, QTime(QTime(23, 59, 59))) - tprop.setFixedTemporalRange(QgsDateTimeRange(dt1, dt2)) - - layers.append(l) + range = QgsDateTimeRange(dt1, dt2) + tprop.setFixedTemporalRange(range) + layers.append(lyr) else: layers.append(l) if len(layers) > 0 and isinstance(qgis.utils.iface, QgisInterface): - QgsProject.instance().addMapLayers(layers) + QgsProject.instance().addMapLayers(layers, True) def onPasteStyleFromClipboard(self, lyr): from .externals.qps.layerproperties import pasteStyleFromClipboard diff --git a/eotimeseriesviewer/mapvisualization.py b/eotimeseriesviewer/mapvisualization.py index 1d704f90..476cd11e 100644 --- a/eotimeseriesviewer/mapvisualization.py +++ b/eotimeseriesviewer/mapvisualization.py @@ -36,7 +36,9 @@ from qgis.core import QgsContrastEnhancement, QgsRasterShader, QgsColorRampShade QgsRectangle, QgsRasterRenderer, QgsMapLayerStore, QgsMapLayerStyle, \ QgsLayerTreeModel, QgsLayerTreeGroup, \ QgsLayerTree, QgsLayerTreeLayer, \ - QgsRasterLayer, QgsVectorLayer, QgsMapLayer, QgsMapLayerProxyModel, QgsColorRamp, QgsSingleBandPseudoColorRenderer + QgsRasterLayer, QgsVectorLayer, QgsMapLayer, QgsMapLayerProxyModel, QgsColorRamp, \ + QgsSingleBandPseudoColorRenderer, \ + QgsPointXY, QgsReadWriteContext from qgis.gui import * from qgis.gui import QgsDockWidget, QgsMapCanvas, QgsMapTool, QgsCollapsibleGroupBox, QgsLayerTreeView, \ @@ -1739,7 +1741,7 @@ class MapWidget(QFrame): #mapCanvas.mapTools().mtCursorLocation.sigLocationRequest.disconnect( # self.sigCurrentLocationChanged) - def onCanvasLocationRequest(self, canvas: QgsMapCanvas, crs: QgsCoordinateReferenceSystem, pt:QgsPointXY): + def onCanvasLocationRequest(self, canvas: QgsMapCanvas, crs: QgsCoordinateReferenceSystem, pt: QgsPointXY): spt = SpatialPoint(crs, pt) self.sigCurrentLocationChanged.emit(spt, canvas) diff --git a/eotimeseriesviewer/timeseries.py b/eotimeseriesviewer/timeseries.py index a3ce5344..9aafab02 100644 --- a/eotimeseriesviewer/timeseries.py +++ b/eotimeseriesviewer/timeseries.py @@ -2465,12 +2465,11 @@ class TimeSeriesTreeView(QTreeView): self.sigMoveToExtent.emit(extent) def openInQGIS(self, tssList: typing.List[TimeSeriesSource]): - import qgis.utils iface = qgis.utils.iface if isinstance(iface, QgisInterface): layers = [tss.asRasterLayer() for tss in tssList] - QgsProject.instance().addMapLayers(layers) + QgsProject.instance().addMapLayers(layers, True) def setClipboardUris(self, tssList: typing.List[TimeSeriesSource]): urls = [] -- GitLab