Skip to content
Snippets Groups Projects
Commit 0ecf861a authored by Benjamin Jakimow's avatar Benjamin Jakimow
Browse files

Task Manager: source loading can be canceled

spatial maps: scroll-bar tracking disabled

Signed-off-by: Benjamin Jakimow's avatarbenjamin.jakimow <benjamin.jakimow@geo.hu-berlin.de>
parent 8b017e5b
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,8 @@ class MapViewScrollArea(QScrollArea):
def __init__(self, *args, **kwds):
super(MapViewScrollArea, self).__init__(*args, **kwds)
self.horizontalScrollBar().setTracking(False)
self.verticalScrollBar().setTracking(False)
def resizeEvent(self, event):
super(MapViewScrollArea, self).resizeEvent(event)
......
......@@ -980,13 +980,14 @@ def doLoadTimeSeriesSourcesTask(taskWrapper:QgsTask, dump):
results = []
n = len(sources)
for i, source in enumerate(sources):
if taskWrapper.isCanceled():
return pickle.dumps(results)
s = TimeSeriesSource.create(source)
if isinstance(s, TimeSeriesSource):
results.append(s)
taskWrapper.setProgress(float(i+1) / n * 100.0)
resultDump = pickle.dumps(results)
return resultDump
return pickle.dumps(results)
s = ""
class TimeSeries(QAbstractItemModel):
......@@ -1328,7 +1329,7 @@ class TimeSeries(QAbstractItemModel):
yield l[i:i + n]
n = int(len(sources) / nWorkers)
for subset in chunks(sources, 10):
for subset in chunks(sources, 50):
#for source in sources:
#subset = [source]
dump = pickle.dumps(subset)
......
......@@ -219,7 +219,7 @@ class VRTRasterInputSourceBand(object):
pathOrDataSet = gdal.Open(pathOrDataSet)
if isinstance(pathOrDataSet, gdal.Dataset):
path = pathOrDataSet.GetFileList()[0]
path = pathOrDataSet.GetDescription()
for b in range(pathOrDataSet.RasterCount):
srcBands.append(VRTRasterInputSourceBand(path, b))
return srcBands
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment