From 804ba3d5404e2358cbcb91f09eaf983ef28f94ec Mon Sep 17 00:00:00 2001
From: "benjamin.jakimow" <benjamin.jakimow@geo.hu-berlin.de>
Date: Thu, 29 Mar 2018 08:53:12 +0200
Subject: [PATCH] fixed loadfile bugs (Q5 issues)
---
timeseriesviewer/main.py | 12 +++++++-----
timeseriesviewer/ui/timeseriesviewer.ui | 8 ++++----
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/timeseriesviewer/main.py b/timeseriesviewer/main.py
index 8dd8db0a..051345d5 100644
--- a/timeseriesviewer/main.py
+++ b/timeseriesviewer/main.py
@@ -569,8 +569,10 @@ class TimeSeriesViewer(QgisInterface, QObject):
defFile = s.value('FILE_TS_DEFINITION')
if defFile is not None:
defFile = os.path.dirname(defFile)
- path = QFileDialog.getOpenFileName(caption='Load Time Series definition',
- directory=defFile)
+
+ filters = "CSV (*.csv *.txt);;" + \
+ "All files (*.*)"
+ path, filter = QFileDialog.getOpenFileName(caption='Load Time Series definition', directory=defFile, filters=filters)
if path is not None and os.path.exists(path):
s.setValue('FILE_TS_DEFINITION', path)
M = self.ui.dockTimeSeries.tableView_TimeSeries.model()
@@ -750,12 +752,12 @@ class TimeSeriesViewer(QgisInterface, QObject):
s = settings()
defDir = s.value('DIR_FILESEARCH')
- filters = "ENVI Images (*.bsq *.bil *.bip);;"+ \
- "GeoTiff (*.tif *.tiff *.gtiff);;"+ \
+ filters = "GeoTiff (*.tif *.tiff *.gtiff);;"+ \
+ "ENVI Images (*.bsq *.bil *.bip);;" + \
"JPEG (*.jpg *.jpeg *.jp2 *.j2k);;"+\
"All files (*.*)"
- files = QFileDialog.getOpenFileNames(directory=defDir, filter=filters)
+ files, filter = QFileDialog.getOpenFileNames(directory=defDir, filter=filters)
if len(files) > 0 and os.path.exists(files[0]):
dn = os.path.dirname(files[0])
diff --git a/timeseriesviewer/ui/timeseriesviewer.ui b/timeseriesviewer/ui/timeseriesviewer.ui
index 5d2a27ac..a6758d62 100644
--- a/timeseriesviewer/ui/timeseriesviewer.ui
+++ b/timeseriesviewer/ui/timeseriesviewer.ui
@@ -331,10 +331,10 @@
<normaloff>:/timeseriesviewer/icons/mActionAddRasterLayer.svg</normaloff>:/timeseriesviewer/icons/mActionAddRasterLayer.svg</iconset>
</property>
<property name="text">
- <string>Add image</string>
+ <string>Add images</string>
</property>
<property name="toolTip">
- <string>Add image to time series</string>
+ <string>Add images to the time series</string>
</property>
</action>
<action name="actionRemoveTSD">
@@ -343,10 +343,10 @@
<normaloff>:/timeseriesviewer/icons/mActionRemoveTSD.svg</normaloff>:/timeseriesviewer/icons/mActionRemoveTSD.svg</iconset>
</property>
<property name="text">
- <string>Remove image</string>
+ <string>Remove images</string>
</property>
<property name="toolTip">
- <string>Remove image from time series</string>
+ <string>Remove images from this time series</string>
</property>
</action>
<action name="actionSaveTS">
--
GitLab