wolfhece 2.0.23__py3-none-any.whl → 2.0.25__py3-none-any.whl

wolfhece/PyCrosssections.py

@@ -1677,6 +1677,7 @@ class crosssections(Element_To_Draw):
         - WOLF sxy --> format ='sxy'
 
     L'objet stocke ses informations dans un dictionnaire : self.myprofiles
+
     Les clés de chaque entrée sont:
         - ['index']   : integer
         - ['left']    : wolfvertex
@@ -1687,13 +1688,14 @@ class crosssections(Element_To_Draw):
     Pour le moment, il est possible de lire les fichiers et d'effectuer cerrains traitements (tri selon vecteur, export gltf...).
 
     Une instance de cet objet peut être ajouté à une instance graphique WOLF pour affichage.
+
     Pour ce faire:
         - une propriété "myzones" de type "Zones" est présente pour stocker les sections sous forme WOLF "ZONES/ZONE/VECTOR/VERTICES". --> "crosssections" n'est donc pas une extension de "Zones" !!
         - deux instances de "cloud_vertices" contiennent les vertices des sections :
             - cloud
             - cloud_all
 
-    @remark !! La classe n'est pas encore prévue pour créer des sections en travers!!
+    :remark !! La classe n'est pas encore prévue pour créer des sections en travers!!
 
     """
 

wolfhece/PyDraw.py

@@ -63,7 +63,7 @@ from . import Lidar2002
 try:
     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
 except:
-    logging.warning(_('Hydrometry HECE module not found - Load hydrometry instead of hydrometry_hece'))
+    logging.debug(_('Hydrometry HECE module not found - Load hydrometry instead of hydrometry_hece'))
     from .hydrometry.kiwis import hydrometry
 
 from .pyshields import get_d_cr
@@ -897,6 +897,36 @@ class WolfMapViewer(wx.Frame):
         else:
             return None
 
+    @property
+    def bkg_color(self):
+        """ Return the background color from configs """
+        config = self.get_configuration()
+        if config is None:
+            return [255.,255.,255.,255.]
+        else:
+            return config[ConfigurationKeys.COLOR_BACKGROUND]
+
+    @property
+    def ticks_size(self) -> float:
+        """ Return the ticks spacing from configs """
+
+        config = self.get_configuration()
+        if config is None:
+            return 100.
+        else:
+            return config[ConfigurationKeys.TICKS_SIZE]
+
+    @property
+    def ticks_bounds(self) -> bool:
+        """ Return the ticks bounds from configs """
+
+        config = self.get_configuration()
+        if config is None:
+            return True
+        else:
+            return config[ConfigurationKeys.TICKS_BOUNDS]
+
+
     def GlobalOptionsDialog(self, event):
         handle_configuration_dialog(self, self.get_configuration())
 
@@ -1060,7 +1090,7 @@ class WolfMapViewer(wx.Frame):
 
                 if mpl:
                     if ds == 0.:
-                        ds = self.get_configuration()[ConfigurationKeys.TICKS_SIZE]
+                        ds = self.ticks_size
                         # dlg = wx.NumberEntryDialog(self,
                         #                         _("xmin : {:.3f} \nxmax : {:.3f} \nymin : {:.3f} \nymax : {:.3f} \n\n  dx : {:.3f}\n  dy : {:.3f}").format(
                         #                             self.xmin, self.xmax, self.ymin, self.ymax, self.xmax - self.xmin,
@@ -1106,13 +1136,13 @@ class WolfMapViewer(wx.Frame):
                         y2 -= ds
 
                     x_label_list = np.linspace(x1, x2, int((x2 - x1) / ds) + 1, True)
-                    if self.get_configuration()[ConfigurationKeys.TICKS_BOUNDS]:
+                    if self.ticks_bounds:
                         x_label_list = np.insert(x_label_list, 0, self.xmin)
                         x_label_list = np.insert(x_label_list, -1, self.xmax)
                         x_label_list = np.unique(x_label_list)
 
                     y_label_list = np.linspace(y1, y2, int((y2 - y1) / ds) + 1, True)
-                    if self.get_configuration()[ConfigurationKeys.TICKS_BOUNDS]:
+                    if self.ticks_bounds:
                         y_label_list = np.insert(y_label_list, 0, self.ymin)
                         y_label_list = np.insert(y_label_list, -1, self.ymax)
                         y_label_list = np.unique(y_label_list)
@@ -1213,7 +1243,7 @@ class WolfMapViewer(wx.Frame):
 
             if mpl:
                 if ds ==0.:
-                    ds = self.get_configuration()[ConfigurationKeys.TICKS_SIZE]
+                    ds = self.ticks_size
 
                 extent = (self.xmin, self.xmax, self.ymin, self.ymax)
 
@@ -1233,13 +1263,13 @@ class WolfMapViewer(wx.Frame):
                     y2 -= ds
 
                 x_label_list = np.linspace(x1,x2, int((x2-x1)/ds) +1, True)
-                if self.get_configuration()[ConfigurationKeys.TICKS_BOUNDS]:
+                if self.ticks_bounds:
                     x_label_list = np.insert(x_label_list,0,self.xmin)
                     x_label_list = np.insert(x_label_list,-1, self.xmax)
                     x_label_list = np.unique(x_label_list)
 
                 y_label_list = np.linspace(y1, y2, int((y2 - y1) / ds) + 1, True)
-                if self.get_configuration()[ConfigurationKeys.TICKS_BOUNDS]:
+                if self.ticks_bounds:
                     y_label_list = np.insert(y_label_list, 0, self.ymin)
                     y_label_list = np.insert(y_label_list, -1, self.ymax)
                     y_label_list = np.unique(y_label_list)
@@ -3247,7 +3277,8 @@ class WolfMapViewer(wx.Frame):
                         self.active_res2d.sediment_diameter = diamsize
                         self.active_res2d.sediment_density = density
                         self.active_res2d.load_default_colormap('shields_cst')
-                    self.active_res2d.set_currentview(method, True)
+
+                    self.active_res2d.set_currentview(method, force_wx = True, force_updatepal = True)
                 else:
                     for curarray in self.iterator_over_objects(draw_type.RES2D):
                         curarray:Wolfresults_2D
@@ -3255,7 +3286,8 @@ class WolfMapViewer(wx.Frame):
                             curarray.sediment_diameter = diamsize
                             curarray.sediment_density  = density
                             curarray.load_default_colormap('shields_cst')
-                        curarray.set_currentview(method)
+
+                        curarray.set_currentview(method, force_wx = True, force_updatepal = True)
 
             else:
                 if self.active_res2d is not None:
@@ -3263,7 +3295,7 @@ class WolfMapViewer(wx.Frame):
                         self.active_res2d.sediment_diameter = diamsize
                         self.active_res2d.sediment_density = density
                         self.active_res2d.load_default_colormap('shields_cst')
-                    self.active_res2d.set_currentview(method, True)
+                    self.active_res2d.set_currentview(method, force_wx = True, force_updatepal = True)
 
             if self.compare_results is not None:
                 self.compare_results.update_type_result(method)
@@ -3587,6 +3619,8 @@ class WolfMapViewer(wx.Frame):
 
         elif itemlabel == _('Set comparison'):
 
+            # Comparaison de deux résultats ou de deux matrices
+
             self.compare_results = Compare_Arrays_Results(self, True, True)
 
             add_elt = True
@@ -3600,151 +3634,6 @@ class WolfMapViewer(wx.Frame):
 
             self.compare_results.bake()
 
-            # return
-
-            # dlg = wx.SingleChoiceDialog(None,_('Do you want to compare arrays or modelling results?'), _('Array or 2D Model'), [_('Arrays'), _('2D Modelling'), _('2D Modelling GPU')])
-            # ret = dlg.ShowModal()
-
-            # if ret == wx.ID_CANCEL:
-            #     dlg.Destroy()
-            #     return
-
-            # keyvalue = dlg.GetStringSelection()
-            # dlg.Destroy()
-
-            # dlg = wx.MessageDialog(None,_('Do you want to share the colormap ?'), _('Share colormap'), style = wx.YES_NO)
-            # ret = dlg.ShowModal()
-
-            # sharecmap = ret == wx.ID_YES
-            # dlg.Destroy()
-
-            # if keyvalue == _('Arrays'):
-            #     ListArrays = []
-            #     filterArray = "bin (*.bin)|*.bin|Elevation WOLF2D (*.top)|*.top|Geotif (*.tif)|*.tif|Float ESRI (*.flt)|*.flt|Numpy (*.npy)|*.npy|Numpy named arrays(*.npz)|*.npz|all (*.*)|*.*"
-
-            #     # filterProject = "Array (*.bin)|*.bin|all (*.*)|*.*"
-            #     file = wx.FileDialog(self, "Choose Source file", wildcard=filterArray)
-            #     if file.ShowModal() == wx.ID_CANCEL:
-            #         file.Destroy()
-            #         return
-            #     else:
-            #         # récuparétaion du nom de fichier avec chemin d'accès
-            #         ListArrays.append(file.GetPath())
-            #         file.Destroy()
-
-            #     file = wx.FileDialog(self, _("Choose Comparison file"), wildcard=filterArray)
-            #     if file.ShowModal() == wx.ID_CANCEL:
-            #         file.Destroy()
-            #         return
-            #     else:
-            #         # récuparétaion du nom de fichier avec chemin d'accès
-            #         ListArrays.append(file.GetPath())
-            #         file.Destroy()
-
-            #     first = WolfArray(ListArrays[0], preload=False)
-            #     sec = WolfArray(ListArrays[1], preload=False)
-            #     first.read_txt_header()
-            #     sec.read_txt_header()
-
-            #     if first.nbx == sec.nbx and first.nby == sec.nby and first.origx == sec.origx and first.origy == sec.origy:
-            #         first.preload = True
-            #         sec.preload = True
-            #         first.read_data()
-            #         sec.read_data()
-            #         first.mask_data(0.)
-            #         sec.mask_data(0.)
-            #         self.set_compare([first, sec], share_colormap=sharecmap)
-            #     else:
-            #         logging.error(_('Arrays have different dimensions !'))
-
-            # elif keyvalue == _('2D Modelling') or keyvalue == _('2D Modelling GPU'):
-
-            #     if len(self.compare_results) == 2:
-
-            #         dlg = wx.MessageDialog(None,_('Models have already been chosen ? \n\n 1. {} \n\n 2. {} \n\n Use them ? '.format(self.compare_results[0], self.compare_results[1])), _('Result'), style = wx.YES_NO)
-            #         ret = dlg.ShowModal()
-            #         dlg.Destroy()
-
-            #         if ret == wx.ID_NO:
-            #             self.compare_results = []
-
-            #     if len(self.compare_results) == 0:
-
-            #         filterProject = "all (*.*)|*.*"
-            #         file = wx.FileDialog(self, "Choose Source model", wildcard=filterProject)
-
-            #         if file.ShowModal() == wx.ID_CANCEL:
-            #             file.Destroy()
-            #             return
-            #         else:
-            #             # récuparétaion du nom de fichier avec chemin d'accès
-            #             self.compare_results.append(file.GetPath())
-            #             file.Destroy()
-
-            #         file = wx.FileDialog(self, _("Choose Comparison model"), wildcard=filterProject)
-            #         if file.ShowModal() == wx.ID_CANCEL:
-            #             file.Destroy()
-            #             return
-            #         else:
-            #             # récuparétaion du nom de fichier avec chemin d'accès
-            #             self.compare_results.append(file.GetPath())
-            #             file.Destroy()
-
-            #     if keyvalue == _('2D Modelling GPU'):
-
-            #         def check_file(file):
-
-            #             file = Path(file)
-            #             if (file.parent / 'simul_gpu_results').exists():
-            #                 file = file.parent / 'simul_gpu_results'
-            #             elif (file.parent.parent / 'simul_gpu_results').exists():
-            #                 file = file.parent.parent / 'simul_gpu_results'
-            #             else:
-            #                 logging.error(_('File {} does not contain GPU results !'.format(file)))
-            #                 return False, file
-
-            #             return True, file
-
-            #         check, file = check_file(self.compare_results[0])
-            #         if check:
-            #             self.compare_results[0] = file
-            #         else:
-            #             return
-
-            #         check, file = check_file(self.compare_results[1])
-            #         if check:
-            #             self.compare_results[1] = file
-            #         else:
-            #             return
-
-            #         first = wolfres2DGPU(self.compare_results[0], plotted=False, gpu=True)
-            #         sec   = wolfres2DGPU(self.compare_results[1], plotted=False, gpu=True)
-            #     else:
-            #         first = Wolfresults_2D(self.compare_results[0], plotted=False)
-            #         sec   = Wolfresults_2D(self.compare_results[1], plotted=False)
-
-            #     def pick_res(sim:Wolfresults_2D):
-
-            #         times, steps = sim.get_times_steps()
-
-            #         dlg = wx.SingleChoiceDialog(None, _("Pick a result"), "Choices", [str(cur) for cur in times])
-            #         ret = dlg.ShowModal()
-
-            #         if ret == wx.ID_CANCEL:
-            #             idx = -1
-            #         else:
-            #             idx = [str(cur) for cur in times].index(dlg.GetStringSelection())
-
-            #         dlg.Destroy()
-
-            #         return idx
-
-            #     first.read_oneresult(pick_res(first))
-            #     sec.read_oneresult(pick_res(sec))
-
-            #     self.set_compare([first.as_WolfArray(), sec.as_WolfArray()],
-            #                      share_colormap=sharecmap)
-
         elif id == wx.ID_EXIT:
             dlg = wx.MessageDialog(None,_('Do you really want to quit?'), style = wx.YES_NO|wx.NO_DEFAULT)
             ret=dlg.ShowModal()
@@ -4129,6 +4018,7 @@ class WolfMapViewer(wx.Frame):
         return None
 
     def uniquecolormap(self, loadfromfile = False):
+        """ Compute unique colormap from all (arrays, 2D results) and apply it to all """
 
         workingarray=[]
         nbnotnull=0
@@ -7166,7 +7056,7 @@ class WolfMapViewer(wx.Frame):
 
         if self.canvas.SetCurrent(self.context):
 
-            bkg_color = self.get_configuration()[ConfigurationKeys.COLOR_BACKGROUND]
+            bkg_color = self.bkg_color
 
             glClearColor(bkg_color[0]/255., bkg_color[1]/255., bkg_color[2]/255., bkg_color[3]/255.)
             # glClearColor(0., 0., 1., 0)
@@ -7623,7 +7513,7 @@ class Compare_Arrays_Results():
         assert self.type in (Comp_Type.RES2D, Comp_Type.RES2D_GPU), 'This method is only for 2D results'
 
         for curelt in self.elements:
-            curelt.set_currentview(newtype)
+            curelt.set_currentview(newtype, force_updatepal = True)
 
         # remove elements
         for baselt, curelt, curmap in zip(self.elements, self.linked_elts, self.mapviewers):

wolfhece/PyGui.py

@@ -15,7 +15,7 @@ from .PyDraw import WolfMapViewer,imagetexture
 try:
     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
 except:
-    logging.warning(_('Hydrometry HECE module not found - Load hydrometry instead of hydrometry_hece'))
+    logging.debug(_('Hydrometry HECE module not found - Load hydrometry instead of hydrometry_hece'))
     from .hydrometry.kiwis import hydrometry
 
 from .PyConfig import WolfConfiguration, ConfigurationKeys
@@ -227,13 +227,6 @@ class HydrologyModel(GenMapManager):
 
         self.wx_exists = wx.App.Get() is not None # test if wx App is running
 
-        if self.wx_exists:
-            super(HydrologyModel, self).__init__(splash=splash, *args, **kw)
-        else:
-            if "splash" in kw and kw["splash"]:
-                raise Exception("You can't have the splash screen outside a GUI")
-
-
         self.SPWstations=SPWMIGaugingStations()
         self.DCENNstations=SPWDCENNGaugingStations()
 
@@ -245,77 +238,86 @@ class HydrologyModel(GenMapManager):
         else:
             self.mydir=normpath(dir)
 
+        if self.wx_exists:
+            super(HydrologyModel, self).__init__(splash=splash, *args, **kw)
+        else:
+            if "splash" in kw and kw["splash"]:
+                raise Exception("You can't have the splash screen outside a GUI")
+
         self.mydircharact=join(self.mydir,'Characteristic_maps\\Drainage_basin')
         self.mydirwhole=join(self.mydir,'Whole_basin\\')
 
         self.mycatchment = Catchment('Mysim',self.mydir,False,True)
         self.myexchanges = forced_exchanges(self.mydir)
 
-        self.mapviewer=GuiHydrology(title='Model : '+self.mydir)
-
-        self.files_hydrology_array={'Characteristic_maps':[
-            ('.b','Raw elevation [m]'),
-            ('corr.b','Corrected elevation [m]'),
-            #('diff.b','Corrections (corr-raw) [m]'),
-            ('.nap','Mask [-]'),
-            ('.sub','SubBasin index [-]'),
-            ('.cnv','Accumulation [km²]'),
-            ('.time','Total time [s]'),
-            ('.coeff','RunOff coeff [-]'),
-            ('.slope','Slope [-]'),
-            ('.reachs','Reach index [-]'),
-            ('.strahler','Strahler index [-]'),
-            ('.reachlevel','Reach accumulation [-]'),
-            ('.landuse1','Woodlands [m²]'),
-            ('.landuse2','Pastures [m²]'),
-            ('.landuse3','Cultivated [m²]'),
-            ('.landuse4','Pavements [m²]'),
-            ('.landuse5','Water [m²]'),
-            ('.landuse6','River [m²]'),
-            ('.landuse_limited_area','LandUse Verif'),
-            ('.principal_landuse_cropped','Principal landuse [-]'),
-            ('_encode.sub','Coded index SubB [-]')]}
-
-
-        self.files_hydrology_vectors={'Characteristic_maps':[('.delimit.vec','Watershed')],
-                                    'Whole_basin':[('Rain_basin_geom.vec','Rain geom'),
-                                                    ('Evap_basin_geom.vec','Evapotranspiration geom')]}
-
-        for curfile in self.files_hydrology_array['Characteristic_maps']:
-            curext=curfile[0]
-            curidx=curfile[1]
-            self.mapviewer.add_object(which='array',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
-
-        for curfile in self.files_hydrology_vectors['Characteristic_maps']:
-            curext=curfile[0]
-            curidx=curfile[1]
-            self.mapviewer.add_object(which='vector',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
-
-        for curfile in self.files_hydrology_vectors['Whole_basin']:
-            curext=curfile[0]
-            curidx=curfile[1]
-            if exists(self.mydirwhole+curext):
-                self.mapviewer.add_object(which='vector',filename=self.mydirwhole+curext,id=curidx,ToCheck=False)
-
-        self.mapviewer.add_object(which='vector',newobj=self.myexchanges.mysegs,id='Forced exchanges',ToCheck=False)
-        self.mapviewer.add_object(which='cloud',newobj=self.mycatchment.subBasinCloud,id='Local outlets',ToCheck=False)
-        self.mapviewer.add_object(which='cloud',newobj=self.myexchanges.mycloudup,id='Up nodes',ToCheck=False)
-        self.mapviewer.add_object(which='cloud',newobj=self.myexchanges.myclouddown,id='Down nodes',ToCheck=False)
-
-        self.mapviewer.add_object(which='other',newobj=self.SPWstations,ToCheck=False,id='SPW-MI stations')
-        self.mapviewer.add_object(which='other',newobj=self.DCENNstations,ToCheck=False,id='SPW-DCENN stations')
-
-        self.mapviewer.add_grid()
-        self.mapviewer.add_WMS()
-
-        self.mapviewer.findminmax(True)
-        self.mapviewer.Autoscale(False)
-
-        #Fichiers de paramètres
-        self.mainparams=Wolf_Param(self.mapviewer,filename=self.mydir+'\\Main_model.param',title="Model parameters",DestroyAtClosing=False)
-        self.basinparams=Wolf_Param(self.mapviewer,filename=self.mydircharact+'.param',title="Basin parameters",DestroyAtClosing=False)
-        self.mainparams.Hide()
-        self.basinparams.Hide()
+        if self.wx_exists:
+            self.mapviewer=GuiHydrology(title='Model : '+self.mydir, wolfparent=self, wxlogging=self.mylogs)
+            # self.setup_mapviewer(title='Wolf - Hydrology model', wolfparent=self)
+
+
+            self.files_hydrology_array={'Characteristic_maps':[
+                ('.b','Raw elevation [m]'),
+                ('corr.b','Corrected elevation [m]'),
+                #('diff.b','Corrections (corr-raw) [m]'),
+                ('.nap','Mask [-]'),
+                ('.sub','SubBasin index [-]'),
+                ('.cnv','Accumulation [km²]'),
+                ('.time','Total time [s]'),
+                ('.coeff','RunOff coeff [-]'),
+                ('.slope','Slope [-]'),
+                ('.reachs','Reach index [-]'),
+                ('.strahler','Strahler index [-]'),
+                ('.reachlevel','Reach accumulation [-]'),
+                ('.landuse1','Woodlands [m²]'),
+                ('.landuse2','Pastures [m²]'),
+                ('.landuse3','Cultivated [m²]'),
+                ('.landuse4','Pavements [m²]'),
+                ('.landuse5','Water [m²]'),
+                ('.landuse6','River [m²]'),
+                ('.landuse_limited_area','LandUse Verif'),
+                ('.principal_landuse_cropped','Principal landuse [-]'),
+                ('_encode.sub','Coded index SubB [-]')]}
+
+
+            self.files_hydrology_vectors={'Characteristic_maps':[('.delimit.vec','Watershed')],
+                                        'Whole_basin':[('Rain_basin_geom.vec','Rain geom'),
+                                                        ('Evap_basin_geom.vec','Evapotranspiration geom')]}
+
+            for curfile in self.files_hydrology_array['Characteristic_maps']:
+                curext=curfile[0]
+                curidx=curfile[1]
+                self.mapviewer.add_object(which='array',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
+
+            for curfile in self.files_hydrology_vectors['Characteristic_maps']:
+                curext=curfile[0]
+                curidx=curfile[1]
+                self.mapviewer.add_object(which='vector',filename=self.mydircharact+curext,id=curidx,ToCheck=False)
+
+            for curfile in self.files_hydrology_vectors['Whole_basin']:
+                curext=curfile[0]
+                curidx=curfile[1]
+                if exists(self.mydirwhole+curext):
+                    self.mapviewer.add_object(which='vector',filename=self.mydirwhole+curext,id=curidx,ToCheck=False)
+
+            self.mapviewer.add_object(which='vector',newobj=self.myexchanges.mysegs,id='Forced exchanges',ToCheck=False)
+            self.mapviewer.add_object(which='cloud',newobj=self.mycatchment.subBasinCloud,id='Local outlets',ToCheck=False)
+            self.mapviewer.add_object(which='cloud',newobj=self.myexchanges.mycloudup,id='Up nodes',ToCheck=False)
+            self.mapviewer.add_object(which='cloud',newobj=self.myexchanges.myclouddown,id='Down nodes',ToCheck=False)
+
+            self.mapviewer.add_object(which='other',newobj=self.SPWstations,ToCheck=False,id='SPW-MI stations')
+            self.mapviewer.add_object(which='other',newobj=self.DCENNstations,ToCheck=False,id='SPW-DCENN stations')
+
+            self.mapviewer.add_grid()
+            self.mapviewer.add_WMS()
+
+            self.mapviewer.findminmax(True)
+            self.mapviewer.Autoscale(False)
+
+            #Fichiers de paramètres
+            self.mainparams=Wolf_Param(self.mapviewer,filename=self.mydir+'\\Main_model.param',title="Model parameters",DestroyAtClosing=False)
+            self.basinparams=Wolf_Param(self.mapviewer,filename=self.mydircharact+'.param',title="Basin parameters",DestroyAtClosing=False)
+            self.mainparams.Hide()
+            self.basinparams.Hide()
 
 class Wolf2DModel(GenMapManager):
 

wolfhece/PyGuiHydrology.py

@@ -113,8 +113,9 @@ class selectpoint(wx.Frame):
 
 class GuiHydrology(WolfMapViewer):
 
-    def __init__(self, parent=None, title='MyForm', w=500, h=500):
-        super(GuiHydrology, self).__init__(parent, title=title, w=w, h=h)
+    def __init__(self, parent=None, title='MyForm', w=500, h=500, treewidth=200, wolfparent=None, wxlogging=None):
+        super(GuiHydrology, self).__init__(parent, title=title, w=w, h=h, 
+                                           treewidth=treewidth, wolfparent=wolfparent,wxlogging=wxlogging)
 
         self.parent = parent
 

wolfhece/PyHydrographs.py

@@ -86,8 +86,9 @@ class Hydrograph(pd.Series):
         """
         Read a wolf file at the format infil[n].tv and
         return its data as a dictionnary where:
-            - keys are times and
-            - values are discharges
+
+         - keys are times
+         - values are discharges
 
         """
         data = {}

wolfhece/PyParams.py

@@ -808,10 +808,18 @@ class Wolf_Param(wx.Frame):
             # Ajout des choix via chaîne JSON
             list_keys   = [ k for k in param[key_Param.ADDED_JSON]['Values'].keys()]
             list_values = [ k for k in param[key_Param.ADDED_JSON]['Values'].values()]
-
-            page.Append(pg.EnumProperty(param_name, name=locname, labels=list_keys, values=list_values, value=int(param[key_Param.VALUE])))
-
-            self.prop.SetPropertyHelpString(locname , param[key_Param.ADDED_JSON]['Full_Comment'])
+            # FIXME : TO GENERALIZE!!!
+            value_param = self.value_as_type(param[key_Param.VALUE], param[key_Param.TYPE], )
+            if type(value_param) == str:
+                try:
+                    value_param = int(value_param)
+                except:
+                    logging.debug("String type will be conserved! -- {}".format(value_param))
+            # print(value_param)
+            page.Append(pg.EnumProperty(param_name, name=locname, labels=list_keys, values=list_values, value=value_param))
+            if "Full_Comment" in param[key_Param.ADDED_JSON]:
+                self.prop.SetPropertyHelpString(locname , param[key_Param.ADDED_JSON]["Full_Comment"])
+                
         else:
 
             locvalue = self[(group, param_name)]

wolfhece/PyVertex.py

@@ -383,18 +383,18 @@ class cloud_vertices(Element_To_Draw):
     If header exists in the first line of the file, you have to mention it by header=True in initialization.
 
     Total number of columns (nb) is important :
-      - if nb >3 : the file must contain a header
-      - if header[2].lower() =='z', the file contains XYZ coordinates, otherwise all columns >1 are interpreted as values associated to XY
+        - if nb >3 : the file must contain a header
+        - if header[2].lower() == 'z', the file contains XYZ coordinates, otherwise all columns >1 are interpreted as values associated to XY
 
     Number os values = nb - (2 or 3) depending if Z coordinate exists
 
     Data are stored in Python dictionnary :
-      - ['vertex'] == XY or XYZ
+        - 'vertex' : XY or XYZ
+
     Each value is accessible through its headname as key :
-      - ['headname1'] == value with headname1
-      - ['headname2'] == value with headname2
-      - ...
-      - ['headnamen'] == value with headnamen
+        - 'headname1' : value with headname1
+        - 'headname2' : value with headname2
+        - 'headnamen' : value with headnamen
 
     For more information, see 'readfile' or 'import_from_dxf'
 
@@ -455,7 +455,6 @@ class cloud_vertices(Element_To_Draw):
         if fname != '':
             if toload:
                 if Path(fname).suffix.lower() == '.dxf':
-                # if fname[-4:].lower()=='.dxf':
                     self.import_from_dxf(fname)
                 elif Path(fname).suffix.lower() == '.shp':
                     self.import_shapefile(fname)
@@ -477,10 +476,10 @@ class cloud_vertices(Element_To_Draw):
         """
         Find nearest neighbors from Scipy KDTree structure based on a copy of the vertices
 
-        Retrun :
-         - list of distances
-         - list of "Wolfvertex"
-         - list of elements stored in self.myvertices
+        Return :
+            - list of distances
+            - list of "Wolfvertex"
+            - list of elements stored in self.myvertices
         """
         keys = self.myvertices.keys()
         if self.mytree is None:
@@ -909,7 +908,7 @@ class cloud_vertices(Element_To_Draw):
             if return_cloud:
                 Nouveau nuage contenant les infos de position sur la trace et d'altitude (s,z)
             else:
-                s,z : list[float], list[float]
+                s,z : list de floats
         """
 
         # trace:vector

wolfhece/RatingCurve.py

@@ -369,7 +369,9 @@ class SPWMIGaugingStations(Element_To_Draw):
     gaugings:SPWGaugings
     hrefs:SPWhrefs
 
-    def __init__(self,fromxls:str='') -> None:
+    def __init__(self, fromxls:str='', idx:str = '', plotted:bool = True, mapviewer = None, need_for_wx:bool = False) -> None:
+
+        super().__init__(idx,plotted,mapviewer,need_for_wx)
 
         self.gaugings=SPWGaugings()
         self.hrefs=SPWhrefs()
@@ -510,7 +512,9 @@ class SPWDCENNGaugingStations(Element_To_Draw):
     gaugings:SPWGaugings
     hrefs:SPWhrefs
 
-    def __init__(self,fromxls:str='') -> None:
+    def __init__(self, fromxls:str='', idx:str = '', plotted:bool = True, mapviewer = None, need_for_wx:bool = False) -> None:
+
+        super().__init__(idx,plotted,mapviewer,need_for_wx)
 
         self.gaugings=SPWGaugings()
         self.hrefs=SPWhrefs()

wolfhece/RatingCurve_xml.py

@@ -19,7 +19,7 @@ from .PyTranslate import _
 try:
     from .hydrometry_hece.kiwis_hece import hydrometry_hece as hydrometry
 except:
-    logging.warning(_('Hydrometry HECE module not found - Load hydrometry instead of hydrometry_hece'))
+    logging.debug(_('Hydrometry HECE module not found - Load hydrometry instead of hydrometry_hece'))
     from .hydrometry.kiwis import hydrometry
 
 def get_power_law():