wolfhece 2.2.40__py3-none-any.whl → 2.2.42__py3-none-any.whl

wolfhece/PyDraw.py

@@ -1219,6 +1219,221 @@ class Sim_Explorer(wx.Frame):
         self._step_num.Set([str(i) for i in self._all_times_steps[1]])
 
 
+class Sim_VideoCreation(wx.Dialog):
+
+    def __init__(self, parent, title, mapviewer:"WolfMapViewer", sim:Wolfresults_2D):
+        super(Sim_VideoCreation, self).__init__(parent, title=title, size=(350, 250), style = wx.DEFAULT_DIALOG_STYLE & ~ (wx.RESIZE_BORDER | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX | wx.CLOSE_BOX))
+
+        self.mapviewer = mapviewer
+        self.active_res2d:Wolfresults_2D = sim
+
+        self._framerate = 25
+        self._start_step = 1
+        self._end_step = self.active_res2d.get_nbresults()
+        self._interval = 1
+        self._fn = str(Path(self.active_res2d.filename).parent / f'{Path(self.active_res2d.filename).stem}.avi')
+
+        self._fontsize = 16
+        self._fontcolor = (255, 255, 255, 255)
+        self._timeposition = 'top-left' # 'top-right', 'bottom-left', 'bottom-right', 'top-center', 'bottom-center'
+
+        panel = wx.Panel(self)
+        vbox = wx.BoxSizer(wx.VERTICAL)
+
+        hbox1 = wx.BoxSizer(wx.HORIZONTAL)
+        st1 = wx.StaticText(panel, -1, _('File name'))
+        hbox1.Add(st1, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc1 = wx.TextCtrl(panel, -1, self._fn)
+        hbox1.Add(tc1,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox1,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc1 = tc1
+
+        # Add a button to choose the file name
+        btn_browse = wx.Button(panel, -1, _('Browse'))
+        hbox1.Add(btn_browse, 0, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.btn_browse = btn_browse
+        self.btn_browse.Bind(wx.EVT_BUTTON, self.OnBrowse)
+
+        hbox2 = wx.BoxSizer(wx.HORIZONTAL)
+        st2 = wx.StaticText(panel, -1, _('Frame rate [nb_images/second]'), style=wx.ALIGN_CENTER)
+        hbox2.Add(st2, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc2 = wx.TextCtrl(panel, -1, str(self._framerate))
+        hbox2.Add(tc2,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox2,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc2 = tc2
+
+        hbox3 = wx.BoxSizer(wx.HORIZONTAL)
+        st3 = wx.StaticText(panel, -1, _('First step'), style=wx.ALIGN_CENTER)
+        hbox3.Add(st3, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc3 = wx.TextCtrl(panel, -1, str(self._start_step))
+        hbox3.Add(tc3,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox3,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc3 = tc3
+
+        hbox4 = wx.BoxSizer(wx.HORIZONTAL)
+        st4 = wx.StaticText(panel, -1, _('Final step'), style=wx.ALIGN_CENTER)
+        hbox4.Add(st4, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc4 = wx.TextCtrl(panel, -1, str(self._end_step))
+        hbox4.Add(tc4,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox4,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc4 = tc4
+
+        hbox5 = wx.BoxSizer(wx.HORIZONTAL)
+        st5 = wx.StaticText(panel, -1, _('Interval'), style=wx.ALIGN_CENTER)
+        hbox5.Add(st5, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc5 = wx.TextCtrl(panel, -1, str(self._interval))
+        hbox5.Add(tc5,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox5,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc5 = tc5
+
+        hbox7 = wx.BoxSizer(wx.HORIZONTAL)
+        st7 = wx.StaticText(panel, -1, _("Font size (for time stamp)"), style=wx.ALIGN_CENTER)
+        hbox7.Add(st7, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc7 = wx.TextCtrl(panel, -1, str(self._fontsize))
+        hbox7.Add(tc7,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox7,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc7 = tc7
+
+        hbox8 = wx.BoxSizer(wx.HORIZONTAL)
+        st8 = wx.StaticText(panel, -1, _("Font color (R,G,B,A)"), style=wx.ALIGN_CENTER)
+        hbox8.Add(st8, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        tc8 = wx.ColourPickerCtrl(panel, -1, wx.Colour(*self._fontcolor))
+        hbox8.Add(tc8,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        vbox.Add(hbox8,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.tc8 = tc8
+
+        hbox9 = wx.BoxSizer(wx.HORIZONTAL)
+        st9 = wx.StaticText(panel, -1, _("Time position"), style=wx.ALIGN_CENTER)
+        hbox9.Add(st9, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        choices = ['top-left', 'top-right', 'bottom-left', 'bottom-right', 'top-center', 'bottom-center']
+        tc9 = wx.Choice(panel, -1, choices=choices)
+        hbox9.Add(tc9, 1, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        vbox.Add(hbox9, 0, wx.EXPAND|wx.ALIGN_LEFT|wx.ALL, 5)
+        self.tc9 = tc9
+
+        hbox6 = wx.BoxSizer(wx.HORIZONTAL)
+        btn1 = wx.Button(panel, -1, _('Ok'))
+        hbox6.Add(btn1,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.btn1 = btn1
+
+        btn2 = wx.Button(panel, -1, _('Cancel'))
+        hbox6.Add(btn2,1,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        self.btn2 = btn2
+        vbox.Add(hbox6,0,wx.EXPAND|wx.ALIGN_LEFT|wx.ALL,5)
+        panel.SetSizer(vbox)
+        vbox.Fit(self)
+
+        self.btn1.Bind(wx.EVT_BUTTON, self.OnOk)
+        self.btn2.Bind(wx.EVT_BUTTON, self.OnCancel)
+
+        # Add validation to the text controls
+        self.tc2.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc3.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc4.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc5.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc7.Bind(wx.EVT_TEXT, self.OnValidate)
+        self.tc8.Bind(wx.EVT_COLOURPICKER_CHANGED, self.OnValidate)
+        self.tc9.SetSelection(0)
+        self.tc9.Bind(wx.EVT_CHOICE, self.OnValidate)
+
+        icon = wx.Icon()
+        icon_path = Path(__file__).parent / "apps/wolf_logo2.bmp"
+        icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
+        self.SetIcon(icon)
+        self.CenterOnScreen()
+        self.Show()
+
+    def OnBrowse(self, event):
+        """ Browse a file name to save the video """
+        with wx.FileDialog(self, _("Save video file"), wildcard="MP4 files (*.mp4)|*.mp4|AVI files (*.avi)|*.avi|All files (*.*)|*.*",
+                           style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
+            if fileDialog.ShowModal() == wx.ID_CANCEL:
+                return     # the user changed idea...
+
+            self._fn = fileDialog.GetPath()
+            self.tc1.SetValue(self._fn)
+
+    def get_values(self):
+        """ Return the values set in the dialog """
+        return self._fn, self._framerate, self._start_step, self._end_step, self._interval, self._fontsize, self._fontcolor, self._timeposition
+
+    def OnValidate(self, event):
+        """ Validate the text controls to be sure that the values are correct """
+        try:
+            framerate = int(self.tc2.GetValue())
+            if framerate <= 0:
+                framerate = 25
+                self.tc2.SetValue(str(framerate))
+            self._framerate = framerate
+        except:
+            self.tc2.SetValue(str(self._framerate))
+        try:
+            start_step = int(self.tc3.GetValue())
+            if start_step < 1:
+                start_step = 1
+                self.tc3.SetValue(str(start_step))
+            if start_step > self.active_res2d.get_nbresults():
+                start_step = self.active_res2d.get_nbresults()
+                self.tc3.SetValue(str(start_step))
+            self._start_step = start_step
+
+        except:
+            self.tc3.SetValue(str(self._start_step))
+        try:
+            end_step = int(self.tc4.GetValue())
+            if end_step < 1:
+                end_step = 1
+                self.tc4.SetValue(str(end_step))
+            if end_step > self.active_res2d.get_nbresults():
+                end_step = self.active_res2d.get_nbresults()
+                self.tc4.SetValue(str(end_step))
+            self._end_step = end_step
+        except:
+            self.tc4.SetValue(str(self._end_step))
+        try:
+            interval = int(self.tc5.GetValue())
+            if interval < 1:
+                interval = 1
+                self.tc5.SetValue(str(interval))
+            self._interval = interval
+        except:
+            self.tc5.SetValue(str(self._interval))
+
+        try:
+            fontsize = int(self.tc7.GetValue())
+            if fontsize < 1:
+                fontsize = 16
+                self.tc7.SetValue(str(fontsize))
+            self._fontsize = fontsize
+        except:
+            self.tc7.SetValue(str(self._fontsize))
+
+        try:
+            color = self.tc8.GetColour()
+            self._fontcolor = (color.Red(), color.Green(), color.Blue(), color.Alpha())
+        except:
+            self.tc8.SetColour(wx.Colour(*self._fontcolor))
+
+        try:
+            pos_idx = self.tc9.GetSelection()
+            choices = ['top-left', 'top-right', 'bottom-left', 'bottom-right', 'top-center', 'bottom-center']
+            if pos_idx < 0 or pos_idx >= len(choices):
+                pos_idx = 0
+                self.tc9.SetSelection(pos_idx)
+            self._timeposition = choices[pos_idx]
+        except:
+            self.tc9.SetSelection(0)
+
+    def OnOk(self, event):
+        """ Create the video file """
+        self.OnValidate(None)
+        self.EndModal(wx.ID_OK)
+
+    def OnCancel(self, event):
+        """ Cancel the video creation """
+        self.EndModal(wx.ID_CANCEL)
+
+
 class Drowning_Explorer(wx.Frame):
 
     def __init__(self, parent, title, mapviewer:any, sim:Drowning_victim_Viewer):
@@ -2530,7 +2745,7 @@ class WolfMapViewer(wx.Frame):
         self.InitUI()
 
         self._tmp_vector_distance = None  # distance computation the vector
-        self._distances = Zones(mapviewer=self, idx=_('Distances/Areas'))
+        self._distances = Zones(mapviewer=self, idx=_('Distances/Areas'), parent = self)
         self._distances.add_zone(zone(name='memory distances', parent=self._distances))  # distances memory
 
         self.menu_alaro_forecasts()
@@ -3482,13 +3697,20 @@ class WolfMapViewer(wx.Frame):
             self._uts_menu = wx.Menu()
             self._ocs_menu = wx.Menu()
 
-            self._uts_crop = self._uts_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop active array"))
-            self._uts_cropscreen = self._uts_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop screen"))
+            self._uts_crop = self._uts_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop UTS data (vectorized - shp, gpkg) on the active array extent"))
+            self._uts_cropscreen = self._uts_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop UTS data (vectorized - shp, gpkg) on the current screen extent"))
             self._uts_map = self._uts_menu.Append(wx.ID_ANY, _("Map active array (WAL_UTS -> Manning)"), _("Map Walous UTS active array to Manning's n"))
             self._uts_legend = self._uts_menu.Append(wx.ID_ANY, _("Legend"), _("Legend"))
 
-            self._ocs_crop = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop active array"))
-            self._ocs_cropscreen = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop screen"))
+            self._ocs_crop_10m_2023 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array (prepared data 10 m - 2023)"), _("Crop OCS data (matrix - geotif) on the active array extent using prepared 10m data"))
+            self._ocs_cropscreen_10m_2023 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen (prepared data 10 m - 2023)"), _("Crop OCS data (matrix - geotif) on the current screen extent using prepared 10m data"))
+            self._ocs_menu.AppendSeparator()
+            self._ocs_crop_10m_2020 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array (prepared data 10 m - 2020)"), _("Crop OCS data (matrix - geotif) on the active array extent using prepared 10m data"))
+            self._ocs_cropscreen_10m_2020 = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen (prepared data 10 m - 2020)"), _("Crop OCS data (matrix - geotif) on the current screen extent using prepared 10m data"))
+            self._ocs_menu.AppendSeparator()
+            self._ocs_crop = self._ocs_menu.Append(wx.ID_ANY, _("Crop on active array"), _("Crop OCS data (matrix - geotif) on the active array extent"))
+            self._ocs_cropscreen = self._ocs_menu.Append(wx.ID_ANY, _("Crop on screen"), _("Crop OCS data (matrix - geotif) on the current screen extent"))
+            self._ocs_menu.AppendSeparator()
             self._ocs_map = self._ocs_menu.Append(wx.ID_ANY, _("Map active array (WAL_OCS -> Hydrology)"), _("Map Walous OCS active array to Hydrology's landuse classification"))
             self._ocs_map = self._ocs_menu.Append(wx.ID_ANY, _("Map active array (WAL_OCS -> Manning)"), _("Map Walous OCS active array to Manning's n"))
             self._ocs_legend = self._ocs_menu.Append(wx.ID_ANY, _("Legend"), _("Legend"))
@@ -3617,9 +3839,9 @@ class WolfMapViewer(wx.Frame):
 
         itemlabel = item.ItemLabel
 
-        if itemlabel in [_("Crop on active array"), _("Crop on screen")]:
+        if _("Crop on active array") in itemlabel or _("Crop on screen") in itemlabel:
 
-            if itemlabel == _("Crop on screen"):
+            if _("Crop on screen") in itemlabel:
 
                 bounds = self.get_canvas_bounds(gridsize=1.)
 
@@ -3653,14 +3875,24 @@ class WolfMapViewer(wx.Frame):
             from .pywalous import update_palette_walous_ocs
 
             if self._walous_OCS_filepath is None:
-                dlg = wx.FileDialog(self, _("Choose the Walous OCS Tif file"), wildcard="Tif file (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_OPEN)
-                if dlg.ShowModal() == wx.ID_CANCEL:
-                    dlg.Destroy()
-                    return
 
-                self._walous_OCS_filepath = Path(dlg.GetPath())
-                dlg.Destroy()
+                if itemlabel in [_("Crop on active array (prepared data 10 m - 2023)"), _("Crop on screen (prepared data 10 m - 2023)")]:
+                    self._walous_OCS_filepath = toys_dataset('Walous_OCS', 'WALOUS_2023_lbt72_10m.tif')
+                elif itemlabel in [_("Crop on active array (prepared data 10 m - 2020)"), _("Crop on screen (prepared data 10 m - 2020)")]:
+                    self._walous_OCS_filepath = toys_dataset('Walous_OCS', 'WALOUS_2020_lbt72_10m.tif')
 
+                else:
+                    dlg = wx.FileDialog(self, _("Choose the Walous OCS Tif file"), wildcard="Tif file (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_OPEN)
+                    if dlg.ShowModal() == wx.ID_CANCEL:
+                        dlg.Destroy()
+                        return
+
+                    self._walous_OCS_filepath = Path(dlg.GetPath())
+                    dlg.Destroy()
+
+            if self._walous_OCS_filepath is None or not Path(self._walous_OCS_filepath).exists():
+                logging.error(_('No Walous OCS file -- Please set it'))
+                return
 
             dlg = wx.FileDialog(self, _("Choose the output file"), wildcard="Geotif (*.tif)|*.tif|all (*.*)|*.*", style=wx.FD_SAVE, defaultDir=str(def_outdrir))
             if dlg.ShowModal() == wx.ID_CANCEL:
@@ -3670,8 +3902,33 @@ class WolfMapViewer(wx.Frame):
             output = Path(dlg.GetPath())
             dlg.Destroy()
 
+            header_OCS = header_wolf.read_header(self._walous_OCS_filepath)
+            if header_OCS.dx != spatial_res:
+                # Adapt bounds to ensure that the rebin will be correct.
+                # If spatial_res is a multiple of header_OCS.dx, no need to change bounds.
+                # If not, change the bounds to ensure that the crop will include data in all footprints.
+
+                # Convert bvounds to list to be able to modify it
+                bounds = [list(bounds[0]), list(bounds[1])]
+
+                if (bounds[0][0] - header_OCS.origx) % header_OCS.dx != 0:
+                    bounds[0][0] = header_OCS.origx + ((bounds[0][0] - header_OCS.origx) // header_OCS.dx) * header_OCS.dx
+                if (bounds[0][1] - bounds[0][0]) % header_OCS.dx != 0:
+                    bounds[0][1] = bounds[0][0] + ((bounds[0][1] - bounds[0][0]) // header_OCS.dx + 1) * header_OCS.dx
+                if (bounds[1][0] - header_OCS.origy) % header_OCS.dy != 0:
+                    bounds[1][0] = header_OCS.origy + ((bounds[1][0] - header_OCS.origy) // header_OCS.dy) * header_OCS.dy
+                if (bounds[1][1] - bounds[1][0]) % header_OCS.dy != 0:
+                    bounds[1][1] = bounds[1][0] + ((bounds[1][1] - bounds[1][0]) // header_OCS.dy + 1) * header_OCS.dy
+
             locwalous = WolfArray(fname=self._walous_OCS_filepath,
-                                  crop = bounds)
+                                  crop = [bounds[0][0], bounds[0][1], bounds[1][0], bounds[1][1]])
+
+            if locwalous.dx != spatial_res:
+                locwalous.rebin(spatial_res / locwalous.dx, operation='min')
+                logging.info(_('Rebin to {} m because original data are {} m').format(spatial_res, locwalous.dx))
+                locwalous = WolfArray(mold=locwalous, crop = self.active_array.get_bounds())
+
+            locwalous.write_all(output)
 
             if Path(output).exists():
                 logging.info(_('File {} created').format(output))
@@ -3689,6 +3946,7 @@ class WolfMapViewer(wx.Frame):
             elif ret == wx.ID_YES:
                 walousarray = WolfArray(fname=output)
                 update_palette_walous_ocs(walousarray.mypal)
+                walousarray.reset_plot()
                 self.add_object('array', newobj=walousarray, id = 'walous_ocs_crop')
                 dlg.Destroy()
 
@@ -3705,6 +3963,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
@@ -3740,6 +4002,10 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
@@ -3780,7 +4046,6 @@ class WolfMapViewer(wx.Frame):
 
         if itemlabel in [_("Crop on active array"), _("Crop on screen")]:
 
-
             if itemlabel == _("Crop on screen"):
 
                 bounds = self.get_canvas_bounds(gridsize=1.)
@@ -3812,10 +4077,10 @@ class WolfMapViewer(wx.Frame):
                 def_outdrir = Path(self.active_array.filename).parent
                 spatial_res = self.active_array.dx
 
-            from .pywalous import Walous_data, WALOUS2MANNING_MAJ_NIV1, WALOUS2MANNING_MAJ_NIV2, update_palette_walous_uts
+            from .pywalous import Walous_data, WALOUS_UTS2MANNING_MAJ_NIV1, WALOUS_UTS2MANNING_MAJ_NIV2, update_palette_walous_uts
 
             if self._walous_UTS_filepath is None:
-                dlg = wx.FileDialog(self, _("Choose the Walous shape file"), wildcard="Shapefile (*.shp)|*.shp|all (*.*)|*.*", style=wx.FD_OPEN)
+                dlg = wx.FileDialog(self, _("Choose the Walous shape file"), wildcard="Geopackage (*.gpkg)|*.gpkg|Shapefile (*.shp)|*.shp|all (*.*)|*.*", style=wx.FD_OPEN)
                 if dlg.ShowModal() == wx.ID_CANCEL:
                     dlg.Destroy()
                     return
@@ -3839,7 +4104,7 @@ class WolfMapViewer(wx.Frame):
                 dlg.Destroy()
                 return
 
-            self._walous_layer = dlg.GetStringSelection()
+            self._walous_layer = 'UTS_' + dlg.GetStringSelection()
 
             locwalous = Walous_data(self._walous_UTS_filepath.parent, self._walous_UTS_filepath.name)
             ret = locwalous.rasterize(bounds=bounds,
@@ -3885,14 +4150,18 @@ class WolfMapViewer(wx.Frame):
                 logging.warning(_('No active array -- Please activate data first'))
                 return
 
+            if self.active_array.wolftype != WOLF_ARRAY_FULL_SINGLE:
+                logging.error(_('Active array is not a Float32 array -- Please change it to Float32 before mapping'))
+                return
+
             vals = self.active_array.get_unique_values()
 
             if self._walous_layer is None:
 
                 if vals[0] > 10:
-                    self._walous_layer = 'MAJ_NIV2'
+                    self._walous_layer = 'UTS_MAJ_NIV2'
                 else:
-                    self._walous_layer = 'MAJ_NIV1'
+                    self._walous_layer = 'UTS_MAJ_NIV1'
 
             dlg = DlgMapWalous2Manning(self, which=self._walous_layer)
 
@@ -5370,112 +5639,98 @@ class WolfMapViewer(wx.Frame):
             logging.error(_('Please install opencv-python'))
             return
 
-        if fn=='':
-            dlg = wx.FileDialog(parent   = None,
-                                message  = _('Choose file name'),
-                                wildcard = 'AVI video file (*.avi)|*.avi',
-                                style    = wx.FD_SAVE)
-            ret = dlg.ShowModal()
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-            fn = dlg.GetPath()
-            dlg.Destroy()
-
-        if not fn.endswith('.avi'):
-            fn+='.avi'
-
-        if framerate<1:
-            dlg = wx.NumberEntryDialog(None, _("Frame rate [nb_images/second]"), _('Frame rate'), _('Frame rate'), 24, 1, 100)
-
-            ret = dlg.ShowModal()
-
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
+        dlg = Sim_VideoCreation(None, title = _('Video creation'), sim= self.active_res2d, mapviewer=self)
 
-            framerate = int(dlg.GetValue())
+        ret = dlg.ShowModal()
+        if ret == wx.ID_CANCEL:
             dlg.Destroy()
+            return
 
+        fn, framerate, start_step, end_step, interval, fontsize, fontcolor, timeposition = dlg.get_values()
+        dlg.Destroy()
 
         times,steps = self.active_res2d.get_times_steps()
 
-        el_time = str(timedelta(seconds=int(times[self.active_res2d.current_result])))
-
-        fig:Figure
-        fig, ax = self.get_mpl_plot([self.mousex, self.mousey],
-                                    self.width,
-                                    self.height,
-                                    title=_('Current time {:0>8} s'.format(el_time)),
-                                    toshow=False)
-
-        video = cv2.VideoWriter(fn, cv2.VideoWriter_fourcc(*'XVID'), framerate, fig.canvas.get_width_height())
-
-        nb = self.active_res2d.get_nbresults()
-        cid = max(self.active_res2d.current_result,1)
-
-        self.active_res2d.mypal.automatic=False
-
-        if start_step==0:
-            dlg = wx.NumberEntryDialog(None, _("First step"), _('From'), _('from'), cid, 1, nb)
-
-            ret = dlg.ShowModal()
+        framesize = (int(self.canvaswidth), int(self.canvasheight))
+        video = cv2.VideoWriter(fn, cv2.VideoWriter_fourcc(*'XVID'), framerate, framesize)
 
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-
-            start_step = int(dlg.GetValue())
-            dlg.Destroy()
-
-        if end_step==0:
-            dlg = wx.NumberEntryDialog(None, _("Final step"), _('To'), _('To'), nb, 1, nb)
-
-            ret = dlg.ShowModal()
-
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
-
-            end_step = int(dlg.GetValue())
-            dlg.Destroy()
-
-        if every==0:
-            dlg = wx.NumberEntryDialog(None, _("Interval"), _('Interval'), _('Interval'), 1, 1, end_step-start_step)
-
-            ret = dlg.ShowModal()
-
-            if ret == wx.ID_CANCEL:
-                dlg.Destroy()
-                return
+        el_time = str(timedelta(seconds=int(times[self.active_res2d.current_result])))
 
-            interval = int(dlg.GetValue())
-            dlg.Destroy()
+        zones_time = Zones(mapviewer=self)
+        self.add_object('vector', newobj=zones_time, ToCheck=True, id='__VideoTime__')
+        zone_time = zone(name='Time')
+        vec_time = vector(name='Time')
+
+        zones_time.add_zone(zone_time, forceparent=True)
+        zone_time.add_vector(vec_time, forceparent=True)
+
+        if timeposition == 'top-center':
+            x = (self.xmax+self.xmin)/2.
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'bottom-center':
+            x = (self.xmax+self.xmin)/2.
+            y = self.ymin + 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'top-left':
+            x = self.xmin + 0.15*(self.xmax-self.xmin)
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'bottom-left':
+            x = self.xmin + 0.15*(self.xmax-self.xmin)
+            y = self.ymin + 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'top-right':
+            x = self.xmax - 0.15*(self.xmax-self.xmin)
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
+        elif timeposition == 'bottom-right':
+            x = self.xmax - 0.15*(self.xmax-self.xmin)
+            y = self.ymin + 0.05*(self.ymax-self.ymin)
+        else:
+            x = (self.xmax+self.xmin)/2.
+            y = self.ymax - 0.05*(self.ymax-self.ymin)
 
-        self.read_one_result(start_step)
+        vec_time.add_vertex(wolfvertex(x,y))
+        vec_time.set_legend_position(x,y)
+        vec_time.set_legend_text('Time {:0>8} s'.format(el_time))
+        vec_time.set_legend_visible(True)
+        vec_time.myprop.legendfontsize = fontsize
+        vec_time.myprop.legendcolor = getIfromRGB(fontcolor)
 
         for curmodel in self.iterator_over_objects(draw_type.RES2D):
             curmodel: Wolfresults_2D
             curmodel.step_interval_results = interval
 
-        for idx in tqdm(range(start_step, end_step, interval)):
+        all_steps = range(0, int((end_step-start_step) // interval) + 1)
+
+        pgbar = wx.ProgressDialog(_('Video creation'),
+                                  _('Creating video...'),
+                                    maximum = len(all_steps),
+                                    parent = None,
+                                    style = wx.PD_APP_MODAL | wx.PD_ELAPSED_TIME | wx.PD_ESTIMATED_TIME | wx.PD_REMAINING_TIME)
+        pgbar.Show()
 
-            image = Image.frombytes('RGB', fig.canvas.get_width_height(),fig.canvas.tostring_rgb())
+        self.read_one_result(start_step-1)
+        for idx in tqdm(all_steps, desc=_('Creating video')):
+
+            image = self.get_canvas_as_image()
 
             video.write(cv2.cvtColor(np.asarray(image),cv2.COLOR_RGB2BGR))
 
             self.simul_next_step()
 
             el_time = str(timedelta(seconds=int(times[self.active_res2d.current_result])))
+            vec_time.set_legend_text('Time {:0>8} s'.format(el_time))
+
+            if not pgbar.WasCancelled():
+                pgbar.Update(idx)
+            else:
+                break
 
-            self.display_canvasogl(fig=fig,
-                                   ax=ax[0],
-                                   title=_('Current time {:0>8} s'.format(el_time)))
+        pgbar.Destroy()
+        video.release()
 
         for curmodel in self.iterator_over_objects(draw_type.RES2D):
             curmodel: Wolfresults_2D
             curmodel.step_interval_results = 1
 
+        self.removeobj_from_id('__VideoTime__')
 
     def get_canvas_as_image(self) -> Image.Image:
         """
@@ -5493,7 +5748,11 @@ class WolfMapViewer(wx.Frame):
 
             return myimage
 
-    def copy_canvasogl(self, mpl:bool= True, ds:float= 0., figsizes= [10.,10.], palette:wolfpalette = None):
+    def copy_canvasogl(self,
+                       mpl:bool= True,
+                       ds:float= 0.,
+                       figsizes= [10.,10.],
+                       palette:wolfpalette = None):
         """
         Generate image based on UI context and copy to the Clipboard
 
@@ -5811,7 +6070,7 @@ class WolfMapViewer(wx.Frame):
                 'Opengl setcurrent -- maybe a conflict with an existing opengl32.dll file - please rename the opengl32.dll in the libs directory and retry')
 
     def reporting(self, dir=''):
-        """ Firsdt attempr to create a reporting.
+        """ First attempt to create a reporting.
         !! Must be improved !!
         """
         if dir == '':
@@ -6940,6 +7199,14 @@ class WolfMapViewer(wx.Frame):
 
         """
 
+        msg = _('This function will force a null border of 1 cell on each array to avoid issues with the contouring algorithm')
+        dlg = wx.MessageDialog(None, msg, _('Warning'), wx.OK | wx.CANCEL | wx.ICON_WARNING)
+        result = dlg.ShowModal()
+        dlg.Destroy()
+        if result != wx.ID_OK:
+            logging.info(_('Operation cancelled by user'))
+            return None
+
         # création de l'instance de Zones
         new_zones = Zones(idx = 'contour' if id is None else id.lower(), mapviewer=self)
 
@@ -6948,6 +7215,7 @@ class WolfMapViewer(wx.Frame):
             if isinstance(curarray, WolfArray):
 
                 curarray.nullify_border(1)
+                curarray.reset_plot()
 
                 new_zone = zone(name = curarray.idx)
                 new_zones.add_zone(new_zone, forceparent=True)
@@ -8295,6 +8563,9 @@ class WolfMapViewer(wx.Frame):
     def read_one_result(self, which:int):
         """
         Lecture d'un résultat spécific pour les modèles ajoutés et plottés
+
+        :param which: result index (0-based) -- -1 for last result
+        0 = first result
         """
         self.currently_readresults = True
 
@@ -9597,7 +9868,7 @@ class WolfMapViewer(wx.Frame):
         elif itemlabel == _("Add distances to viewer..."):
 
             if self._distances is not None:
-                self.add_object('vector', newobj=self._distances, ToCheck=True, id='Distances')
+                self.add_object('vector', newobj=self._distances, ToCheck=True, id='Distances',)
 
         elif itemlabel == _("Create bridge and export gltf..."):
 

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 2
-        self.patch = 40
+        self.patch = 42
 
     def __str__(self):