wolfhece 2.1.120__py3-none-any.whl → 2.1.121__py3-none-any.whl

wolfhece/PyDraw.py

@@ -6882,6 +6882,7 @@ class WolfMapViewer(wx.Frame):
                 begin = choice_bes.begin
                 end = choice_bes.end
                 interval = choice_bes.step
+                all = choice_bes.check_all
 
             finally:
                 choice_bes.Destroy()
@@ -6890,7 +6891,7 @@ class WolfMapViewer(wx.Frame):
                 logging.info(_('No interval chosen - Aborting !'))
                 return
 
-            ret = self.active_res2d.export_some_values_to_csv(all_selected, which, filename, for_steps= (begin-1, end-1, interval))
+            ret = self.active_res2d.export_some_values_to_csv(all_selected, which, filename, for_steps= (begin-1, end-1, interval), all_values=all)
 
             if not ret:
                 logging.error(_('Error in exporting values !'))
@@ -6989,7 +6990,7 @@ class WolfMapViewer(wx.Frame):
                 logging.info(_('No interval chosen - Aborting !'))
                 return
 
-            ret = self.active_res2d.export_some_values_to_csv(self.active_vector, which, filename=filename, for_steps= (begin-1, end-1, interval))
+            ret = self.active_res2d.export_some_values_to_csv(self.active_vector, which, filename=filename, for_steps= (begin-1, end-1, interval), all_values=all)
 
         elif itemlabel == _("Plot stats unknown (inside active zone)..."):
 
@@ -7102,7 +7103,7 @@ class WolfMapViewer(wx.Frame):
 
 
             for idx, (curvect, name) in enumerate(zip(self.active_zone.myvectors, unique_name)):
-                self.active_res2d.export_some_values_to_csv(curvect, which, filename=directory / name, for_steps= (begin-1, end-1, interval))
+                self.active_res2d.export_some_values_to_csv(curvect, which, filename=directory / name, for_steps= (begin-1, end-1, interval), all_values=all)
 
         elif itemlabel == _("Plot active vector..."):
             """ Plot data along active vector """

wolfhece/acceptability/acceptability.py

@@ -566,26 +566,30 @@ def Acceptability(main_dir:str = 'Vesdre',
 
                 comb += part_accept[curT] * float(pond["Ponderation"][curT])
 
-            y_pixels, x_pixels = comb.shape  # number of pixels in x
+            y_pixels, x_pixels = comb.shape 
 
-            # Set up output GeoTIFF
             driver = gdal.GetDriverByName('GTiff')
-            
-            dataset = driver.Create(str(saveA),
-                                    x_pixels, y_pixels,
-                                    1,
-                                    gdal.GDT_Float32,
-                                    options=["COMPRESS=LZW"])
+
+            dataset = driver.Create(
+                str(saveA),
+                x_pixels, y_pixels,
+                1,
+                gdal.GDT_Float32,
+                options=["COMPRESS=LZW"]
+            )
 
             assert comb.dtype == np.float32, "The dtype of the combined acceptability matrix is not np.float32"
 
-            dataset.GetRasterBand(1).WriteArray(comb)
             dataset.SetGeoTransform(geotrans)
             dataset.SetProjection(proj)
-            dataset.FlushCache()
-            dataset=None
-        
-        done.append(steps_acceptability.COMPUTE_MEAN_ACCEPT)
+            band = dataset.GetRasterBand(1)
+            band.WriteArray(comb)  
+            band.FlushCache()  
+            dataset.SetGeoTransform(geotrans)
+            dataset.SetProjection(proj)
+            dataset = None
+
+            done.append(steps_acceptability.COMPUTE_MEAN_ACCEPT)
         
         if 6 in steps or steps_acceptability.RESAMPLING in steps:
             if os.path.exists(manager.OUT_ACCEPT):