wolfhece 2.1.99__py3-none-any.whl → 2.1.100__py3-none-any.whl

wolfhece/PyDraw.py

@@ -987,7 +987,7 @@ class Sim_Explorer(wx.Frame):
         if mode == 0:
             # By time [s]
             prev_time = self._all_times_steps[0][idx] - float(self._interval.GetValue())
-            diff = [abs(prev_time - i) for i in self._all_times_steps[0][:i]]
+            diff = [abs(prev_time - i) for i in self._all_times_steps[0][:idx]]
             prev_idx = diff.index(min(diff))
 
             return prev_idx
@@ -995,7 +995,7 @@ class Sim_Explorer(wx.Frame):
         elif mode == 1:
             # By time [hour]
             prev_time = self._all_times_steps[0][idx] - float(self._interval.GetValue())*3600
-            diff = [abs(prev_time - i) for i in self._all_times_steps[0][:i]]
+            diff = [abs(prev_time - i) for i in self._all_times_steps[0][:idx]]
             prev_idx = diff.index(min(diff))
 
             return prev_idx
@@ -1009,7 +1009,7 @@ class Sim_Explorer(wx.Frame):
         elif mode == 3:
             # By time step
             prev_idx = self._all_times_steps[1].index(self._all_times_steps[1][idx] - int(self._interval.GetValue()))
-            diff = [abs(prev_idx - i) for i in self._all_times_steps[1][:i]]
+            diff = [abs(prev_idx - i) for i in self._all_times_steps[1][:idx]]
             prev_idx = diff.index(min(diff))
 
             return prev_idx
@@ -7581,16 +7581,27 @@ class WolfMapViewer(wx.Frame):
                 #     myhead.dy = 1.
 
             else:
+
+                dlg = wx.TextEntryDialog(self,_('Spatial step size (assuming dx == dy) ?'), value='1')
+                ret=dlg.ShowModal()
+
+                if ret == wx.ID_CANCEL:
+                    dlg.Destroy()
+                    return -1
+
+                tmpdx = float(dlg.GetValue())
+                dlg.Destroy()
+
+                dy = dx
+
                 myxyz = xyz_scandir(filename, None)
                 myhead = header_wolf()
 
-                myhead.origx = np.min(myxyz[:, 0]) - .5
-                myhead.origy = np.min(myxyz[:, 1]) - .5
+                myhead.origx = np.min(myxyz[:, 0]) - dx/2.
+                myhead.origy = np.min(myxyz[:, 1]) - dy/2.
 
-                myhead.dx = 1.
-                myhead.dy = 1.
-                tmpdx = 1.
-                tmpdy = 1.
+                myhead.dx = dx
+                myhead.dy = dy
 
                 myhead.nbx = int(np.max(myxyz[:, 0]) - myhead.origx) + 1
                 myhead.nby = int(np.max(myxyz[:, 1]) - myhead.origy) + 1
@@ -7608,10 +7619,6 @@ class WolfMapViewer(wx.Frame):
 
             newobj.mask_data(newobj.nullvalue)
 
-            # if min(tmpdx, tmpdy) != 1.:
-            #     newobj.rebin(min(tmpdx, tmpdy))
-            #     newobj.mask_data(newobj.nullvalue)
-
             newobj.change_gui(self)
             newobj.updatepalette(0)
             self.myarrays.append(newobj)

wolfhece/PyVertexvectors.py

@@ -6917,5 +6917,5 @@ class Grid(Zones):
         contour.add_vertex(newvert)
         newvert=wolfvertex(locox,locey)
         contour.add_vertex(newvert)
-
-        self.find_minmax(True)
+        
+        self.find_minmax(True)

wolfhece/acceptability/Parallels.py

@@ -7,7 +7,7 @@ Copyright (c) 2024 University of Liege. All rights reserved.
 This script and its content are protected by copyright law. Unauthorized
 copying or distribution of this file, via any medium, is strictly prohibited.
 """
-
+#import _add_path #AP
 from .func import clip_layer, data_modification, vector_to_raster, compute_vulnerability, match_vulnerability2sim, compute_acceptability, shp_to_raster, Accept_Manager
 import geopandas as gpd
 import multiprocessing
@@ -76,7 +76,7 @@ def parallel_v2r(manager:Accept_Manager,
     if number_procs == 1:
         result_list=[]
         for curlayer in layers:
-            result_list.append(vector_to_raster(curlayer, manager, attribute, pixel,convert_to_sparse))
+            result_list.append(vector_to_raster(curlayer, manager, attribute, pixel, convert_to_sparse))
 
     else:
         pool = multiprocessing.Pool(processes=number_procs)

wolfhece/acceptability/_add_path.py

@@ -0,0 +1,23 @@
+import os
+import os.path
+import sys
+import platform
+
+
+def _add_path():
+    _root_dir = os.path.dirname(os.path.realpath(__file__))
+
+    # manual specify list of dll directories, with paths relative to _root_dir
+    _dll_dirs = ['libs', 'shaders']
+
+    if platform.system() == 'Windows':
+        os.environ.setdefault('PATH', '')
+        paths = os.environ['PATH'].split(';')
+        for x in _dll_dirs:
+            x = os.path.join(_root_dir, x)
+            if os.path.isdir(x) and x not in paths:
+                paths = [x] + paths
+        os.environ['PATH'] = ';'.join(paths)
+
+
+_add_path()