wolfhece 2.2.36__py3-none-any.whl → 2.2.38__py3-none-any.whl

wolfhece/hydrometry/kiwis.py

@@ -424,7 +424,7 @@ class hydrometry():
             self.get_groups()
             self.save_struct()
         except Exception as e:
-            print('Error in hydrometry init :', e)
+            logging.error('Error in hydrometry init :', e)
             self.realstations = None
             pass
 
@@ -1041,7 +1041,7 @@ class hydrometry():
         if timezone=='Europe/Brussels' or timezone=='local':
             timezone=''
 
-        nb = (todate - fromdate).days*24 * (3600/interval)
+        nb = int((todate - fromdate).days*24 * (3600/interval))
         cursec = interval
         # id = ''
         if ts_id == '':
@@ -1105,8 +1105,8 @@ class hydrometry():
             curend = curfrom+timedelta(seconds=200000 * cursec)
             locts=[]
             while curfrom<todate:
-                print(curfrom, curend)
-                tmpts = self.timeseries(stationname, stationcode, dir, curfrom, curend, ts_name, ts_id, timezone=timezone)
+                logging.info('Getting data from {0} to {1}'.format(curfrom, curend))
+                tmpts = self.timeseries(stationname, stationcode, dir = dir, fromdate= curfrom, todate= curend, ts_name= ts_name, ts_id= ts_id, timezone=timezone)
                 if len(tmpts)>0:
                     locts.append(tmpts)
 
@@ -1115,22 +1115,31 @@ class hydrometry():
                 if curend>todate:
                     curend=todate
 
+            if len(locts)==0:
+                logging.warning('No data found for timeseries {0} for station {1} ({2}) between {3} and {4}'.format(ts_name, stationname, stationcode, fromdate, todate))
+                return pd.DataFrame()
+
             return pd.concat(locts)
         else:
-            json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValues)
-                                    +"&"+urllib.parse.urlencode({
-                                    "ts_id":str(ts_id),
-                                    "from":fromdate.strftime("%Y-%m-%dT%H:%M:%S"),
-                                    "to":todate.strftime("%Y-%m-%dT%H:%M:%S"),
-                                    # "format":"json",
-                                    "timezone":timezone})
-                                    ,verify=True,
-                                    headers=self._header,
-                                    timeout=TIMEOUT).json()
+            try:
+                json_data = requests.get(self._get_commandstr(kiwis_command.getTimeseriesValues)
+                                        +"&"+urllib.parse.urlencode({
+                                        "ts_id":str(ts_id),
+                                        "from":fromdate.strftime("%Y-%m-%dT%H:%M:%S"),
+                                        "to":todate.strftime("%Y-%m-%dT%H:%M:%S"),
+                                        # "format":"json",
+                                        "timezone":timezone})
+                                        ,verify=True,
+                                        headers=self._header,
+                                        timeout=TIMEOUT).json()
 
-            df = pd.DataFrame(json_data[0]['data'], columns = json_data[0]['columns'].split(','))
-            df.set_index('Timestamp', inplace = True)
-            df.index = pd.to_datetime(df.index,format="%Y-%m-%dT%H:%M:%S.%f%z")
+                df = pd.DataFrame(json_data[0]['data'], columns = json_data[0]['columns'].split(','))
+                df.set_index('Timestamp', inplace = True)
+                df.index = pd.to_datetime(df.index,format="%Y-%m-%dT%H:%M:%S.%f%z")
+
+            except Exception as e:
+                logging.error('Error in timeseries :', e)
+                return pd.DataFrame()
 
         return df.squeeze()
 
@@ -1210,8 +1219,8 @@ class hydrometry():
             curend = curfrom+timedelta(seconds=200000 * cursec)
             locts=[]
             while curfrom<todate:
-                print(curfrom, curend)
-                locts.append(self.timeseries(stationname,stationcode,dir,curfrom,curend,ts_name,ts_id))
+                logging.info('Getting data from {0} to {1}'.format(curfrom, curend))
+                locts.append(self.timeseries(stationname,stationcode, dir = dir, fromdate= curfrom, todate= curend, ts_name= ts_name, ts_id= ts_id))
                 curfrom = curend
                 curend = curfrom+timedelta(seconds=200000 * cursec)
                 if curend>todate:

wolfhece/hydrometry/kiwis_gui.py

@@ -274,6 +274,10 @@ class hydrometry_gui(wx.Frame):
         """
         to_exclude = ['alarm', 'batterie']
 
+        if len(self.listbox2.GetSelections())==0:
+            logging.error(_('No station selected'))
+            return
+
         #treat only the first one if multiple selections
         stationname, stationcode = self._getname_code_fromindex(self.listbox2.GetSelections()[0])
 
@@ -584,11 +588,12 @@ class hydrometry_gui(wx.Frame):
         if stationname is None:
             return
 
-        for curdata, curname in zip(data,tsname):
+        for curdata, curname in zip(data, tsname):
             if curdata is not None:
                 if len(curdata)>1:
                     curdata.to_csv('{}-{}.csv'.format(stationcode,curname), date_format="%Y%m%d%H%M%S%z", sep=";")
-                    if datumsizebv[0]!='':
+
+                    if datumsizebv[0]!='' and 'hauteur' in curname.lower():
                         curdata:pd.Series
                         zdata = curdata.copy()
                         zdata +=  float(datumsizebv[0])

wolfhece/picc.py

@@ -19,6 +19,7 @@ from .PyTranslate import _
 from .PyVertexvectors import Zones, zone, vector, wolfvertex
 from .PyVertex import cloud_vertices, getRGBfromI, getIfromRGB
 from .drawing_obj import Element_To_Draw
+from .wolf_array import WolfArray
 
 class Picc_data(Element_To_Draw):
     """
@@ -38,7 +39,7 @@ class Picc_data(Element_To_Draw):
 
         self.data_dir = data_dir
         self._filename_vector = 'Wallonie.gdb' #'PICC_Vesdre.shp'
-        self._filename_points = 'PICC_Vesdre_points.shp'
+        self._filename_points = 'ADRESS_POINT.shp' #'PICC_Vesdre_points.shp'
         self.zones = None
         self.cloud = None
         self._colors = {'Habitation': [255, 0, 0], 'Annexe': [0, 255, 0], 'Culture, sport ou loisir': [0, 0, 255], 'Autre': [10, 10, 10]}
@@ -59,9 +60,11 @@ class Picc_data(Element_To_Draw):
         if data_dir is None:
             data_dir = self.data_dir
 
+        data_dir = Path(data_dir)
+
         datafile = data_dir / self._filename_vector
 
-        if datafile.exists():
+        if datafile.exists() and datafile.is_file():
             self.zones = Zones(data_dir / self._filename_vector, bbox = bbox, mapviewer=self.mapviewer, colors= self._colors)
         else:
             logging.info(_('File not found : {}').format(datafile))
@@ -118,6 +121,24 @@ class Picc_data(Element_To_Draw):
             else:
                 logging.error(_('Point file not found : {}').format(pointfile))
 
+                if self.mapviewer is not None:
+                    dlg = wx.FileDialog(None, _('Select a point file'), wildcard="Shapefile (*.shp)|*.shp|Gpkg (*.gpkg)|*.gpkg", style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
+                    if dlg.ShowModal() == wx.ID_CANCEL:
+                        dlg.Destroy()
+                        return
+
+                    pathname = dlg.GetPath()
+                    dlg.Destroy()
+
+                    try:
+                        self._filename_points = Path(pathname)
+
+                        self.cloud = cloud_vertices(pathname, bbox = bbox, mapviewer=self.mapviewer)
+                        self.cloud.myprop.width = 3
+                        self.cloud.myprop.color = getIfromRGB([0, 0, 255])
+                    except:
+                        logging.error(_('File not found : {}').format(pathname))
+
 
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot data in OpenGL context
@@ -132,10 +153,11 @@ class Picc_data(Element_To_Draw):
         """
 
         if self.zones is not None:
-            self.zones.plot(sx=sx, sy=sy, xmin=xmin, ymin=ymin, xmax=xmax, ymax=ymax, size=size)
+           self.zones.plot(sx=sx, sy=sy, xmin=xmin, ymin=ymin, xmax=xmax, ymax=ymax, size=size)
         if self.cloud is not None:
             self.cloud.plot(sx=sx, sy=sy, xmin=xmin, ymin=ymin, xmax=xmax, ymax=ymax, size=size)
 
+
     def check_plot(self):
         """ Generic function responding to check operation from mapviewer """
 
@@ -153,7 +175,7 @@ class Picc_data(Element_To_Draw):
 
             self.mapviewer.Refresh()
 
-    def uncheck_plot(self, unload: bool = True):
+    def uncheck_plot(self, unload: bool = True, reset_filename: bool = False):
         """ Generic function responding to uncheck operation from mapviewer """
 
         super().uncheck_plot(unload = unload)
@@ -162,6 +184,11 @@ class Picc_data(Element_To_Draw):
             self.zones = None
             self.cloud = None
 
+        if reset_filename:
+            self._filename_vector = ''
+            self._filename_points = ''
+            self.data_dir = Path(r'./data/PICC')
+
     def show_properties(self):
         """ Showing properties of the object """
 
@@ -201,6 +228,13 @@ class Picc_data(Element_To_Draw):
         else:
             logging.warning(_('No mapviewer to activate zone !'))
 
+    def extrude_polygons(self, dest_array: WolfArray):
+        """ Extrude the active polygon along the z-axis """
+
+        if self.zones is not None:
+            for curzone in self.zones.myzones:
+                dest_array.interpolate_on_polygons(curzone, keep = 'above')
+
 class Cadaster_data(Picc_data):
     """ Read and show cadaster data """
 

{wolfhece-2.2.36.dist-info → wolfhece-2.2.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.36
+Version: 2.2.38
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.36.dist-info → wolfhece-2.2.38.dist-info}/RECORD

@@ -8,7 +8,7 @@ wolfhece/Model1D.py,sha256=snEmu8Uj2YGcp1ybPnly-4A389XRnuOujGduqInNcgw,477001
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
 wolfhece/PyCrosssections.py,sha256=2m372NSriH41AcIk723y2i44mwUXodbIMIzqkuVMjUY,127365
-wolfhece/PyDraw.py,sha256=yE3Cdhnr74yLnZBRN6vBu0xk3KXfg8Z5SA1P3jzORpM,688239
+wolfhece/PyDraw.py,sha256=F2zS8Mf8H44JDsV-ZaXaMIGx3lSFDUIyCeoLDQYRAiU,690532
 wolfhece/PyGui.py,sha256=mcLuHT_pGjW1ltJ-kjNFstVXyeBoZRCvM3vHWv5srB8,148594
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
@@ -16,8 +16,8 @@ wolfhece/PyPalette.py,sha256=SiRngKml2EXsq1jwQvqh5pBZiV1yS0CY7QrRJGSZD1s,36281
 wolfhece/PyParams.py,sha256=BgTAwxxq831rYEq_KLcFBX_upjiSUpVtfoQnCxCNWUI,100443
 wolfhece/PyPictures.py,sha256=5X2HBkZG1gTaMKMu6UoU-cOY8SRkFyPScJ8bhdoNY7g,18930
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=a56oY1NB45QnwARg96Tbnq-z-mhZKFkYOkFOO1lNtlk,51056
-wolfhece/PyVertexvectors.py,sha256=-ksHufJpbCQwMW73fjs3LE0kfvc3K_TfjbFOUaTEL70,370360
+wolfhece/PyVertex.py,sha256=dg6pqYRBlveodKhpg9YQv3zBPq2TS986HhyTtlZIXGU,51274
+wolfhece/PyVertexvectors.py,sha256=1-XhaaLa8dmwM0524vaUqyEIBzzd4313oRFnWYCXCUo,375606
 wolfhece/PyWMS.py,sha256=XcSlav5icct2UwV7K2r7vpxa5rKZWiHkp732lI94HFI,31534
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -46,7 +46,7 @@ wolfhece/lifewatch.py,sha256=Q_Wy6VGkrD-xxY0fv3PKpT8U8oXxNMgiLlrAE3bMheo,16340
 wolfhece/matplotlib_fig.py,sha256=vnFI6sghw9N9jKhR8X1Z4aWli_5fPNylZQtFuujFJDY,84075
 wolfhece/multiprojects.py,sha256=Sd6Bl6YP33jlR79A6rvSLu23vq8sqbFYL8lWuVPkEpE,21549
 wolfhece/os_check.py,sha256=SUHyUZ_tuRDvL995LFoJ6ncE91HcYpd9xN8Tfcg4RUA,316
-wolfhece/picc.py,sha256=0X_pzhSBoVxgtTfJ37pkOQO3Vbr9yurPaD1nVeurx8k,8531
+wolfhece/picc.py,sha256=2haBqyY7tMphyifIPafPjC7ZnxZRcD585DDkgEFLATw,9988
 wolfhece/pidcontroller.py,sha256=PHYenOdzfyPK2pXAhyRolCxMSMRd2AFza0eVMafpPHk,5205
 wolfhece/pyGui1D.py,sha256=9g7OS3YiKsqy--6y0cBD7x2gaqTTYFXWkxImpgnTA20,121937
 wolfhece/pybridges.py,sha256=bFAqjL4ColeJtwvyCPGQ8VllWoq1RbVWXxFrdfrvqm8,65954
@@ -89,7 +89,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=VBzF5NhnicGf2DpF1l5niAxswGFUsu6LAzTRFunDAvg,388
+wolfhece/apps/version.py,sha256=zSOtAk-adGkIXfloe0DaNJen1MYZBxqVeiHCM9qL5Gc,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -144,17 +144,19 @@ wolfhece/hydrology/PyWatershed.py,sha256=a26M6tVe4hrQ-a8FyAx7H9-RZcVCU5BBzFff4_Y
 wolfhece/hydrology/RetentionBasin.py,sha256=vFvpnomo5h8ZWq3Hq-YlxRnyqyQqHrojABMKzu3RP6E,83358
 wolfhece/hydrology/SubBasin.py,sha256=ORK1VmvBOfyDjfOTxFQ9bcHe78pAoVcRWwu5Vm-CDHo,181790
 wolfhece/hydrology/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/hydrology/constant.py,sha256=0o6l8zwLESlW6G9vYNFlUJV4YhcDq6_jnCN28DNchmU,1634
+wolfhece/hydrology/climate_data.py,sha256=CYCs0ViP389-lbYKeOFSYjPdwvKlHWdMs0RePsl6c2w,13418
+wolfhece/hydrology/constant.py,sha256=tP-AHRzXNKLtVI3VuqG8Q_tQ0-P5mrX_zFlznB6OeHo,2526
 wolfhece/hydrology/cst_exchanges.py,sha256=yT2cSIXjlfshPkSAdhyBxYwCPZ5L9s75BYM24tEO6_4,39699
 wolfhece/hydrology/data_treatment.py,sha256=vHNtEvXHJOdGHjaNjbTTvVoFQjVee-AdspJEesxVNuQ,34967
 wolfhece/hydrology/forcedexchanges.py,sha256=MrzMqKISX6G6t3XwkyFQa6tVFfTTC8ifm_nSvrOy5-8,2259
+wolfhece/hydrology/hyetograms.py,sha256=E24e3zDIfzBk0C-djI61pL6D7G3BVGtpXNTP4UqjIXw,83393
 wolfhece/hydrology/plot_hydrology.py,sha256=M1cujLxA03SG8P7CkIPVIsrbfsbCwZPpLHQHN2xxm4w,35708
 wolfhece/hydrology/read.py,sha256=BaaIp1x44wPQz2LkWtzu7ZNKx3Gw_WDtAw-B4y_C2IU,9553
 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=HDsTZenqG5La4t0Rv9iJeScH_j07w2k3J5fMlj74jI8,64491
-wolfhece/hydrometry/kiwis_gui.py,sha256=xubayI3ijq87l47pcVtP-D9mOGurOSu9rKz511oa7n0,24898
+wolfhece/hydrometry/kiwis.py,sha256=UEShGBMHMqxMj58304GFt_SAoaACZi4PhJVEC8MpZ-E,65130
+wolfhece/hydrometry/kiwis_gui.py,sha256=s4xCsqkKvI1YcIZ4X2A7hV11zyJFI8Q_4i82jOO6_ys,25060
 wolfhece/hydrometry/kiwis_wolfgui.py,sha256=GPa5YNp2V2ZlxYQjPiCXERgPuWB_zij4ec2yHpRvoFA,4027
 wolfhece/icons/folder_open.png,sha256=ykBlU2FtGcpjAu1YO4_eGlDg2svgs_IAs-4d5O2e3AM,2329
 wolfhece/icons/folder_plus.png,sha256=Z1Jcs87Z6pNcudxGDTNhC_hgolSSaXe6_fmQE_n-ero,1963
@@ -308,8 +310,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.2.36.dist-info/METADATA,sha256=PcT7osVZ0AdB24tdvLvyBzA0_88Zmx2WyHyY3FhFs0c,2729
-wolfhece-2.2.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.36.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.36.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.36.dist-info/RECORD,,
+wolfhece-2.2.38.dist-info/METADATA,sha256=-p1k0cf0vU1Z873clKqpbu4YwhoQTcXLhqqLXtyNz9M,2729
+wolfhece-2.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.38.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.38.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.38.dist-info/RECORD,,