From d57f91e36041cdf68bf666e2ac51ca47b27d7622 Mon Sep 17 00:00:00 2001
From: "benjamin.jakimow" <benjamin.jakimow@geo.hu-berlin.de>
Date: Fri, 23 Nov 2018 16:08:19 +0100
Subject: [PATCH] refactoring
---
timeseriesviewer/classification/classificationscheme.py | 6 +++---
timeseriesviewer/mapcanvas.py | 6 +++---
timeseriesviewertesting/test_init.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/timeseriesviewer/classification/classificationscheme.py b/timeseriesviewer/classification/classificationscheme.py
index bf6340a2..089a199d 100644
--- a/timeseriesviewer/classification/classificationscheme.py
+++ b/timeseriesviewer/classification/classificationscheme.py
@@ -27,7 +27,7 @@ from qgis.PyQt.QtGui import *
from qgis.PyQt.QtWidgets import *
import numpy as np
from osgeo import gdal
-from enmapbox.gui.utils import gdalDataset, nextColor, loadUIFormClass
+from timeseriesviewer.utils import *
from itertools import cycle
@@ -1427,8 +1427,8 @@ class ClassificationSchemeWidget(QWidget, loadClassificationUI('classificationsc
self.mScheme.removeClasses(classes)
def loadClasses(self, *args):
- from enmapbox import enmapboxSettings
- settings = enmapboxSettings()
+
+ settings = QSettings('HUB','ClassificationScheme')
settingsKey = 'DEF_DIR_ClassificationSchemeWidget.loadClasses'
defDir = settings.value(settingsKey, None)
path, _ = QFileDialog.getOpenFileName(self, 'Select Raster File', directory=defDir)
diff --git a/timeseriesviewer/mapcanvas.py b/timeseriesviewer/mapcanvas.py
index f0fe50d6..b1dea776 100644
--- a/timeseriesviewer/mapcanvas.py
+++ b/timeseriesviewer/mapcanvas.py
@@ -356,9 +356,9 @@ class MapCanvas(QgsMapCanvas):
scope = self.expressionContextScope()
scope.setVariable('map_date', str(tsd.date), isStatic=True)
- scope.setVariable('map_doy', tsd.doy, isStatic=True)
- scope.setVariable('map_sensor', tsd.sensor.name(), isStatic=False)
- tsd.sensor.sigNameChanged.connect(lambda name : scope.setVariable('map_sensor', name))
+ scope.setVariable('map_doy', tsd.mDOY, isStatic=True)
+ scope.setVariable('map_sensor', tsd.sensor().name(), isStatic=False)
+ tsd.sensor().sigNameChanged.connect(lambda name : scope.setVariable('map_sensor', name))
s = ""
diff --git a/timeseriesviewertesting/test_init.py b/timeseriesviewertesting/test_init.py
index 695da74d..caff7d2d 100644
--- a/timeseriesviewertesting/test_init.py
+++ b/timeseriesviewertesting/test_init.py
@@ -19,7 +19,7 @@
# noinspection PyPep8Naming
import os, sys, unittest, configparser
-from timeseriesviewertesting import initQgisApplication
+from timeseriesviewertesting import initQgisApplication, TestObjects
APP = initQgisApplication()
from timeseriesviewer.main import *
--
GitLab