wolfhece 2.1.17__py3-none-any.whl → 2.1.18__py3-none-any.whl

wolfhece/PyDraw.py

@@ -882,7 +882,12 @@ class WolfMapViewer(wx.Frame):
 
 
     def get_canvas_bounds(self, gridsize:float = None):
-        """ Retourne les limites de la zone d'affichage """
+        """ 
+        Retourne les limites de la zone d'affichage 
+        
+        :return: [xmin, ymin, xmax, ymax]
+
+        """
 
         if gridsize is None:
 
@@ -2772,13 +2777,26 @@ class WolfMapViewer(wx.Frame):
                                '2015': 'ORTHO_2015', '2016': 'ORTHO_2016', '2017': 'ORTHO_2017',
                                '2018': 'ORTHO_2018', '2019': 'ORTHO_2019', '2020': 'ORTHO_2020',
                                '2021': 'ORTHO_2021', '2022 printemps': 'ORTHO_2022_PRINTEMPS', '2022 été': 'ORTHO_2022_ETE',
-                               '2023 été': 'ORTHO_2023_ETE'}}
+                               '2023 été': 'ORTHO_2023_ETE',
+                               }}
+        data_2021 = {'EAU': {'IDW': 'ZONES_INONDEES_IDW', 
+                             'Emprise': 'ZONES_INONDEES', 
+                             'Emprise wo Alea': 'ZONES_INONDEES_wo_alea'}}
+        
         for idx, (k, item) in enumerate(orthos.items()):
             for kdx, (m, subitem) in enumerate(item.items()):
                 self.add_object(which='wmsback',
                                 newobj=imagetexture('PPNC', m, k, subitem,
                                                     self, xmin, xmax, ymin, ymax, -99999, 1024),
                                 ToCheck=False, id='PPNC ' + m)
+
+        for idx, (k, item) in enumerate(data_2021.items()):
+            for kdx, (m, subitem) in enumerate(item.items()):
+                self.add_object(which='wmsback',
+                                newobj=imagetexture('PPNC', m, k, subitem,
+                                                    self, xmin, xmax, ymin, ymax, -99999, 1024),
+                                ToCheck=False, id='Data 2021 ' + m)
+
         self.add_object(which='wmsback',
                         newobj=imagetexture('PPNC', 'Orthos France', 'OI.OrthoimageCoverage.HR', '',
                                             self, xmin, xmax, ymin, ymax, -99999, 1024, France=True, epsg='EPSG:27563'),
@@ -5594,7 +5612,7 @@ class WolfMapViewer(wx.Frame):
         Add object to current Frame/Drawing area
         """
 
-        filterArray = "bin (*.bin)|*.bin|Elevation WOLF2D (*.top)|*.top|Geotif (*.tif)|*.tif|Float ESRI (*.flt)|*.flt|Numpy (*.npy)|*.npy|Numpy named arrays(*.npz)|*.npz|all (*.*)|*.*"
+        filterArray = "All supported formats|*.bin;*.tif;*.tiff;*.top;*.flt;*.npy;*.npz|bin (*.bin)|*.bin|Elevation WOLF2D (*.top)|*.top|Geotif (*.tif)|*.tif|Float ESRI (*.flt)|*.flt|Numpy (*.npy)|*.npy|Numpy named arrays(*.npz)|*.npz|all (*.*)|*.*"
         filterjson = "json (*.json)|*.json|all (*.*)|*.*"
         filterall = "all (*.*)|*.*"
         filterres2d = "all (*.*)|*.*"

wolfhece/PyWMS.py

@@ -12,7 +12,7 @@ from .PyTranslate import _
 def to_image(mybytes:BytesIO) -> Image:
     return Image.open(mybytes)
 
-def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES', '$IDW', 'ZONES_INONDEES'],
+def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES', '$IDW', 'EAU/ZONES_INONDEES'],
                 xl:float,
                 yl:float,
                 xr:float,
@@ -23,6 +23,8 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
 
     if cat.find('$')>0:
         catloc=cat[:cat.find('$')]
+    elif cat.find('_wo_alea')>0:
+        catloc=cat[:cat.find('_wo_alea')]
     else:
         catloc=cat
 
@@ -78,18 +80,17 @@ def getWalonmap(cat:Literal['IMAGERIE/ORTHO_2021', 'ALEA', 'CADMAP', 'LIDAXES',
         elif cat.find('LIDAXES')>0:
             curcont=['4,5,6,7,8,9,11,13']
             curstyles=['default,default,default,default,default,default,default,default']
-        elif cat.find('$IDW')>0:
-            curcont=[ul.quote('Zones inondées - Modélisation IDW')]
+        elif cat.find('IDW')>0:
+            curcont=['0']
             curstyles=['default']
         elif cat.find('ZONES_INONDEES')>0:
-            layers=[
-                ul.quote('Zones inondables'),
-                ul.quote('Zones inondées - Satellites'),
-                ul.quote('Zones indondées - Verviers'),
-                ul.quote('Zones inondées - Enquêtes SPW'),
-                ul.quote('Zones inondées - Digitalisations')]
-            curcont=['{},{},{},{},{},{}'.format(layers[0],layers[1],layers[2],layers[3],layers[4])]
-            curstyles=['default,default,default,default,default']
+
+            if 'wo_alea' in cat:
+                curcont = list(wms.contents)[1:]
+                curstyles=['default']*len(curcont)
+            else:
+                curcont = list(wms.contents)
+                curstyles=['default']*len(curcont)
 
         try:
             img=wms.getmap(layers=curcont,styles=curstyles,srs='EPSG:31370',bbox=(xl,yl,xr,yr),size=(w,h),format='image/png',transparent=True)

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -649,6 +649,49 @@ class header_wolf():
             filename = str(filename)
 
         if filename.endswith('.tif'):
+            from osgeo import gdal
+            
+            raster:gdal.Dataset
+            raster = gdal.Open(filename)
+            geotr = raster.GetGeoTransform()
+            self.dx = geotr[1]
+            self.dy = abs(geotr[5])
+            self.origx = geotr[0]
+            self.origy = geotr[3]
+            self.nbx = raster.RasterXSize
+            self.nby = raster.RasterYSize
+
+            """
+            https://docs.qgis.org/3.34/en/docs/user_manual/processing_algs/gdal/rasterconversion.html
+
+            0 — Use Input Layer Data Type
+            1 — Byte (Eight bit unsigned integer (quint8))
+            2 — Int16 (Sixteen bit signed integer (qint16))
+            3 — UInt16 (Sixteen bit unsigned integer (quint16))
+            4 — UInt32 (Thirty two bit unsigned integer (quint32))
+            5 — Int32 (Thirty two bit signed integer (qint32))
+            6 — Float32 (Thirty two bit floating point (float))
+            7 — Float64 (Sixty four bit floating point (double))
+            8 — CInt16 (Complex Int16)
+            9 — CInt32 (Complex Int32)
+            10 — CFloat32 (Complex Float32)
+            11 — CFloat64 (Complex Float64)
+            12 — Int8 (Eight bit signed integer (qint8))
+            """
+
+            dtype = raster.GetRasterBand(1).DataType
+
+            if dtype in [1, 4]:
+                self.wolftype = WOLF_ARRAY_FULL_INTEGER
+            elif dtype ==6:
+                self.wolftype = WOLF_ARRAY_FULL_SINGLE
+            elif dtype == 7:
+                self.wolftype = WOLF_ARRAY_FULL_DOUBLE
+            else:
+                logging.error(_('The datatype of the raster is not supported -- {}'.format(dtype)))
+                logging.error(_('Please convert the raster to a supported datatype - or upgrade the code to support this datatype'))
+                logging.error(_('See : read_txt_header and import_geotif in wolf_array.py'))
+                return
             return
 
         if filename.endswith('.flt'):
@@ -4666,9 +4709,76 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         if crop is not None :
             if os.path.exists(fn):
+
+                tmpdx = self.dx
+
+                fn_crop = fn + '_crop.tif'
+                if type(crop) is np.ndarray:
+                    pass
+                elif type(crop) is list:
+                    pass
+                else:
+                    if not self.wx_exists:
+                        logging.error(_('Crop must be a list or a numpy array with 4 values - xmin, xmax, ymin, ymax'))
+                        return
+
+                    raster:gdal.Dataset
+                    raster = gdal.Open(fn)
+                    geotr = raster.GetGeoTransform()
+                    self.dx = geotr[1]
+                    self.dy = abs(geotr[5])
+
+
+                    newcrop = CropDialog(None)
+
+                    if self.wx_exists:
+                        bounds = self.mapviewer.get_canvas_bounds()
+                        
+                        newcrop.dx.Value = str(self.dx)
+                        newcrop.dy.Value = str(self.dy)
+
+                        newcrop.dx.Enable(False)
+                        newcrop.dy.Enable(False)
+
+                        newcrop.ox.Value = str(float((bounds[0] // 50.) * 50.))
+                        newcrop.ex.Value = str(float((bounds[2] // 50.) * 50.))
+                        newcrop.oy.Value = str(float((bounds[1] // 50.) * 50.))
+                        newcrop.ey.Value = str(float((bounds[3] // 50.) * 50.))
+
+                    badvalues = True
+                    while badvalues:
+                        badvalues = False
+
+                        ret = newcrop.ShowModal()
+                        if ret == wx.ID_CANCEL:
+                            newcrop.Destroy()
+                            return
+                        else:
+                            crop = [float(newcrop.ox.Value), float(newcrop.ex.Value),
+                                    float(newcrop.oy.Value), float(newcrop.ey.Value)]
+                            
+                            tmpdx = float(newcrop.dx.Value)
+                            tmpdy = float(newcrop.dy.Value)
+
+                        if self.dx != tmpdx or self.dy != tmpdy:
+                            if tmpdx / self.dx != tmpdy / self.dy:
+                                badvalues = True
+
+                    newcrop.Destroy()
+
                 xmin, xmax, ymin, ymax = crop
-                gdal.Translate(fn+'_crop.tif', fn, projWin=[xmin, ymax, xmax, ymin])
-                fn +='_crop.tif'
+
+                with wx.FileDialog(None, _('Save the cropped file for later'), wildcard="Tiff files (*.tif)|*.tif",
+                                    style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT) as fileDialog:
+                    
+                    if fileDialog.ShowModal() == wx.ID_CANCEL:
+                        return
+                    
+                    fn_crop = fileDialog.GetPath()
+
+
+                gdal.Translate(fn_crop, fn, projWin=[xmin, ymax, xmax, ymin])
+                fn  = fn_crop
 
         raster:gdal.Dataset
         raster = gdal.Open(fn)
@@ -6452,6 +6562,13 @@ class WolfArray(Element_To_Draw, header_wolf):
             else:
                 newcrop = CropDialog(None)
 
+                if self.mapviewer is not None:
+                    bounds = self.mapviewer.get_canvas_bounds()
+                    newcrop.ox.Value = float((bounds[0] // 50.) * 50.)
+                    newcrop.ex.Value = float((bounds[2] // 50.) * 50.)
+                    newcrop.oy.Value = float((bounds[1] // 50.) * 50.)
+                    newcrop.ey.Value = float((bounds[3] // 50.) * 50.)
+
                 badvalues = True
                 while badvalues:
                     badvalues = False

{wolfhece-2.1.17.dist-info → wolfhece-2.1.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.17
+Version: 2.1.18
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 License: AGPL-v3 License
 Project-URL: Homepage, https://uee.uliege.be/hece

{wolfhece-2.1.17.dist-info → wolfhece-2.1.18.dist-info}/RECORD

@@ -6,7 +6,7 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=ayK8YWZGOj79auURpkHaDCUreOlaAtMVq2ZpuzL3s_Q,383008
+wolfhece/PyDraw.py,sha256=x-67Ya_kbNyxW_Umv8sZfnDW75-D9-NytO7PfbCqWpY,383809
 wolfhece/PyGui.py,sha256=fqy8f3tLt7myJskVvspTQ_ZO7kaiSNKmcfFLrfr4w7M,103174
 wolfhece/PyGuiHydrology.py,sha256=r8kcY2eGAQzSwVtLpyMUiBL5xBpMBsi7ovs0PgStGWw,14648
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
@@ -16,7 +16,7 @@ wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
 wolfhece/PyVertexvectors.py,sha256=4K0T74MUH-ycX79hFa2618vKVTu9qOSh49hlbKrydMg,224123
-wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
+wolfhece/PyWMS.py,sha256=pV7JdzbreQGXCg3E6PwllchEUYu2YiPZEIua2ppJorA,4304
 wolfhece/RatingCurve.py,sha256=f6IGLS5aJBJD_t_k903m_yRZ60MzKNKanzD6njXZxa8,22200
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=vbLxSWwHPsCAsR13KaG5WVmVn_cha7-6cF4zj7Diiz8,33593
@@ -48,7 +48,7 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=tYzkVd4Zrvr6FotO571IfW6Kkvx9Kli9QnzbiXVwZEo,337760
+wolfhece/wolf_array.py,sha256=F8dUmJfiuAF1wFzDm13spgm3OoyAJKMIBlFdHf8PobY,342827
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -66,7 +66,7 @@ wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9
 wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
 wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
 wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=YX9tmGcv0oDZgHzLyJ-fs3F4ENyIBZMuarvn4elQtAo,388
+wolfhece/apps/version.py,sha256=_JWrWOrXqm8jB7QRCP1WPFfuVGVCeeUbG1Sn4qROsPs,388
 wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
 wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -267,8 +267,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.1.17.dist-info/METADATA,sha256=jWnXOeve-xUr_A3ZHX9uCTDFNr8GVLlUTepoSZN0HD0,2282
-wolfhece-2.1.17.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-wolfhece-2.1.17.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.17.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.17.dist-info/RECORD,,
+wolfhece-2.1.18.dist-info/METADATA,sha256=uhKpuFpAos-6qos1yKSRasR1NjD072Y84u9kTVLFxA0,2282
+wolfhece-2.1.18.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
+wolfhece-2.1.18.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.18.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.18.dist-info/RECORD,,