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

wolfhece/PyDraw.py

@@ -262,7 +262,7 @@ class Memory_Views_GUI(wx.Frame):
     def __init__(self, parent, title, memory_views:Memory_Views, mapviewer:"WolfMapViewer"):
         """ Constructor """
 
-        super(Memory_Views_GUI, self).__init__(parent, title=title, size=(200, 400), style = wx.DEFAULT_FRAME_STYLE & ~ (wx.RESIZE_BORDER | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX | wx.CLOSE_BOX))
+        super(Memory_Views_GUI, self).__init__(parent, title=title, size=(200, 400), style = wx.DEFAULT_FRAME_STYLE & ~ (wx.RESIZE_BORDER | wx.MAXIMIZE_BOX | wx.MINIMIZE_BOX))
         self.mapviewer = mapviewer
         self._memory_views = memory_views
 
@@ -1241,6 +1241,7 @@ class WolfMapViewer(wx.Frame):
         self.menuwalous = None
         self.timer_ps = None
         self.menusim2D  = None
+        self.menusim2D_GPU = None
         self.menulaz    = None
         self.menutiles  = None
 
@@ -1267,14 +1268,31 @@ class WolfMapViewer(wx.Frame):
 
         # SIMULATION 2D
 
-        sim2d = self.filemenu.Append(wx.ID_ANY, _('Create/Open multiblock model'), _('Create or open a multiblock model in the viewer --> CPU/Fortran Wolf2D model'))
-        check2D = self.filemenu.Append(wx.ID_ANY, _('Check headers'), _('Check the header .txt files from an existing 2D CPU simulation'))
+        self.menu_sim2d = wx.Menu()
+        self.menu_sim2d_cpu = wx.Menu()
+        self.menu_sim2d_gpu = wx.Menu()
+        self.menu_sim1d = wx.Menu()
+
+        sim2d = self.menu_sim2d_cpu.Append(wx.ID_ANY, _('Create/Open multiblock model'), _('Create or open a multiblock model in the viewer --> CPU/Fortran Wolf2D model'))
+        check2D = self.menu_sim2d_cpu.Append(wx.ID_ANY, _('Check headers'), _('Check the header .txt files from an existing 2D CPU simulation'))
+
+        sim2dgpu = self.menu_sim2d_gpu.Append(wx.ID_ANY, _('Create/Open GPU model'), _('Create or open a GPU model in the viewer --> GPU Wolf2D model'))
+
+        create1Dmodel = self.menu_sim1d.Append(wx.ID_ANY, _('Create Wolf1D...'),('Create a 1D model using crossections, vectors and arrays...'))
 
-        self.filemenu.AppendSeparator()
+
+        self.menu_sim2d.Append(wx.ID_ANY,_('2D GPU'),self.menu_sim2d_gpu)
+        self.menu_sim2d.Append(wx.ID_ANY,_('2D CPU'),self.menu_sim2d_cpu)
+        self.filemenu.Append(wx.ID_ANY,_('2D Model'),self.menu_sim2d)
+        self.filemenu.Append(wx.ID_ANY,_('1D Model'),self.menu_sim1d)
+
+        # self.filemenu.AppendSeparator()
 
         # SIMULATION Hydrologique
 
-        hydrol = self.filemenu.Append(wx.ID_ANY, _('Open hydrological model'), _('Hydrological simulation'))
+        self.menu_hydrology = wx.Menu()
+        hydrol = self.menu_hydrology.Append(wx.ID_ANY, _('Open Hydrological model'), _('Hydrological simulation'))
+        self.filemenu.Append(wx.ID_ANY,_('Hydrology'),self.menu_hydrology)
 
         self.filemenu.AppendSeparator()
 
@@ -1302,7 +1320,6 @@ class WolfMapViewer(wx.Frame):
         createscenario2D = self.menucreateobj.Append(wx.ID_ANY, _('Create scenarios manager ...'), _('New scenarios manager 2D'))
         createbcmanager2D = self.menucreateobj.Append(wx.ID_ANY, _('Create BC manager Wolf2D...'), _('New BC manager 2D'))
         createpartsystem = self.menucreateobj.Append(wx.ID_ANY, _('Create particle system...'), _('Create a particle system - Lagrangian view'))
-        create1Dmodel = self.menucreateobj.Append(wx.ID_ANY, _('Create Wolf1D...'),('Create a 1D model using crossections, vectors and arrays...'))
         create_acceptability = self.menucreateobj.Append(wx.ID_ANY, _('Create acceptability manager...'), _('Create acceptability manager'))
 
         self.filemenu.AppendSeparator()
@@ -1395,10 +1412,19 @@ class WolfMapViewer(wx.Frame):
                                            _("Apply mask from sim2D"))
         filterinund = self.analyzemenu.Append(wx.ID_ANY, _("Filter inundation arrays..."),
                                            _("Filter arrays"))
-        plotqvect = self.analyzemenu.Append(wx.ID_ANY, _("Integrate Q along active vector..."),
-                                           _("Integrate Q along the active vector"))
-        plotqvect = self.analyzemenu.Append(wx.ID_ANY, _("Integrate Q along active zone..."),
-                                           _("Integrate Q along the active zone"))
+        # Plot hydrographs
+        self.menuHydrographs = wx.Menu()
+        self.analyzemenu.Append(wx.ID_ANY,_('Integrate Q...'),self.menuHydrographs)
+        plotqvect = self.menuHydrographs.Append(wx.ID_ANY, _("Plot integrated Q along active vector..."),
+                                           _("Integrate Q along the active vector and plot"))
+        plotqvect = self.menuHydrographs.Append(wx.ID_ANY, _("Plot integrated Q along active zone..."),
+                                           _("Integrate Q along the active zone and plot"))
+        self.menuHydrographs.AppendSeparator()
+        exportqvect = self.menuHydrographs.Append(wx.ID_ANY, _("Export integrated Q along active vector..."),
+                                             _("Integrate Q along the active vector and export"))
+        exportqvect = self.menuHydrographs.Append(wx.ID_ANY, _("Export integrated Q along all vectors in active zone..."),
+                                                _("Integrate Q along ALL VECTORS of the active zone and export"))
+
         plothselect = self.analyzemenu.Append(wx.ID_ANY, _("Plot stats unknown (selected nodes)..."),
                                            _("Compute stats and plot on the selected nodes"))
         plothvector = self.analyzemenu.Append(wx.ID_ANY, _("Plot stats unknown (inside active vector)..."),
@@ -1634,6 +1660,13 @@ class WolfMapViewer(wx.Frame):
 
         newview = Wolf2DModel(splash = False)
 
+    def create_2D_GPU_model(self):
+        """ Create a 2D GPU model """
+
+        from .PyGui import Wolf2DGPUModel
+
+        newview = Wolf2DGPUModel(splash = False)
+
     def check_2D_MB_headers(self):
         """ Check headers of a 2D simulation without opening viewer"""
 
@@ -2707,8 +2740,41 @@ class WolfMapViewer(wx.Frame):
 
             self.menusim2D.Bind(wx.EVT_MENU, self.Onmenusim2D)
 
+    def menu_sim2DGPU(self):
+        """ Menu for 2D GPU simulations """
+
+        if self.menusim2D_GPU is None:
+            self.menusim2D_GPU = wx.Menu()
+            self.menubar.Append(self.menusim2D_GPU, _('Tools 2D GPU'))
+
+            menu2dGPU_options = self.menusim2D_GPU.Append(wx.ID_ANY, _("Parameters..."), _("Parameters"))
+
+            self.menusim2D_GPU.Bind(wx.EVT_MENU, self.Onmenusim2DGPU)
+
+    def Onmenusim2DGPU(self, event: wx.MenuEvent):
+        """ Action to perform when menu 2D GPU entry is selected """
+
+        id = event.GetId()
+        item = self.menubar.FindItemById(event.GetId())
+
+        if item is None:
+            return
+
+        itemlabel = item.ItemLabel
+
+        from .PyGui import Wolf2DGPUModel
+
+        if not isinstance(self.wolfparent, Wolf2DGPUModel):
+            logging.error(_('This is not a 2D GPUmodel'))
+            return
+
+        self.wolfparent:Wolf2DGPUModel
+
+        if itemlabel == _("Parameters..."):
+            self.wolfparent.show_properties()
+
     def Onmenusim2D(self, event: wx.MenuEvent):
-        """ Action to perform whern menu 2D entry is selected """
+        """ Action to perform when menu 2D entry is selected """
 
         id = event.GetId()
         item = self.menubar.FindItemById(event.GetId())
@@ -5648,7 +5714,7 @@ class WolfMapViewer(wx.Frame):
             self.check_for_updates()
             autoscale = False
 
-        elif itemlabel == _("Integrate Q along active vector..."):
+        elif itemlabel == _("Plot integrated Q along active vector..."):
             """ Integrate Q along active vector """
             autoscale = False
 
@@ -5662,7 +5728,7 @@ class WolfMapViewer(wx.Frame):
 
             self.active_res2d.plot_q(self.active_vector, 'border', toshow=True)
 
-        elif itemlabel == _("Integrate Q along active zone..."):
+        elif itemlabel == _("Plot integrated Q along active zone..."):
             """ Integrate Q along active zone """
             autoscale = False
 
@@ -5676,6 +5742,116 @@ class WolfMapViewer(wx.Frame):
 
             self.active_res2d.plot_q(self.active_zone.myvectors, ['border'] * self.active_zone.nbvectors, toshow=True)
 
+        elif itemlabel == _("Export integrated Q along active vector..."):
+            autoscale = False
+
+            if self.active_vector is None:
+                logging.warning(_('No active vector !'))
+                return
+            
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+            
+            filterArray = ".csv (*.csv)|*.csv|all (*.*)|*.*"
+            fdlg = wx.FileDialog(self, "Choose file name : ", wildcard=filterArray,
+                                    style=wx.FD_SAVE)
+            ret = fdlg.ShowModal()
+            hydrographCSVPath = None
+            if ret == wx.ID_OK:
+                curfil = fdlg.GetFilterIndex()
+
+                hydrographCSVPath = fdlg.GetPath()
+
+            fdlg.Destroy()
+        
+            if hydrographCSVPath is not None:
+                # Create a progress dialog
+                progress_dialog = wx.ProgressDialog(
+                    _("Export Progress"),
+                    _("Exporting hydrographs..."),
+                    maximum=100,
+                    parent=self,
+                    style= wx.PD_AUTO_HIDE | wx.PD_APP_MODAL | wx.PD_ELAPSED_TIME
+                )
+
+                def update_progress(progress):
+                    progress_dialog.Update(progress)
+
+                try:
+                    # Call the export function, passing the progress callback
+                    status = self.active_res2d.export_hydrographs(
+                        vect=self.active_vector,
+                        filename=hydrographCSVPath,
+                        progress_callback=update_progress
+                    )
+                finally:
+                    progress_dialog.Destroy()  # Ensure dialog is destroyed even if an error occurs
+
+                # Inform the user about the result
+                if status:
+                    wx.MessageBox(_("Hydrographs exported successfully"), _("Export Hydrographs"), wx.OK | wx.ICON_INFORMATION)
+                    logging.info(_('Hydrographs exported successfully'))
+                else:
+                    wx.MessageBox(_("Error exporting hydrographs"), _("Export Hydrographs"), wx.OK | wx.ICON_ERROR)
+                    logging.error(_('Error exporting hydrographs'))
+
+        
+        elif itemlabel == _("Export integrated Q along all vectors in active zone..."):
+            autoscale = False
+
+            if self.active_zone is None:
+                logging.warning(_('No active zone !'))
+                return
+            
+            if self.active_res2d is None:
+                logging.warning(_('No active 2D result !'))
+                return
+            
+            filterArray = ".csv (*.csv)|*.csv|all (*.*)|*.*"
+            fdlg = wx.FileDialog(self, "Choose file name : ", wildcard=filterArray,
+                                    style=wx.FD_SAVE)
+            ret = fdlg.ShowModal()
+            hydrographCSVPath = None
+            if ret == wx.ID_OK:
+                curfil = fdlg.GetFilterIndex()
+
+                hydrographCSVPath = fdlg.GetPath()
+
+            fdlg.Destroy()
+
+            if hydrographCSVPath is not None:
+                # Create a progress dialog
+                progress_dialog = wx.ProgressDialog(
+                    _("Export Progress"),
+                    _("Exporting hydrographs..."),
+                    maximum=100,
+                    parent=self,
+                    style= wx.PD_AUTO_HIDE | wx.PD_APP_MODAL | wx.PD_ELAPSED_TIME
+                )
+
+                def update_progress(progress):
+                    progress_dialog.Update(progress)
+
+                try:
+                    # Call the export function, passing the progress callback
+                    status = self.active_res2d.export_hydrographs(
+                        vect=self.active_zone,
+                        filename=hydrographCSVPath,
+                        progress_callback=update_progress
+                    )
+                finally:
+                    progress_dialog.Destroy()  # Ensure dialog is destroyed even if an error occurs
+
+                # Inform the user about the result
+                if status:
+                    wx.MessageBox(_("Hydrographs exported successfully"), _("Export Hydrographs"), wx.OK | wx.ICON_INFORMATION)
+                    logging.info(_('Hydrographs exported successfully'))
+                else:
+                    wx.MessageBox(_("Error exporting hydrographs"), _("Export Hydrographs"), wx.OK | wx.ICON_ERROR)
+                    logging.error(_('Error exporting hydrographs'))
+        
+
         elif itemlabel == _("Plot stats unknown (selected nodes)..."):
             autoscale = False
 
@@ -6301,7 +6477,11 @@ class WolfMapViewer(wx.Frame):
 
             self.create_2D_MB_model()
 
-        elif itemlabel == _('Open hydrological model'):
+        elif itemlabel == _('Create/Open GPU model'):
+
+            self.create_2D_GPU_model()
+
+        elif itemlabel == _('Open Hydrological model'):
 
             self.open_hydrological_model()
 
@@ -6649,7 +6829,7 @@ class WolfMapViewer(wx.Frame):
             fnpos = dlg.GetPath()
             dlg.Destroy()
 
-            choices = ["matplotlib", "scipy", "pyvista"]
+            choices = ["matplotlib", "scipy"] #, "pyvista"]
             dlg = wx.SingleChoiceDialog(None, _("Pick an interpolation method"), _("Choices"), choices)
             ret = dlg.ShowModal()
             if ret == wx.ID_CANCEL:
@@ -8008,7 +8188,11 @@ class WolfMapViewer(wx.Frame):
             return [curobj.idx for curobj in self._get_list(drawing_type) if curobj.plotted == checked_state]
 
     def get_list_objects(self, drawing_type:draw_type, checked_state:bool=True):
-        """ Create a list of objects of type draw_type """
+        """ Create a list of objects of type draw_type
+
+        :param drawing_type: type of object to search
+        :param checked_state: if True/False, return only objects that are plotted or not. None return all objects.
+        """
 
         if checked_state is None:
             return [curobj for curobj in self._get_list(drawing_type)]