wolfhece 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

wolfhece/PyDraw.py

@@ -3141,7 +3141,7 @@ class WolfMapViewer(wx.Frame):
                     if cur is not self:
                         cur.update()
 
-    def zoom_on_id(self, id:str, draw_type:draw_type = draw_type.ARRAYS, forceupdate=True, canvas_height=1024):
+    def zoom_on_id(self, id:str, drawtype:draw_type = draw_type.ARRAYS, forceupdate=True, canvas_height=1024):
         """
         Zoom on id
 
@@ -3150,19 +3150,19 @@ class WolfMapViewer(wx.Frame):
 
         """
 
-        if draw_type not in [draw_type.ARRAYS, draw_type.VECTORS]:
+        if drawtype not in [draw_type.ARRAYS, draw_type.VECTORS]:
             logging.warning(_('Draw type must be either ARRAYS or VECTORS'))
             return
 
-        obj = self.get_obj_from_id(id, draw_type)
+        obj = self.get_obj_from_id(id, drawtype)
 
         if obj is None:
-            logging.warning(_('No object found with id {} and drawtype {}'.format(id, draw_type)))
+            logging.warning(_('No object found with id {} and drawtype {}'.format(id, drawtype)))
             return
 
-        if draw_type == draw_type.ARRAYS:
+        if drawtype == draw_type.ARRAYS:
             self.zoom_on_array(obj, forceupdate=forceupdate, canvas_height=canvas_height)
-        elif draw_type == draw_type.VECTORS:
+        elif drawtype == draw_type.VECTORS:
             self.zoom_on_vector(obj, forceupdate=forceupdate, canvas_height=canvas_height)
 
     def zoom_on_array(self, array:WolfArray, forceupdate=True, canvas_height=1024):
@@ -3213,16 +3213,38 @@ class WolfMapViewer(wx.Frame):
         for curarray in arrays:
 
             if isinstance(curarray, WolfArray):
+
+                curarray.nullify_border(1)
+
                 new_zone = zone(name = curarray.idx)
                 new_zones.add_zone(new_zone, forceparent=True)
 
                 sux, sux, curvect, interior = curarray.suxsuy_contour()
                 new_zone.add_vector(curvect, forceparent=True)
+
                 curvect.set_legend_to_centroid(curarray.idx)
+                curvect.myprop.width = 2
+
+                rectvect = vector(name = 'rect_boundary')
+                new_zone.add_vector(rectvect, forceparent=True)
+
+                bounds = curarray.get_bounds()
+
+                rectvect.add_vertex(wolfvertex(bounds[0][0], bounds[1][0]))
+                rectvect.add_vertex(wolfvertex(bounds[0][1], bounds[1][0]))
+                rectvect.add_vertex(wolfvertex(bounds[0][1], bounds[1][1]))
+                rectvect.add_vertex(wolfvertex(bounds[0][0], bounds[1][1]))
+                rectvect.close_force()
+
+                rectvect.myprop.color = getIfromRGB([255,0,0])
+                rectvect.myprop.width = 2
+
                 logging.info(_('{} treated'.format(curarray.idx)))
             else:
                 logging.warning(_('All elements in the list must be of type WolfArray'))
 
+        new_zones.find_minmax(update=True)
+
         return new_zones
 
 
@@ -6107,11 +6129,11 @@ class WolfMapViewer(wx.Frame):
 
         """
 
-        keys = self.get_list_keys(draw_type, checked_state=None)
+        keys = self.get_list_keys(drawtype, checked_state=None)
         if id.lower() in keys:
             try:
                 idx = keys.index(id.lower())
-                return self.get_list_objects(draw_type, checked_state=None)[idx]
+                return self.get_list_objects(drawtype, checked_state=None)[idx]
             except:
                 return None
 

wolfhece/PyVertex.py

@@ -27,14 +27,18 @@ from .textpillow import Text_Image, Text_Infos, Font_Priority
 from .wolf_texture import Text_Image_Texture
 
 
-def getRGBfromI(rgbint):
+def getRGBfromI(rgbint:int):
+    """ Convert integer to RGB """
+
     blue = rgbint & 255
     green = (rgbint >> 8) & 255
     red = (rgbint >> 16) & 255
     return red, green, blue
 
 
-def getIfromRGB(rgb):
+def getIfromRGB(rgb:Union[list, tuple]):
+    """ Convert RGB to integer """
+
     red = int(rgb[0])
     green = int(rgb[1])
     blue = int(rgb[2])

wolfhece/apps/version.py

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

{wolfhece-2.1.1.dist-info → wolfhece-2.1.3.dist-info}/METADATA

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

{wolfhece-2.1.1.dist-info → wolfhece-2.1.3.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=DeWCaZ4CRtMAMQS05ugLn-ufy6p4zJh3Wi4ARK7AO04,376085
+wolfhece/PyDraw.py,sha256=2pGgV1VwE-zfCiJnrPbJrjKfCG41ARhGTo_sF_kpd-s,376852
 wolfhece/PyGui.py,sha256=TTRvqRiZ0gTaxOfDTMVLFYQ56QvdDMS032fRXcXxvUs,104024
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
@@ -14,7 +14,7 @@ wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
 wolfhece/PyParams.py,sha256=361iy9b9zTjoPCj9gh8-OIo0TBW5laLG87AkWE6f_eg,96290
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
-wolfhece/PyVertex.py,sha256=X8MjsM4wLkgCrZ94CQw6PzxigH0_0jr8enUy7uYO2_I,39993
+wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
 wolfhece/PyVertexvectors.py,sha256=Av1OqFrDtZUAXAjaTnoGGErzK4W9gJhVx0LxgULLcTA,222335
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
@@ -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=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=FZGDnq1Zdh4flpr6tsQiNOSlENz-qzTLRnZj1gGcfqM,387
+wolfhece/apps/version.py,sha256=Or-ozTUagYZHC8C-Y56TsIQ5c1jVkNiIlxclTgBDkSc,387
 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
@@ -264,8 +264,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.1.dist-info/METADATA,sha256=t5z6h2SmfXbETr_7N_Vbu8ZcXTdwjXi3EwkYl8hX_tY,2281
-wolfhece-2.1.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.1.1.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.1.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.1.dist-info/RECORD,,
+wolfhece-2.1.3.dist-info/METADATA,sha256=LvZPcQCsOcMiJYf7lSYhlTHa29Ld57npIH4HZCqx3fU,2281
+wolfhece-2.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.1.3.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.3.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.3.dist-info/RECORD,,