From 33e42b14e3ad09920f13ab75a5769cdb4b91247c Mon Sep 17 00:00:00 2001
From: "benjamin.jakimow@geo.hu-berlin.de" <q8DTkxUg-BB>
Date: Fri, 19 Jan 2018 10:16:25 +0100
Subject: [PATCH] refactoring
---
make/deploy.py | 2 +-
timeseriesviewer/__main__.py | 5 +++--
timeseriesviewer/main.py | 8 ++++----
timeseriesviewer/pixelloader.py | 8 +++-----
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/make/deploy.py b/make/deploy.py
index 8ffe252c..0131f0ec 100644
--- a/make/deploy.py
+++ b/make/deploy.py
@@ -94,7 +94,7 @@ if __name__ == "__main__":
cfg = pb_tool.get_config(config=pathCfg)
if True:
- #1. clean an existing directory = the enmapboxplugin folder
+ #1. clean an existing directory = the timeseriesviewer folder
pb_tool.clean_deployment(ask_first=False, config=pathCfg)
#2. Compile. Basically call pyrcc to create the resources.rc file
diff --git a/timeseriesviewer/__main__.py b/timeseriesviewer/__main__.py
index c5ac225b..e6ea8df6 100644
--- a/timeseriesviewer/__main__.py
+++ b/timeseriesviewer/__main__.py
@@ -20,8 +20,9 @@ from __future__ import absolute_import
import sys
class run():
-
- # add site-packages to sys.path as done by enmapboxplugin.py
+ """
+ Starts the HUB TimeSeriesViewer
+ """
from timeseriesviewer.sandbox import initQgisApplication
qgsApp = initQgisApplication()
diff --git a/timeseriesviewer/main.py b/timeseriesviewer/main.py
index 67d3b4cc..9afd590c 100644
--- a/timeseriesviewer/main.py
+++ b/timeseriesviewer/main.py
@@ -45,10 +45,10 @@ from timeseriesviewer.profilevisualization import SpectralTemporalVisualization
-#path = os.path.abspath(jp(sys.exec_prefix, '../../bin/pythonw.exe'))
-#if os.path.exists(path):
-# multiprocessing.set_executable(path)
-# sys.argv = [ None ]
+path = os.path.abspath(jp(sys.exec_prefix, '../../bin/pythonw.exe'))
+if os.path.exists(path):
+ multiprocessing.set_executable(path)
+ sys.argv = [ None ]
#ensure that required non-standard modules are available
diff --git a/timeseriesviewer/pixelloader.py b/timeseriesviewer/pixelloader.py
index 17f3a2d1..c108a51e 100644
--- a/timeseriesviewer/pixelloader.py
+++ b/timeseriesviewer/pixelloader.py
@@ -20,8 +20,9 @@
"""
# noinspection PyPep8Naming
from __future__ import absolute_import
-import os, pickle
-import sys
+import os, sys, pickle
+import multiprocessing as mp
+
import datetime
from qgis.gui import *
from qgis.core import *
@@ -29,9 +30,6 @@ from PyQt4.QtCore import *
import numpy as np
from timeseriesviewer.utils import SpatialPoint, SpatialExtent, geo2px, px2geo
from osgeo import gdal, gdal_array, osr
-import multiprocessing as mp
-
-#mp.freeze_support()
DEBUG = False
--
GitLab