wolfhece 2.1.74__py3-none-any.whl → 2.1.76__py3-none-any.whl

wolfhece/PyDraw.py

@@ -145,14 +145,14 @@ class Colors_1to9(wx.Frame):
     def __init__(self, parent):
 
         self._parent = parent
-        self.colors1to9 = [(0, 0, 255, 255), 
-                            (0, 255, 0, 255), 
-                            (0, 128, 255, 255), 
-                            (255, 255, 0, 255), 
-                            (255, 165, 0, 255), 
-                            (128, 0, 128, 255), 
-                            (255, 192, 203, 255), 
-                            (165, 42, 42, 255), 
+        self.colors1to9 = [(0, 0, 255, 255),
+                            (0, 255, 0, 255),
+                            (0, 128, 255, 255),
+                            (255, 255, 0, 255),
+                            (255, 165, 0, 255),
+                            (128, 0, 128, 255),
+                            (255, 192, 203, 255),
+                            (165, 42, 42, 255),
                             (128, 128, 128, 255)]
 
         if self.file.exists():
@@ -214,7 +214,7 @@ class Colors_1to9(wx.Frame):
         self.Bind(wx.EVT_BUTTON, self.OnSave, cmdSave)
 
         self.Show()
-    
+
     def Apply(self):
 
         for i in range(9):
@@ -228,7 +228,7 @@ class Colors_1to9(wx.Frame):
 
     def OnCancel(self, event):
         self.Close()
-    
+
     def OnSetDefault(self, event):
         self.colors1to9 = [(0, 0, 255, 255),
                             (0, 255, 0, 255),
@@ -1036,6 +1036,7 @@ class WolfMapViewer(wx.Frame):
             updatecolors_laz = self.menulaz.Append(wx.ID_ANY, _('Change colors - Classification'), _('Change color map associated to the current classification'),)
             fillarray_laz = self.menulaz.Append(wx.ID_ANY, _('Fill active array from LAZ data'), _('Fill an array from the LAZ data'),)
             selectarray_laz = self.menulaz.Append(wx.ID_ANY, _('Select cells in array from LAZ data'), _('Select nodes in active array from the LAZ data'),)
+            countarray_laz = self.menulaz.Append(wx.ID_ANY, _('Count LAZ data in cells'), _('Count the number of LAZ data in each cell of the matrix'),)
 
     def menu_wolf2d(self):
 
@@ -2749,7 +2750,7 @@ class WolfMapViewer(wx.Frame):
         self.canvas.Bind(wx.EVT_MOUSEWHEEL, self.OnButton)
 
         self.treelist.Bind(dataview.EVT_TREELIST_ITEM_CHECKED, self.OnCheckItem)
-        self.treelist.Bind(dataview.EVT_TREELIST_ITEM_ACTIVATED, self.OnActivateTreeElem)        
+        self.treelist.Bind(dataview.EVT_TREELIST_ITEM_ACTIVATED, self.OnActivateTreeElem)
         self.treelist.Bind(dataview.EVT_TREELIST_ITEM_CONTEXT_MENU, self.OntreeRight)
         self.treelist.Bind(wx.EVT_CHAR_HOOK, self.OnHotKey)
         self.treelist.Bind(dataview.EVT_TREELIST_SELECTION_CHANGED,self.OnSelectItem)
@@ -4256,6 +4257,126 @@ class WolfMapViewer(wx.Frame):
 
         logging.info(_('Filling done'))
 
+    def count_active_array_from_laz(self, array:WolfArray = None, used_codes:list = [], chunk_size:float = 500.):
+        """ Fill active array with laz data
+
+        :param array: array to fill
+        :param used_codes: codes to use
+        :param operator: operator to use
+        """
+
+        if self.mylazgrid is None:
+            return
+
+        if array is None:
+            logging.error(_('No array'))
+            return
+
+        if len(used_codes) == 0 :
+            keycode = [key for key,val in self.mylazgrid.colors.classification.items()]
+            names = [val[0] for key,val in self.mylazgrid.colors.classification.items()]
+
+            with wx.MultiChoiceDialog(None, _('Choose the codes to use'), _('Codes'), names) as dlg:
+                if dlg.ShowModal() == wx.ID_OK:
+                    data = {}
+                    used_codes = dlg.GetSelections()
+                    used_codes = [float(keycode[cur]) for cur in used_codes]
+                else:
+                    return
+
+        bounds = array.get_bounds()
+
+        # align bounds on chunk_size
+        bounds[0][0] = bounds[0][0] - bounds[0][0] % chunk_size
+        bounds[0][1] = bounds[0][1] + chunk_size - bounds[0][1] % chunk_size
+        bounds[1][0] = bounds[1][0] - bounds[1][0] % chunk_size
+        bounds[1][1] = bounds[1][1] + chunk_size - bounds[1][1] % chunk_size
+
+        chunks_x = np.arange(bounds[0][0], bounds[0][1], chunk_size)
+        chunks_y = np.arange(bounds[1][0], bounds[1][1], chunk_size)
+
+        for curx in tqdm(chunks_x, 'Chunks'):
+            for cury in chunks_y:
+
+                curbounds = [[curx, curx + chunk_size], [cury, cury + chunk_size]]
+
+                logging.info(_('Scan {}-{}  {}-{}').format(curbounds[0][0],curbounds[0][1],curbounds[1][0],curbounds[1][1]))
+                self.mylazdata = self.mylazgrid.scan(curbounds)
+
+                if len(self.mylazdata) == 0:
+                    continue
+
+                # Test codes
+                data = {}
+                for curcode in used_codes:
+                    data[curcode] = self.mylazdata[self.mylazdata[:, 3] == curcode]
+
+                # Treat data for each code
+                for curdata in data.values():
+
+                    if curdata.shape[0] == 0:
+                        continue
+                    else:
+                        logging.info(_('Code {} : {} points'.format(curdata[0,3], curdata.shape[0])))
+
+                    # get i,j from x,y
+                    i,j = array.get_ij_from_xy(curdata[:, 0], curdata[:, 1]) #= np.float32(self.mylazdata[:, 2])
+
+                    # keep only valid points -- inside the array
+                    used = np.where((i >=0) & (i < array.nbx) & (j >=0) & (j < array.nby))[0]
+
+                    if len(used) == 0:
+                        continue
+
+                    i = i[used]
+                    j = j[used]
+                    z = curdata[used, 2]
+
+                    # create a key array
+                    keys = np.vstack((i,j)).T
+                    # find unique keys
+                    keys = np.unique(keys, axis=0)
+
+                    # create a ijz array
+                    ijz = np.vstack((i, j, z)).T
+
+                    # sort ijz array according to keys
+                    #
+                    # the most important indice is the last one enumerated in lexsort
+                    # see : https://numpy.org/doc/stable/reference/generated/numpy.lexsort.html
+                    ijz = ijz[np.lexsort((ijz[:,1], ijz[:,0]))]
+
+                    # find first element of each key
+                    idx = np.where(np.abs(np.diff(ijz[:,0])) + np.abs(np.diff(ijz[:,1])) != 0)[0]
+
+                    # add last element
+                    idx = np.concatenate((idx, [ijz.shape[0]]))
+
+                    assert len(idx) == keys.shape[0], 'Error in filling'
+
+                    logging.info(_('Cells to fill : {}'.format(len(idx))))
+
+                    # apply operator
+                    vals = {}
+                    start_ii = 0
+                    for ii, key in enumerate(keys):
+                        end_ii = idx[ii]+1
+
+                        vals[(key[0], key[1])] = end_ii - start_ii
+
+                        start_ii = end_ii
+
+                    if len(vals) > 0:
+                        # create a new ijz array
+                        newijz = np.asarray([[key[0], key[1], val] for key, val in vals.items()], dtype = np.float32)
+
+                        array.fillin_from_ijz(newijz)
+
+        array.reset_plot()
+        self.Paint()
+
+        logging.info(_('Counting done'))
+
     def init_laz_from_numpy(self, fn=None):
         """ Read LAZ data stored in numpy array"""
 
@@ -5143,6 +5264,17 @@ class WolfMapViewer(wx.Frame):
             autoscale = False
             self.fill_active_array_from_laz(self.active_array)
 
+        elif itemlabel == _('Count LAZ data in cells'):
+            if self.mylazgrid is None:
+                logging.warning('')
+                return
+            if self.active_array is None:
+                logging.warning(_('No active array -- select an array first and retry!'))
+                return
+
+            autoscale = False
+            self.count_active_array_from_laz(self.active_array)
+
         elif itemlabel == _('Select cells in array from LAZ data'):
             if self.mylazgrid is None:
                 logging.warning('')
@@ -7032,7 +7164,7 @@ class WolfMapViewer(wx.Frame):
                     self.selected_object.save()
         elif text==_('Up'):
             self.upobj()
-        
+
         elif text == _('Down'):
             self.downobj()
 
@@ -7056,7 +7188,7 @@ class WolfMapViewer(wx.Frame):
 
                     if self.get_label_selecteditem() == _("Active : ") + label:
                         self.set_label_selecteditem(_("Active : ") + newlab)
-        
+
                 dlg.Destroy()
 
         elif text ==  _('Duplicate'):
@@ -7071,7 +7203,7 @@ class WolfMapViewer(wx.Frame):
                 if ret != wx.ID_OK:
                     dlg.Destroy()
                     return
-                
+
                 newlab = dlg.GetValue()
                 dlg.Destroy()
 
@@ -8344,7 +8476,7 @@ class WolfMapViewer(wx.Frame):
                 # self.mytooltip.SetIcon(self.GetIcon()) # update icon
                 self.mytooltip.SetWindowStyle(wx.DEFAULT_FRAME_STYLE) # | wx.STAY_ON_TOP) # on top, with Title bar
 
-        # self.mytooltip.Show(True)
+            self.mytooltip.Show(True)
 
     def Autoscale(self, update_backfore=True):
         """ Redimensionnement de la fenêtre pour afficher tous les objets """
@@ -8803,10 +8935,12 @@ class WolfMapViewer(wx.Frame):
 
             elif key == 60 and shiftdown: #'>'
                 if self.active_array is not None:
-                    self.active_array.dilate_contour_selection(1)
+                    if self.active_array.SelectionData is not None:
+                        self.active_array.SelectionData.dilate_contour_selection(1)
             elif key == 60 and not shiftdown: #'<'
                 if self.active_array is not None:
-                    self.active_array.erode_contour_selection()
+                    if self.active_array.SelectionData is not None:
+                        self.active_array.SelectionData.erode_contour_selection()
 
             elif key == wx.WXK_F2 and shiftdown:
 
@@ -9076,10 +9210,12 @@ class WolfMapViewer(wx.Frame):
 
             elif key == 60 and shiftdown: #'>'
                 if self.active_array is not None:
-                    self.active_array.dilate_selection(1)
+                    if self.active_array.SelectionData is not None:
+                        self.active_array.SelectionData.dilate_selection(1)
             elif key == 60 and not shiftdown: #'<'
                 if self.active_array is not None:
-                    self.active_array.erode_selection(1)
+                    if self.active_array.SelectionData is not None:
+                        self.active_array.SelectionData.erode_selection(1)
 
             elif key == wx.WXK_ESCAPE:
 
@@ -9145,16 +9281,16 @@ class WolfMapViewer(wx.Frame):
                         logging.info(_('Please select some nodes before transfering to the dictionary, not ALL !'))
                         return
 
-                    # colors = [(0, 0, 255, 255), 
-                    #           (0, 255, 0, 255), 
-                    #           (0, 128, 255, 255), 
-                    #           (255, 255, 0, 255), 
-                    #           (255, 165, 0, 255), 
-                    #           (128, 0, 128, 255), 
-                    #           (255, 192, 203, 255), 
-                    #           (165, 42, 42, 255), 
+                    # colors = [(0, 0, 255, 255),
+                    #           (0, 255, 0, 255),
+                    #           (0, 128, 255, 255),
+                    #           (255, 255, 0, 255),
+                    #           (255, 165, 0, 255),
+                    #           (128, 0, 128, 255),
+                    #           (255, 192, 203, 255),
+                    #           (165, 42, 42, 255),
                     #           (128, 128, 128, 255)]
-                    
+
                     idx = LIST_1TO9.index(key)
                     if idx > 8:
                         idx -= 9

wolfhece/apps/version.py

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

wolfhece/hydrometry/kiwis.py

@@ -58,9 +58,102 @@ KIWIS WebServices command :
 """
 
 URL_SERVICE = 'https://hydrometrie.wallonie.be/services'
+URL_SERVICE_WATERINFO = 'https://download.waterinfo.be/tsmdownload'
+URL_SERVICE_HICWS = 'https://hicws.vlaanderen.be'
+
 URL_SPW   = URL_SERVICE + '/KiWIS/KiWIS'
+URL_WATERINFO = URL_SERVICE_WATERINFO + '/KiWIS/KiWIS'
+URL_HICWS = URL_SERVICE_HICWS + '/KiWIS/KiWIS'
+
 URL_TOKEN = URL_SERVICE + '/auth/token/'
 
+# See : https://hicws.vlaanderen.be/Manual_for_the_use_of_webservices_HIC.pdf
+class HICWS_GroupID(Enum):
+    FlowRate_daily = ('Afvoer_dag', 156169)
+    FlowRate_hig_res = ('Afvoer_hoge resolutie', 156170)
+    FlowRate_hourly = ('Afvoer_uur', 156171)
+    Astronomic_predictions_Scheldt_and_coastal_area = ('Astronomische voorspellingen reeksen Schelde en kust (LAT)', 512458)
+    Astronomic_predictions_Scheldt_and_coastal_area_high_res = ('AstroAstronomische voorspellingen reeksen Schelde en kust (mTAW)', 354718)
+    Astronomic_predictions_Scheldt_and_coastal_area_high_low = ('Astronomische voorspellingen Hoog-en laagwaters Schelde en kust (LAT)', 515316)
+    Astronomic_predictions_Scheldt_and_coastal_area_high_low_highres = ('Astronomische voorspellingen Hoog-en laagwaters Schelde en kust (mTAW)', 350099)
+    Calculated_Discharge_important = ('Berekende afvoeren sleutellocaties waterwegen', 260592)
+    Calculated_Area_Precipitation = ('Berekende gebiedsneerslagen belangrijke meetlocaties HIC', 156159)
+    Chlorophyl_high_res = ('Chlorofyl_hoge resolutie', 156172)
+    Conductivity_high_res = ('Conductiviteit_hoge resolutie', 156173)
+    Precipitation_daily = ('Neerslag_dag', 156166)
+    Precipitation_high_res = ('Neerslag_hoge resolutie', 156167)
+    Precipitation_yearly = ('Neerslag_jaar', 156191)
+    Precipitation_monthly = ('Neerslag_maand', 156190)
+    Precipitation_hourly = ('Neerslag_uur', 156168)
+    Salinity_high_res = ('Saliniteit_hoge resolutie', 421208)
+    Sediment_Concentration = ('Sedimentconcentratie_hoge resolutie', 156188)
+    Flow_Direction_high_res = ('Stroomrichting_hoge resolutie', 156158)
+    Flow_Velocity = ('Stroomsnelheid_hoge resolutie', 156199)
+    Turbidity = ('Turbiditeit_hoge resolutie', 156202)
+    Tidal_Previsions_Scheldt_ensemble = ('Verwachtingen Tijgebied Schelde (HWLW)', 432821)
+    Forecast_Discharge_shortterm_48h = ('Voorspellingen afvoer korte termijn (48u)', 506057)
+    Forecast_Discharge_longterm_10d = ('Voorspellingen afvoer lange termijn (10 dagen)', 506059)
+    Forecast_area_48h = ('Voorspellingen berekende gebiedsneerslagen belangrijke meetlocaties HIC korte termijn (48u)', 506060)
+    Forecast_area_10d = ('Voorspellingen berekende gebiedsneerslagen belangrijke meetlocaties HIC lange termijn (10 dagen)', 506061)
+    Forecast_waterlevel_48h = ('Voorspellingen waterstand korte termijn (48u)', 506056)
+    Forecast_waterlevel_10d = ('Voorspellingen waterstand lange termijn (10 dagen)', 506058)
+    Water_Level_daily = ('Waterstand_dag', 156162)
+    Water_Level_high_res = ('Waterstand_hoge resolutie', 156163)
+    High_Low_water_Scheldt = ('Waterstand_Hoog-en laagwaters tijgebied Schelde', 156165)
+    Scheldt_High_Water = ('Waterstand_Hoogwaters tijgebied', 510205)
+    Scheldt_Low_Water = ('Waterstand_Laagwaters tijgebied', 510207)
+    Water_Level_hourly = ('Waterstand_uur', 156164)
+    Water_Temperature = ('Watertemperatuur_hoge resolutie', 156200)
+    Oxygen_Concentration = ('Zuurstofgehalte_hoge resolutie', 156207)
+    Oxygen_Saturation = ('Zuurstofverzadiging_hoge resolutie', 156208)
+    pH = ('Zuurtegraad_hoge resolutie', 156197)
+
+#See : https://waterinfo.vlaanderen.be/download/9f5ee0c9-dafa-46de-958b-7cac46eb8c23?dl=0
+class WaterInfo_GroupdID(Enum):
+    Flowrate_15m = ('Afvoer_15m', 192786)
+    Flowrate_daily = ('Afvoer_dag', 192893)
+    Flowrate_yearly = ('Afvoer_jaar', 192895)
+    Flowrate_monthly = ('Afvoer_maand', 192894)
+    Flowrate_hourly = ('Afvoer_uur', 192892)
+    Ground_Saturation = ('Bodemverzadiging_15m', 192929)
+    Ground_Humidity = ('Bodemvocht_15m', 192928)
+    Dew_Point_Temparature = ('Dauwpunttemperatuur_15m', 192923)
+    Salinity = ('EC verziltingsmeetnet', 383065)
+    projectmetingen = ('EC projectmetingen', 381863)
+    Ground_Temperature = ('Grondtemperatuur_15m', 192924)
+    Ground_Heat = ('Grondwarmte_15m', 192916)
+    Radiation = ('Instraling_15m', 192920)
+    Atmospheric_Pressure = ('Luchtdruk_15m', 192918)
+    Atmospheric_Temperature = ('Luchttemperatuur175cm_15m', 192922)
+    Rain_15m = ('Neerslag_15m', 192896)
+    Rain_1m = ('Neerslag_1m', 199792)
+    Rain_daily = ('Neerslag_dag', 192898)
+    Rain_yearly = ('Neerslag_jaar', 192900)
+    Rain_monthly = ('Neerslag_maand', 192899)
+    Rain_hourly = ('Neerslag_uur', 192897)
+    Relative_Humidity = ('RelatVocht_15m', 192919)
+    Evaporation_Monteih_15m = ('VerdampingMonteith_15m', 192927)
+    Evaporation_Monteih_daily = ('VerdampingMonteith_dag', 295480)
+    Evaporation_Monteih_yearly = ('VerdampingMonteith_jaar', 295483)
+    Evaporation_Monteih_monthly = ('VerdampingMonteith_maand', 295482)
+    Evaporation_Penman_15m = ('VerdampingPenman_15m', 204341)
+    Evaporation_Penman_daily = ('VerdampingPenman_dag', 295474)
+    Evaporation_Penman_yearly = ('VerdampingPenman_jaar', 295479)
+    Evaporation_Penman_monthly = ('VerdampingPenman_maand', 295475)
+    Water_speed_15m = ('Watersnelheid_15m', 192901)
+    Water_speed_daily = ('Watersnelheid_dag', 192903)
+    Water_speed_yearly = ('Watersnelheid_jaar', 192905)
+    Water_speed_monthly = ('Watersnelheid_maand', 192904)
+    Water_speed_hourly = ('Watersnelheid_uur', 192902)
+    Water_Level_15m = ('Waterstand_15m', 192780)
+    Water_Level_daily = ('Waterstand_dag', 192782)
+    Water_Level_yearly = ('Waterstand_jaar', 192784)
+    Water_Level_monthly = ('Waterstand_maand', 192783)
+    Water_Level_hourly = ('Waterstand_uur', 192785)
+    Water_Temperature = ('Watertemperatuur_15m', 325066)
+    Wind_Direction = ('Windrichting_15m', 192926)
+    Wind_Speed = ('Windsnelheid_15m', 192925)
+
 class kiwis_command(Enum):
     getrequestinfo = "getrequestinfo"
     getGroupList = "getGroupList"
@@ -234,8 +327,8 @@ class hydrometry():
 
         try:
             self.daily_token()
-        except:
-            logging.warning('No token available')
+        except Exception as e:
+            logging.warning('No token available or Error in hydrometry init :', e)
 
         try:
             self.get_requests()
@@ -243,7 +336,8 @@ class hydrometry():
             self.get_stations()
             self.get_groups()
             self.save_struct(self.dir)
-        except:
+        except Exception as e:
+            print('Error in hydrometry init :', e)
             self.realstations = None
             pass
 
@@ -253,10 +347,16 @@ class hydrometry():
             ret+=curcol+'\n'
         return ret
 
-    def _get_commandstr(self, which:str):
+    def _get_commandstr(self, which:str, format='json'):
         """ Construction de la commande à envoyer au serveur KIWIS """
 
-        return self.url+'?request='+which.value+'&format=json'
+        datasource = ''
+        if self.url == URL_WATERINFO:
+            datasource = '&datasource=1'
+        elif self.url == URL_HICWS:
+            datasource = '&datasource=4'
+
+        return self.url+'?request='+which.value+'&format='+format + datasource
 
     def daily_token(self):
         """
@@ -293,7 +393,11 @@ class hydrometry():
                 return
                 self.token = None
 
-        self._header = {'Authorization': 'Bearer {}'.format(self.token['access_token'])}
+        try:
+            self._header = {'Authorization': 'Bearer {}'.format(self.token['access_token'])}
+        except Exception as e:
+            logging.error('Error in daily_token :', e)
+            self._header = None
 
     def check_plot(self):
         """ Instance is checked in mapviewer """
@@ -303,6 +407,10 @@ class hydrometry():
         """ Instance is unchecked in mapviewer """
         self.plotted = False
 
+    def get_path(self, dir:Path, filename:str):
+        """ Get path of instance """
+        return Path(dir) / (self.url.replace('/','_').replace('https:','') + filename)
+
     def save_struct(self, dir=''):
         """Sauvegarde des structures dans un répertoire
 
@@ -315,12 +423,12 @@ class hydrometry():
         dir = Path(dir)
         dir.mkdir(parents=True, exist_ok=True)
 
-        self.sites.to_csv(dir / 'sites.csv')
-        self.stations.to_csv(dir / 'stations.csv')
-        self.groups.to_csv(dir / 'groups.csv')
-        self.requests.to_csv(dir / 'requests.csv')
+        self.sites.to_csv(self.get_path(dir, 'sites.csv'))
+        self.stations.to_csv(self.get_path(dir, 'stations.csv'))
+        self.groups.to_csv(self.get_path(dir, 'groups.csv'))
+        self.requests.to_csv(self.get_path(dir, 'requests.csv'))
 
-    def _get_stations_pythonlist(self, site_no:str|int, onlyreal:bool= True):
+    def _get_stations_pythonlist(self, site_no:str|int, onlyreal:bool= True, return_only_name:bool=False):
         """ Obtention des stations pour le site en liste python
 
         :param site_no: numéro du site
@@ -332,10 +440,14 @@ class hydrometry():
         else:
             stations = self.stations[self.stations[kiwis_site_fields.site_no.value]==site_no]
 
-        list_name_code = [curname+' --- '+curno   for curname,curno in zip(stations[station_fields.STATION_NAME.value].values,stations[station_fields.STATION_NO.value].values)]
-        list_code_name = [curno  +' --- '+curname for curname,curno in zip(stations[station_fields.STATION_NAME.value].values,stations[station_fields.STATION_NO.value].values)]
+        if return_only_name:
+            return [curname for curname in stations[station_fields.STATION_NAME.value].values]
 
-        return list_name_code, list_code_name
+        else:
+            list_name_code = [curname+' --- '+curno   for curname,curno in zip(stations[station_fields.STATION_NAME.value].values,stations[station_fields.STATION_NO.value].values)]
+            list_code_name = [curno  +' --- '+curname for curname,curno in zip(stations[station_fields.STATION_NAME.value].values,stations[station_fields.STATION_NO.value].values)]
+
+            return list_name_code, list_code_name
 
     def _get_sites_pythonlist(self):
         """ Obtention des sites en liste python """
@@ -365,7 +477,7 @@ class hydrometry():
 
         returnfields = f'{kiwis_site_fields.site_no.value},'
         returnfields += f'{station_fields.STATION_NO.value},{station_fields.STATION_NAME.value},{station_fields.STATION_ID.value},'
-        returnfields += f'{station_fields.STATION_LOCAL_X.value},{station_fields.STATION_LOCAL_Y.value},'
+        returnfields += f'{station_fields.STATION_LOCAL_X.value},{station_fields.STATION_LOCAL_Y.value},' if self.url==URL_SPW else ''
         returnfields += f'{station_fields.STATION_LATITUDE.value},{station_fields.STATION_LONGITUDE.value},'
         returnfields += f'{station_fields.RIVER_NAME.value},'
         returnfields += 'ca_sta'
@@ -377,25 +489,50 @@ class hydrometry():
         # returnfields += 'ts_id,ts_name,'
         # returnfields += 'ts_unitname,ts_unitsymbol,'
 
-        if self.dir!='' and exists(join(self.dir,'stations.csv')):
-            self.stations = pd.read_csv(join(self.dir,'stations.csv'),index_col=0)
+        if self.dir!='' and self.get_path(self.dir, 'stations.csv').exists():
+            self.stations = pd.read_csv(self.get_path(self.dir, 'stations.csv'),index_col=0)
         elif self.url!='':
-            json_data = requests.get(self._get_commandstr(kiwis_command.getStationList) \
-                                     +'&metadata=true' \
-                                     +'&returnfields='+returnfields \
-                                     +'&ca_sta_returnfields='+ca_sta_returnfields \
-                                     +'&orderby=station_no', \
-                                     verify=True, \
-                                     headers=self._header).json()
+            try:
+                if self.url == URL_SPW:
+                    json_data = requests.get(self._get_commandstr(kiwis_command.getStationList) \
+                                            +'&metadata=true' \
+                                            +'&returnfields='+returnfields \
+                                            +'&ca_sta_returnfields='+ca_sta_returnfields \
+                                            +'&orderby=station_no', \
+                                            verify=True, \
+                                            headers=self._header).json()
+                else:
+                    json_data = requests.get(self._get_commandstr(kiwis_command.getStationList, 'json') \
+                                            +'&metadata=true' \
+                                            +'&returnfields='+returnfields \
+                                            +'&orderby=station_no', \
+                                            verify=True, \
+                                            headers=self._header)
+
+                    json_data = json_data.text.replace('\x1a', ' ')
+                    json_data = json.loads(json_data)
+
+            except Exception as e:
+                self.stations = None
+                return
+
             self.stations = pd.DataFrame(json_data[1:], columns = json_data[0])
 
         #Conversion en minuscules
         self.stations[station_fields.STATION_NAME.value]=self.stations[station_fields.STATION_NAME.value].str.lower()
 
-        # real stations are those with coordinates and not null
-        self.realstations = self.stations[(~pd.isnull(self.stations[station_fields.STATION_LOCAL_X.value])) & (self.stations[station_fields.STATION_LOCAL_X.value]!='')]
-        # computed stations are those without coordinates or null
-        self.compstations = self.stations[pd.isnull(self.stations[station_fields.STATION_LOCAL_X.value]) | self.stations[station_fields.STATION_LOCAL_X.value]!='']
+        # # In case of Waterinfo, get part of station_id
+        # if self.url == URL_WATERINFO:
+        #     self.stations[station_fields.STATION_ID.value] = self.stations[station_fields.STATION_ID.value].str[2:]
+
+        if self.url == URL_SPW:
+            # real stations are those with coordinates and not null
+            self.realstations = self.stations[(~pd.isnull(self.stations[station_fields.STATION_LOCAL_X.value])) & (self.stations[station_fields.STATION_LOCAL_X.value]!='')]
+            # computed stations are those without coordinates or null
+            self.compstations = self.stations[pd.isnull(self.stations[station_fields.STATION_LOCAL_X.value]) | self.stations[station_fields.STATION_LOCAL_X.value]!='']
+        else:
+            self.realstations = self.stations
+            self.compstations = None
 
     def get_names_xy(self, site_no = None):
         """Obtention des noms et coordonnées des stations pour le site
@@ -572,13 +709,39 @@ class hydrometry():
 
             return stations
 
+    def get_timeseries_group_spw(self, rfw:Literal['rain','waterdepth','flowrate'], time:Literal['5min','5or10min','1h','1d','1m']):
+        """alias for get_timeseries_group"""
+
+        return self.get_timeseries_group(rfw, time)
+
+    def get_timeseries_group_winfo_hic(self, group:WaterInfo_GroupdID | HICWS_GroupID):
+        """Obtention des stations pour le groupe souhaité.
+
+        Temps retourné en UTC
+
+        :param group: type de groupe - see WaterInfo_GroupdID or HICWS_GroupID
+        """
+
+        if self.url!='':
+            stations=None
+            group_id = group.value[1]
+            returnFields = '&metadata=true&custattr_returnfields=dataprovider,dataowner&md_returnfields=custom_attributes,station_id,station_no,station_name,ts_id,ts_name,stationparameter_name,ts_unitsymbol,parametertype_name'
+            json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValueLayer) +
+                                     '&timeseriesgroup_id='+str(group_id)+
+                                     '&orderby=station_no'+
+                                     returnFields,
+                                     verify=True, headers=self._header).json()
+            stations = pd.DataFrame(json_data[1:], columns = json_data[0])
+
+            return stations
+
     def get_sites(self, forcerequest=False):
         """Obtention des sites pour le serveur courant
 
         :param forcerequest: force la requête même si les données de cache sont déjà présentes"""
 
-        if self.dir!='' and exists(join(self.dir,'sites.csv')) and not forcerequest:
-            self.sites = pd.read_csv(join(self.dir,'sites.csv'),index_col=0)
+        if self.dir!='' and self.get_path(self.dir, 'sites.csv').exists() and not forcerequest:
+            self.sites = pd.read_csv(self.get_path(self.dir, 'sites.csv'),index_col=0)
         elif self.url!='' or forcerequest:
             json_data = requests.get(self._get_commandstr(kiwis_command.getSiteList),verify=True, headers=self._header).json()
             self.sites = pd.DataFrame(json_data[1:], columns = json_data[0])
@@ -590,8 +753,8 @@ class hydrometry():
 
         :param forcerequest: force la requête même si les données de cache sont déjà présentes"""
 
-        if self.dir!='' and exists(join(self.dir,'groups.csv')) and not forcerequest:
-            self.groups = pd.read_csv(join(self.dir,'groups.csv'),index_col=0)
+        if self.dir!='' and self.get_path(self.dir, 'groups.csv').exists() and not forcerequest:
+            self.groups = pd.read_csv(self.get_path(self.dir, 'groups.csv'),index_col=0)
         elif self.url!='' or forcerequest:
             json_data = requests.get(self._get_commandstr(kiwis_command.getGroupList),verify=True, headers=self._header).json()
             self.groups = pd.DataFrame(json_data[1:], columns = json_data[0])
@@ -611,8 +774,8 @@ class hydrometry():
 
         :param forcerequest: force la requête même si les données de cache sont déjà présentes"""
 
-        if self.dir!='' and exists(join(self.dir,'requests.csv')) and not forcerequest:
-            self.requests = pd.read_csv(join(self.dir,'requests.csv'),index_col=0)
+        if self.dir!='' and self.get_path(self.dir, 'requests.csv').exists() and not forcerequest:
+            self.requests = pd.read_csv(self.get_path(self.dir, 'requests.csv'),index_col=0)
         elif self.url!='' or forcerequest:
             json_data = requests.get(self._get_commandstr(kiwis_command.getrequestinfo),verify=True, headers=self._header).json()
             self.requests = pd.DataFrame(json_data[0]['Requests'])
@@ -709,7 +872,8 @@ class hydrometry():
         filename = self._get_filename_list(stationname,stationcode)
         list.to_csv(dir / filename)
 
-    def timeseries(self,stationname:str='', stationcode:str='', dir:str='',
+    def timeseries(self, stationname:str='', stationcode:str='', stationid:str='',
+                   dir:str='',
                    fromdate=datetime.now()-timedelta(60), todate=datetime.now(),
                    ts_name:str='', ts_id:str='', interval:int=3600, timezone:str = 'GMT+0'):
         """
@@ -738,11 +902,14 @@ class hydrometry():
         cursec = interval
         # id = ''
         if ts_id == '':
-            if stationname=='':
-                stationname = self.get_stationname(stationcode)
-            if stationcode=='':
-                stationcode = self.get_stationcode(stationname)
-            id = self.get_stationid(stationname,stationcode)
+            if str(stationid) !='':
+                id = stationid
+            else:
+                if stationname=='':
+                    stationname = self.get_stationname(stationcode)
+                if stationcode=='':
+                    stationcode = self.get_stationcode(stationname)
+                id = self.get_stationid(stationname,stationcode)
 
             if dir=='':
                 json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesList)

wolfhece/hydrometry/kiwis_gui.py

@@ -190,7 +190,7 @@ class hydrometry_gui(wx.Frame):
         self.tenyears.Bind(wx.EVT_BUTTON, self.setdate)
 
 
-        self.hydro = hydrometry(credential=credential, dir=kw.get('dir',''))
+        self.hydro = hydrometry(credential=credential, dir=kw.get('dir',''), url=kw.get('url',''))
 
         self.figsaxes=[]
 

wolfhece/wolf_array.py

@@ -1410,7 +1410,42 @@ class CropDialog(wx.Dialog):
 
         return myhead
 
-
+import string
+class IntValidator(wx.Validator):
+    ''' Validates data as it is entered into the text controls. '''
+
+    #----------------------------------------------------------------------
+    def __init__(self):
+        super(IntValidator, self).__init__()
+        self.Bind(wx.EVT_CHAR, self.OnChar)
+
+    #----------------------------------------------------------------------
+    def Clone(self):
+        '''Required Validator method'''
+        return IntValidator()
+
+    #----------------------------------------------------------------------
+    def Validate(self, win):
+        return True
+
+    #----------------------------------------------------------------------
+    def TransferToWindow(self):
+        return True
+
+    #----------------------------------------------------------------------
+    def TransferFromWindow(self):
+        return True
+
+    #----------------------------------------------------------------------
+    def OnChar(self, event):
+        keycode = int(event.GetKeyCode())
+        if keycode < 256:
+            #print keycode
+            key = chr(keycode)
+
+            if key not in string.digits:
+                return
+        event.Skip()
 class Ops_Array(wx.Frame):
     """
     Operations wx.Frame on WolfArray class
@@ -1771,26 +1806,54 @@ class Ops_Array(wx.Frame):
                                       _("Select all nodes"), wx.DefaultPosition,
                                       wx.DefaultSize, 0)
         self.AllSelection.SetToolTip(_("Select all nodes in one click - store 'All' in the selection list"))
-        bSizer16_1.Add(self.AllSelection, 0, wx.EXPAND)
+        bSizer16_1.Add(self.AllSelection, 1, wx.EXPAND)
         
+        memory_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.MoveSelection = wx.Button(self.selection, wx.ID_ANY,
-                                       _("Move current selection to..."), wx.DefaultPosition,
+                                       _("Move selection to..."), wx.DefaultPosition,
                                        wx.DefaultSize, 0)
         self.MoveSelection.SetToolTip(_("Store the current selection in an indexed list -- useful for some interpolation methods"))
-        bSizer16_1.Add(self.MoveSelection, 0, wx.EXPAND)
 
+        self.ReselectMemory = wx.Button(self.selection, wx.ID_ANY,
+                                        _("Reselect from..."), wx.DefaultPosition,
+                                        wx.DefaultSize, 0)
+        self.ReselectMemory.SetToolTip(_("Reselect the nodes from an indexed list"))
+
+        memory_sizer.Add(self.MoveSelection, 1, wx.EXPAND)
+        memory_sizer.Add(self.ReselectMemory, 1, wx.EXPAND)
+        bSizer16_1.Add(memory_sizer, 1, wx.EXPAND)
+
+        reset_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.ResetSelection = wx.Button(self.selection, wx.ID_ANY,
                                         _("Reset"), wx.DefaultPosition,
                                         wx.DefaultSize, 0)
         self.ResetSelection.SetToolTip(_("Reset the current selection list (keyboard shortcut r)"))
-        bSizer16_1.Add(self.ResetSelection, 0, wx.EXPAND)
-
+        
         self.ResetAllSelection = wx.Button(self.selection, wx.ID_ANY,
                                            _("Reset All"), wx.DefaultPosition,
                                            wx.DefaultSize, 0)
         self.ResetAllSelection.SetToolTip(_("Reset the current selection list and the indexed lists (keyboard shortcut R)"))
-        bSizer16_1.Add(self.ResetAllSelection, 0, wx.EXPAND)
 
+        reset_sizer.Add(self.ResetSelection, 1, wx.EXPAND)
+        reset_sizer.Add(self.ResetAllSelection, 1, wx.EXPAND)
+        bSizer16_1.Add(reset_sizer, 1, wx.EXPAND)
+
+        save_load_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        self.SaveSelection = wx.Button(self.selection, wx.ID_ANY,
+                                        _("Save"), wx.DefaultPosition,
+                                        wx.DefaultSize, 0)
+        self.SaveSelection.SetToolTip(_("Save the current selection list to disk"))
+
+        self.LoadSelection = wx.Button(self.selection, wx.ID_ANY,
+                                        _("Load"), wx.DefaultPosition,
+                                        wx.DefaultSize, 0)
+        self.LoadSelection.SetToolTip(_("Load a selection list from disk"))
+
+        save_load_sizer.Add(self.SaveSelection, 1, wx.EXPAND)
+        save_load_sizer.Add(self.LoadSelection, 1, wx.EXPAND)
+        bSizer16_1.Add(save_load_sizer, 1, wx.EXPAND)
+
+        clipboad_sizer = wx.BoxSizer(wx.HORIZONTAL)
         self.to_clipboard_str = wx.Button(self.selection, wx.ID_ANY, _("To clipboard (str)"), wx.DefaultPosition,
                                             wx.DefaultSize, 0)
         self.to_clipboard_str.SetToolTip(_("Copy the current selection to the clipboard as a string"))
@@ -1799,19 +1862,19 @@ class Ops_Array(wx.Frame):
                                             wx.DefaultSize, 0)
         self.to_clipboard_script.SetToolTip(_("Copy the current selection to the clipboard as a script"))
 
-        bSizer16_2.Add(self.to_clipboard_str, 0, wx.EXPAND, 2)
-        bSizer16_2.Add(self.to_clipboard_script, 0, wx.EXPAND, 2)
+        clipboad_sizer.Add(self.to_clipboard_str, 1, wx.EXPAND)
+        clipboad_sizer.Add(self.to_clipboard_script, 1, wx.EXPAND)
 
         erode_dilate_sizer = wx.BoxSizer(wx.VERTICAL)
-        self.expand_selection = wx.Button(self.selection, wx.ID_ANY, _("Expand/Dilate selection"), wx.DefaultPosition,
+        self.expand_selection = wx.Button(self.selection, wx.ID_ANY, _("Dilate"), wx.DefaultPosition,
                                             wx.DefaultSize, 0)
         self.expand_selection.SetToolTip(_("Expand the current selection to the nearest nodes"))
 
-        self.contract_selection = wx.Button(self.selection, wx.ID_ANY, _("Contract/Erode selection"), wx.DefaultPosition,
+        self.contract_selection = wx.Button(self.selection, wx.ID_ANY, _("Erode"), wx.DefaultPosition,
                                             wx.DefaultSize, 0)
         self.contract_selection.SetToolTip(_("Contract the current selection to the nearest nodes"))
 
-        self.expand_unselect_interior = wx.Button(self.selection, wx.ID_ANY, _("Expand/Dilate contour"), wx.DefaultPosition,
+        self.expand_unselect_interior = wx.Button(self.selection, wx.ID_ANY, _("Dilate contour"), wx.DefaultPosition,
                                             wx.DefaultSize, 0)
         self.expand_unselect_interior.SetToolTip(_("Expand the contour of the current selection and unselect the interior nodes"))
 
@@ -1819,25 +1882,31 @@ class Ops_Array(wx.Frame):
                                             wx.DefaultSize, 0)
         self.unselect_interior.SetToolTip(_("Conserve the contour of the current selection and unselect the interior nodes"))
 
-        erode_dilate_sizer.Add(self.expand_selection, 0, wx.EXPAND)
-        erode_dilate_sizer.Add(self.contract_selection, 0, wx.EXPAND)
-        erode_dilate_sizer.Add(self.expand_unselect_interior, 0, wx.EXPAND)
-        erode_dilate_sizer.Add(self.unselect_interior, 0, wx.EXPAND)
+        er_dil_1 = wx.BoxSizer(wx.HORIZONTAL)
+        er_dil_2 = wx.BoxSizer(wx.HORIZONTAL)
+        er_dil_1.Add(self.expand_selection, 1, wx.EXPAND)
+        er_dil_1.Add(self.contract_selection, 1, wx.EXPAND)
+        er_dil_2.Add(self.expand_unselect_interior, 1, wx.EXPAND)
+        er_dil_2.Add(self.unselect_interior, 1, wx.EXPAND)
+
+        erode_dilate_sizer.Add(er_dil_1, 1, wx.EXPAND)
+        erode_dilate_sizer.Add(er_dil_2, 1, wx.EXPAND)
 
         erode_dilate_options = wx.BoxSizer(wx.HORIZONTAL)
         self._label_passes = wx.StaticText(self.selection, wx.ID_ANY, _("Passes"), wx.DefaultPosition, wx.DefaultSize, 0)
         self._erode_dilate_value = wx.TextCtrl(self.selection, wx.ID_ANY, u"1", wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER)
         self._erode_dilate_value.SetToolTip(_("Number of passes for the erode/dilate operation"))
-        
-        erode_dilate_options.Add(self._label_passes, 0, wx.EXPAND)
-        erode_dilate_options.Add(self._erode_dilate_value, 0, wx.EXPAND)
+        self._erode_dilate_value.SetValidator(validator=IntValidator())
+
+        erode_dilate_options.Add(self._label_passes, 1, wx.EXPAND)
+        erode_dilate_options.Add(self._erode_dilate_value, 1, wx.EXPAND)
 
         self._erode_dilate_structure = wx.ComboBox(self.selection, wx.ID_ANY, _("Cross"), wx.DefaultPosition, wx.DefaultSize,
                                                     ["Cross", "Square"], wx.CB_READONLY)
         self._erode_dilate_structure.SetToolTip(_("Structuring element for the erode/dilate operation"))
         erode_dilate_options.Add(self._erode_dilate_structure, 1, wx.EXPAND)
 
-        erode_dilate_sizer.Add(erode_dilate_options, 0, wx.EXPAND)
+        erode_dilate_sizer.Add(erode_dilate_options, 1, wx.EXPAND)
 
         # MultiBlocks
         # ----------------
@@ -1864,8 +1933,10 @@ class Ops_Array(wx.Frame):
             # bSizer16.Add(self._open_block, 0, wx.EXPAND)
 
         bSizer16_1.Add(erode_dilate_sizer, 1, wx.EXPAND, 5)
+        bSizer16_1.Add(clipboad_sizer, 1, wx.EXPAND)
+
         bSizer16.Add(bSizer16_1, 1, wx.EXPAND, 5)
-        bSizer16.Add(bSizer16_2, 1, wx.EXPAND, 5)
+        # bSizer16.Add(bSizer16_2, 1, wx.EXPAND, 5)
         bSizer21.Add(bSizer16, 1, wx.EXPAND, 5)
 
         # VECTORS Manager
@@ -2040,11 +2111,15 @@ class Ops_Array(wx.Frame):
         self.LaunchSelection.Bind(wx.EVT_BUTTON, self.OnLaunchSelect)
         self.AllSelection.Bind(wx.EVT_BUTTON, self.OnAllSelect)
         self.MoveSelection.Bind(wx.EVT_BUTTON, self.OnMoveSelect)
+        self.ReselectMemory.Bind(wx.EVT_BUTTON, self.OnReselectMemory)
         self.ResetSelection.Bind(wx.EVT_BUTTON, self.OnResetSelect)
         self.ResetAllSelection.Bind(wx.EVT_BUTTON, self.OnResetAllSelect)
         self.to_clipboard_str.Bind(wx.EVT_BUTTON, self.OnToClipboardStr)
         self.to_clipboard_script.Bind(wx.EVT_BUTTON, self.OnToClipboardStr)
 
+        self.SaveSelection.Bind(wx.EVT_BUTTON, self.OnSaveSelection)
+        self.LoadSelection.Bind(wx.EVT_BUTTON, self.OnLoadSelection)
+
         self.m_button2.Bind(wx.EVT_BUTTON, self.OnManageVectors)
         self.loadvec.Bind(wx.EVT_BUTTON, self.OnLoadvec)
         self.saveas.Bind(wx.EVT_BUTTON, self.OnSaveasvec)
@@ -2237,18 +2312,44 @@ class Ops_Array(wx.Frame):
         self.parentarray.myops.nbselect.SetLabelText('All')
         self.parentarray.myops.nbselect2.SetLabelText('All')
 
+    def OnReselectMemory(self, event):
+        """
+        Reselect from memory
+        """
+
+        if self.parentarray.mngselection is not None:
+            self.parentarray.mngselection.reselect_from_memory()
+    
     def OnMoveSelect(self, event):
         """Transfert de la sélection courante dans un dictionnaire"""
 
         dlg = wx.TextEntryDialog(self, 'Choose id', 'id?')
         ret = dlg.ShowModal()
+
+        if ret == wx.ID_CANCEL:
+            logging.info('Cancel transfer')
+            dlg.Destroy()
+            return
+        
         idtxt = dlg.GetValue()
+        dlg.Destroy()
 
-        dlg = wx.ColourDialog(self)
-        ret = dlg.ShowModal()
-        color = dlg.GetColourData()
+        if self.parentarray.SelectionData is not None:
+            if self.parentarray.SelectionData.nb > 0:
+                dlg = wx.ColourDialog(self)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_OK:
+                    color = dlg.GetColourData()
+                    color = color.GetColour().Get()
+                    dlg.Destroy()
+                else:
+                    logging.info('Cancel transfer')
+                    dlg.Destroy()
+                    return
+            else:
+                color = (20,20,20,255)
 
-        self.parentarray.SelectionData.move_selectionto(idtxt, color.GetColour())
+        self.parentarray.SelectionData.move_selectionto(idtxt, color)
 
     def OnContractSelection(self, event):
         """ Contract selection """
@@ -2261,7 +2362,8 @@ class Ops_Array(wx.Frame):
 
         usemask = self.selectrestricttomask.GetValue()
 
-        self.parentarray.erode_selection(nb, usemask = usemask, structure = structure)
+        self.parentarray.SelectionData.erode_selection(nb, usemask, structure)
+        self.refresh_array()
     
     def OnExpandSelection(self, event):
         """ Expand selection """
@@ -2273,7 +2375,8 @@ class Ops_Array(wx.Frame):
 
         usemask = self.selectrestricttomask.GetValue()
 
-        self.parentarray.dilate_selection(nb, usemask, structure)
+        self.parentarray.SelectionData.dilate_selection(nb, usemask, structure)
+        self.refresh_array()
 
     def OnExpandUnselectInterior(self, event):
         """ Expand contour """
@@ -2286,11 +2389,13 @@ class Ops_Array(wx.Frame):
 
         usemask = self.selectrestricttomask.GetValue()
 
-        self.parentarray.dilate_contour_selection(nb, usemask, structure)
+        self.parentarray.SelectionData.dilate_contour_selection(nb, usemask, structure)
+        self.refresh_array()
 
     def OnUnselectInterior(self, event):
         """ Contract contour """
-        self.parentarray.erode_contour_selection()
+        self.parentarray.SelectionData.erode_contour_selection()
+        self.refresh_array()
 
     def reset_selection(self):
         """
@@ -2330,6 +2435,20 @@ class Ops_Array(wx.Frame):
         self.reset_all_selection()
         self.refresh_array()
 
+    def OnSaveSelection(self, event):
+        """
+        Save the current selection
+        """
+
+        self.parentarray.SelectionData.save_selection()
+
+    def OnLoadSelection(self, event):
+        """
+        Load a selection
+        """
+
+        self.parentarray.SelectionData.load_selection()
+    
     def OnToClipboardStr(self, event):
         """
         Copy the current selection to the clipboard as a string
@@ -3132,16 +3251,19 @@ class SelectionData():
         self.myselection = []
         self.selections = {}
 
-    def get_string(self, which:str = None) -> str:
+    def get_string(self, which:str = None, all_memories:bool= False) -> str:
         """ Get string of the current selection or of a stored one """
 
         if which is None:
             curlist = self.myselection
-            txt = 'X\tY'
+            txt = 'X\tY\n'
         else:
             if str(which) in self.selections:
+                all_memories = False
                 curlist = self.selections[str(which)]['select']
-                txt = 'Selection {}\n'.format(which) + 'X\tY\n'
+                txt = 'Selection {}\n'.format(which) 
+                txt += 'Color : {}\n'.format(self.selections[str(which)]['color'])
+                txt += 'X\tY\n'
             else:
                 logging.error(_('Selection {} does not exist').format(which))
                 return ''
@@ -3161,6 +3283,10 @@ class SelectionData():
             i,j = self.parent.get_ij_from_xy(cur[0], cur[1], aswolf=True)
             txt += str(i) + '\t' + str(j) + '\n'
 
+        if all_memories:
+            for key, cur in self.selections.items():
+                txt += self.get_string(key)
+        
         return txt
 
     def get_script(self, which:int = None) -> str:
@@ -3215,6 +3341,39 @@ class SelectionData():
             else:
                 logging.warning(_('Cannot open the clipboard'))
 
+    def reselect_from_memory(self, idx:list[str] = None):
+        """
+        Reselect a stored selection
+
+        :param idx: id/key of the selection
+        """
+
+        if idx is None:
+            keys = list(self.selections.keys())
+            with wx.MultiChoiceDialog(None, "Choose the memory to reselect", "Choices", keys+['All']) as dlg:
+                ret = dlg.ShowModal()
+                if ret == wx.ID_CANCEL:
+                    return
+            
+                idx = dlg.GetSelections()
+                if len(idx) == 0:
+                    return  
+                
+                if len(idx) == 1 and idx[0] == len(keys):
+                    idx = keys
+                elif len(idx) in idx:
+                    idx = keys
+                else:                
+                    idx = [keys[i] for i in idx]
+
+        for curidx in idx:
+            if curidx in self.selections:
+                self.myselection += self.selections[curidx]['select']
+            else:
+                logging.error(_('Selection {} does not exist').format(idx))
+
+            self.update_nb_nodes_selection()
+            self.parent.reset_plot()
 
     def move_selectionto(self, idx:str, color:list[float], resetplot:bool=True):
         """
@@ -3561,6 +3720,101 @@ class SelectionData():
 
         self.update_nb_nodes_selection()
 
+    def dilate_contour_selection(self, nbiter:int= 1, use_mask:bool = True, structure:np.ndarray = np.ones((3,3))):
+        """ Dilate the contour of the selection """
+
+        if self.nb > 0:
+            oldsel = self.myselection.copy()
+            self.dilate_selection(nbiter, use_mask, structure)
+            newsel = self.myselection.copy()
+            self.myselection = [cur for cur in newsel if cur not in oldsel]
+            self.update_nb_nodes_selection()
+        else:
+            logging.info('No selection to expand/dilate')
+
+    def erode_contour_selection(self):
+        """ Erode the contour of the selection """
+
+        if self.nb > 0:
+            oldselect = self.myselection.copy()
+            self.erode_selection(1)
+            newselect = self.myselection.copy()
+            self.myselection = [cur for cur in oldselect if cur not in newselect]
+            self.update_nb_nodes_selection()
+        else:
+            logging.info('No selection to contract/erode')
+
+    def save_selection(self, filename:str=None):
+        """ Save the selection to a file """
+
+        if filename is None:
+            with wx.FileDialog(None, 'Save selection', wildcard='Text files (*.txt)|*.txt',
+                                 style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as dlg:
+                if dlg.ShowModal() == wx.ID_CANCEL:
+                    return
+                filename = dlg.GetPath()
+
+        with open(filename, 'w') as f:
+            f.write(self.get_string(all_memories=True))
+
+    def load_selection(self, filename:str=None):
+        """ Load a selection from a file """
+
+        if filename is None:
+            with wx.FileDialog(None, 'Load selection', wildcard='Text files (*.txt)|*.txt',
+                                    style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST) as dlg:
+                if dlg.ShowModal() == wx.ID_CANCEL:
+                    return
+                filename = dlg.GetPath()
+
+        with open(filename, 'r') as f:
+            lines = f.readlines()
+
+        xy = []
+        k=0
+        for line in lines:
+            if line[0] == 'X':
+                k+=1
+                continue
+            if line[0] == 'i':
+                k+=1
+                break
+            x, y = line.split()
+            xy.append((float(x), float(y)))
+            k+=1
+
+        self.myselection = xy
+        self.update_nb_nodes_selection()
+
+        k += len(xy)
+
+        while k < len(lines):
+            lines = lines[k:]
+            k=0
+            for line in lines:
+                if 'Selection' in line:
+                    idx = line.split()[1]
+                    self.selections[idx] = {}
+                    xy = []
+                    k+=1
+                elif 'Color' in line:
+                    color = [int(x.replace('[','').replace(']','').replace(',','')) for x in line.split()[2:]]
+                    self.selections[idx]['Color'] = color
+                    k+=1
+                elif line[0] == 'X':
+                    k+=1
+                    continue
+                elif line[0] == 'i':
+                    k+=len(xy)+1
+                    self.selections[idx]['select']=xy
+                    break
+                else:
+                    x, y = line.split()
+                    xy.append((float(x), float(y)))
+                    k+=1
+
+        self.parent.reset_plot()
+
     def update_nb_nodes_selection(self):
         """ Update the number of selected nodes """
 
@@ -4320,6 +4574,14 @@ class SelectionDataMB(SelectionData):
     def get_string(self, which:str = None) -> str:
 
         logging.error(_('Not yet implemented for Multi-Blocks'))
+    
+    def save_selection(self, filename:str=None, which:str = None):
+
+        logging.error(_('Not yet implemented for Multi-Blocks'))
+
+    def load_selection(self, filename:str=None, which:str = None):
+
+        logging.error(_('Not yet implemented for Multi-Blocks'))
 
     def get_script(self, which:int = None) -> str:
 
@@ -4351,6 +4613,18 @@ class SelectionDataMB(SelectionData):
         for curblock in self.parent.active_blocks:
             curblock.SelectionData.select_underpoly(myvect)
 
+    def dilate_selection(self, nb_iterations:int, use_mask:bool = True, structure:np.ndarray = None):
+        """ Extend the selection """
+
+        for curblock in self.parent.active_blocks:
+            curblock.SelectionData.dilate_selection(nb_iterations, use_mask, structure)
+
+    def erode_selection(self, nb_iterations:int, use_mask:bool = True, structure:np.ndarray = None):
+        """ Reduce the selection """
+
+        for curblock in self.parent.active_blocks:
+            curblock.SelectionData.erode_selection(nb_iterations, use_mask, structure)
+
     def update_nb_nodes_selection(self):
         """ Update the number of nodes selected """
 
@@ -4701,55 +4975,6 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.add_ops_sel() # Ajout d'un gestionnaire de sélection et d'opérations
 
-    def erode_selection(self, nbiter:int= 1, usemask:bool = True, structure:np.ndarray = np.ones((3,3))):
-        """ Erode the selection """
-
-        if self.SelectionData is not None:
-            if self.SelectionData.nb > 0:
-                self.SelectionData.erode_selection(nbiter, usemask, structure)
-                self.SelectionData.update_nb_nodes_selection()
-                self.reset_plot()
-            else:
-                logging.info('No selection to contract/erode')
-    
-    def dilate_selection(self, nbiter:int= 1, usemask:bool = True, structure:np.ndarray = np.ones((3,3))):
-        """ Dilate the selection """
-
-        if self.SelectionData is not None:
-            if self.SelectionData.nb > 0:
-                self.SelectionData.dilate_selection(nbiter, usemask, structure)
-                self.SelectionData.update_nb_nodes_selection()
-                self.reset_plot()
-            else:
-                logging.info('No selection to dilate')
-
-    def dilate_contour_selection(self, nbiter:int= 1, usemask:bool = True, structure:np.ndarray = np.ones((3,3))):
-        """ Dilate the contour of the selection """
-
-        if self.SelectionData is not None:
-            if self.SelectionData.nb > 0:
-                oldsel = self.SelectionData.myselection.copy()
-                self.SelectionData.dilate_selection(nbiter, usemask, structure)
-                newsel = self.SelectionData.myselection.copy()
-                self.SelectionData.myselection = [cur for cur in newsel if cur not in oldsel]
-                self.SelectionData.update_nb_nodes_selection()
-                self.reset_plot()
-            else:
-                logging.info('No selection to expand/dilate')
-
-    def erode_contour_selection(self):
-        """ Erode the contour of the selection """
-        if self.SelectionData is not None:
-            if self.SelectionData.nb > 0:
-                oldselect = self.SelectionData.myselection.copy()
-                self.SelectionData.erode_selection(1)
-                newselect = self.SelectionData.myselection.copy()
-                self.SelectionData.myselection = [cur for cur in oldselect if cur not in newselect]
-                self.SelectionData.update_nb_nodes_selection()
-                self.reset_plot()
-            else:
-                logging.info('No selection to contract/erode')
-
     def set_opacity(self, alpha:float):
         """ Set the transparency of the array """
 

{wolfhece-2.1.74.dist-info → wolfhece-2.1.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.74
+Version: 2.1.76
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: Copyright (c) 2024 University of Liege. All rights reserved.
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.74.dist-info → wolfhece-2.1.76.dist-info}/RECORD

@@ -7,7 +7,7 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=SI4oNF_J3MdjiWZoizS8kuRXLMVyymX9dYfYJNVCQVI,476989
 wolfhece/PyConfig.py,sha256=FB8u0belXOXTb03Ln6RdVWvMgjzi3oGPCmw2dWa3lNg,8332
 wolfhece/PyCrosssections.py,sha256=FnmM9DWY_SAF2EDH9Gu2PojXNtSTRF4-aYQuAAJXBh4,112771
-wolfhece/PyDraw.py,sha256=nud0raPc9AYDLgA3dYNOaOXQCWzLzCicxmxp7VihYtQ,416394
+wolfhece/PyDraw.py,sha256=VPe_MTPd6_gjyRL627yEWnE6RbL9t-EQmEDLa1t1dVM,421909
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -48,7 +48,7 @@ wolfhece/pywalous.py,sha256=yRaWJjKckXef1d9D5devP0yFHC9uc6kRV4G5x9PNq9k,18972
 wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=map7HsGYML_o5NHRdFg2s_TVQed_lDnpYNDv27MM0Vw,14130
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=Oze4IYwE19LnxERNi48duYdp3qLXENg8p3_f5KuC1ho,393076
+wolfhece/wolf_array.py,sha256=Rj_N7yg4OqwLRAWwDBl0VwwpXLzP0hPwhTRcwB3P5yA,400860
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
@@ -72,7 +72,7 @@ wolfhece/apps/check_install.py,sha256=Xoi_d8MzKzNAy2xqEpERdsqgRPu0hbBWukI0WkIYzD
 wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefgmk,5334
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=SrustmIQeXnsiD-92OzjdGhBi-S7c_j-cSvuX4T6rtg,2929
-wolfhece/apps/version.py,sha256=T9oL1EY3HMV5ZVLUeJEU1FuT__QAQ0iSx8HOFn7mc4Y,388
+wolfhece/apps/version.py,sha256=mJE6gMQ0LXmVC2n9qC4xJHXz1aj3sU-1ej5zEwZ8K4E,388
 wolfhece/apps/wolf.py,sha256=j_CgvsL8rwixbVvVD5Z0s7m7cHZ86gmFLojKGuetMls,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -126,8 +126,8 @@ wolfhece/hydrology/read.py,sha256=itMat6MMn4Y14C3SMU_9JMBtpXFjG4mLNMfXXd5U6Ns,93
 wolfhece/hydrology/slope_manager.py,sha256=vlek0z8qcqB61eleiksyOe3QR1vpbtwfeowy6ms7_Fg,5580
 wolfhece/hydrology/wolfMap_treatment.py,sha256=eAxr24zJGwmDof1aZpcxewVvv_bWDvoO8t9Wwf99Mlo,10606
 wolfhece/hydrometry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrometry/kiwis.py,sha256=jW5ivM0h_wZ_jM6OWh994iwQtsCZdwmQsMA7TMnCxMg,46495
-wolfhece/hydrometry/kiwis_gui.py,sha256=lApsSeBMJNAR1yocggdoHwz_xe6M_oaZ_E13CfHAlQA,23124
+wolfhece/hydrometry/kiwis.py,sha256=br80IMFvg2xfTjaUaYT9QS7q1LBzQ8kvPBxJDcSujrA,55991
+wolfhece/hydrometry/kiwis_gui.py,sha256=SdO8EmyFzhzjHlEjZtNJ68HXBOLkK9l40c0750F39V4,23146
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/hydrometry/kiwispie.py,sha256=akOaV46WwzISVlCcPz_phjsBrI_rDACUzdELtjx-xNg,13498
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
@@ -283,8 +283,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=8PlMYrb_8jI8h9F0_EagpM
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=ORy7fz4dcp691qKzaOZHrRLZ0uXNhL-LIHxmpDGL6BI,5007
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.74.dist-info/METADATA,sha256=7aW4jIl11xOINRkPpa0QcgwbJNb_2AE0CRq8JJ3wy9o,2570
-wolfhece-2.1.74.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-wolfhece-2.1.74.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.74.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.74.dist-info/RECORD,,
+wolfhece-2.1.76.dist-info/METADATA,sha256=MjRjAJdHj-X5rrJuDTOU25orlRrGES6yus46PEGqQQw,2570
+wolfhece-2.1.76.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.76.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.76.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.76.dist-info/RECORD,,