Version 3.16.1

Fixed import issues with scipy

FootprintModel/KingsFootprint_UMEP.py

@@ -21,10 +21,14 @@
 # import scipy.misc as sc
 # from scipy.ndimage.interpolation import rotate as imrotate
 # from matplotlib.patches import Circle
-from scipy.optimize import fsolve
+
 from qgis.PyQt.QtWidgets import QAction, QFileDialog, QMessageBox
 # import copy as copy
-import scipy.ndimage.interpolation as scnd
+try:
+    import scipy.ndimage.interpolation as scnd
+    from scipy.optimize import fsolve
+except:
+    pass
 from osgeo import gdal
 from osgeo.gdalconst import *
 from ..Utilities import RoughnessCalcFunctionV2 as rg

ImageMorphParam/image_morph_param.py

@@ -345,14 +345,6 @@ def start_progress(self):
                          self.plugin_dir, self.folderPath, self.dlg, imid, radius, degree, rm)
 
     def run(self):
-        try:
-            import scipy
-        except Exception as e:
-            QMessageBox.critical(None, 'Error', 'This plugin requires the scipy package '
-                                                'to be installed. Please consult the FAQ in the manual for further '
-                                                'information on how to install missing python packages.')
-            return
-
         self.dlg.show()
         self.dlg.exec_()
         gdal.UseExceptions()

SEBEpv/SEBEfiles/shadowingfunction_wallheight.py

@@ -2,7 +2,9 @@
 from __future__ import division
 import numpy as np
 from math import radians,pi
-from scipy.ndimage.filters import median_filter,gaussian_filter
+# from scipy.ndimage.filters import median_filter,gaussian_filter
+
+
 def shadowingfunction_wallheight(a, azimuth, altitude, scale, walls, aspect,
                                  vegdem=None, vegdem2=None, amaxvalue=0, bush=0,call_index=0):
     """

SEBEpv/SEBEfiles/shadowingfunction_wallheight_13.py

@@ -2,7 +2,14 @@
 from __future__ import division
 import numpy as np
 from math import radians
-from scipy.ndimage.filters import median_filter
+
+try:
+    from scipy.ndimage.filters import median_filter
+except Exception as e:
+    QMessageBox.warning(None, 'Error', 'Many tools in UMEP requires the scipy package '
+                                        'to be installed. Please consult the FAQ in the manual for further '
+                                        'information on how to install missing python packages.')
+
 
 
 def shadowingfunction_wallheight_13(a, azimuth, altitude, scale, walls, aspect):

Utilities/SEBESOLWEIGCommonFiles/shadowingfunction_wallheight_13.py

@@ -2,7 +2,7 @@
 from __future__ import division
 import numpy as np
 from math import radians
-from scipy.ndimage.filters import median_filter
+# from scipy.ndimage.filters import median_filter
 
 
 def shadowingfunction_wallheight_13(a, azimuth, altitude, scale, walls, aspect):

Utilities/imageMorphometricParms_v1.py

@@ -17,15 +17,17 @@
 # import Image
 # from scipy import *
 import numpy as np
-import scipy.ndimage.interpolation as sc
 from qgis.core import *
 # import scipy.misc as sc
 # import matplotlib as plt
 # import PIL
 from qgis.core import QgsMessageLog
 import linecache
 import sys
-
+try:
+    import scipy.ndimage.interpolation as sc
+except Exception as e: 
+    QgsMessageLog.logMessage(str(e), level=Qgis.Critical)
 
 def imagemorphparam_v2(dsm, dem, scale, mid, dtheta, dlg, imp_point):
 

Utilities/landCoverFractions_v1.py

@@ -15,13 +15,13 @@
 # import scipy.ndimage.interpolation as sc
 # from scipy import misc as sc
 import numpy as np
-import scipy.ndimage.interpolation as sc
+try:
+    import scipy.ndimage.interpolation as sc
+except:
+    pass
 # import PIL
 # import matplotlib.pylab as plt
 
-
-
-
 def landcover_v1(lc_grid, mid, dtheta, dlg, imp_point):
 
     # Isotropic

WallHeight/wallalgorithms.py

@@ -5,8 +5,10 @@
 import numpy as np
 # import scipy.misc as sc
 import math
-import scipy.ndimage.interpolation as sc
-
+try:
+    import scipy.ndimage.interpolation as sc
+except:
+    pass
 
 def findwalls(a, walllimit):
     # This function identifies walls based on a DSM and a wall-height limit

WallHeight/wallworker.py

@@ -4,7 +4,10 @@
 import traceback
 import numpy as np
 # import scipy.misc as sc
-import scipy.ndimage.interpolation as sc
+try:
+    import scipy.ndimage.interpolation as sc
+except:
+    pass
 import math
 from .wallalgorithms import get_ders
 import linecache

metadata.txt

@@ -11,7 +11,7 @@ name=UMEP
 qgisMinimumVersion=3.0
 description=Urban Multi-scale Environmental Predictor
 
-version=3.16
+version=3.16.1
 author=Fredrik Lindberg - Sue Grimmond - Niklas Krave - Leena Jarvi - Helen Ward - Shiho Onomura - Christoph Kent - Andy Gabey - Frans Olofson - Ting Sun - Bei Huang - Nils Wallenberg
 [email protected]
 
@@ -29,6 +29,7 @@ repository=https://github.com/UMEP-dev/UMEP
 
 # Uncomment the following line and add your changelog:
 changelog=
+   3.16.1: Fixed import issues with scipy
    3.16  : LONG TERM RELEASE. Added WallAreaIndex in Morphometric Calculator
    3.15.7: Response to issue #230 and added functionality to save data for the Treeplanter
    3.15.6: Response to issues #218 and 228