wolfhece 2.1.70__py3-none-any.whl → 2.1.71__py3-none-any.whl

wolfhece/PyDraw.py

@@ -140,7 +140,67 @@ class draw_type(Enum):
     WMSFORE = 'wms-foreground'
     TILES = 'tiles'
 
+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)]
 
+class Colors_1to9(wx.Frame):
+
+    def __init__(self, parent):
+
+        super(Colors_1to9, self).__init__(parent, title=_('Colors 1 to 9'), size=(200, 380))
+
+        global COLORS1TO9
+
+        panel = wx.Panel(self)
+        panel.SetBackgroundColour(wx.Colour(255, 255, 255))
+
+        sizer = wx.BoxSizer(wx.VERTICAL)
+
+        self.pickers={}
+        for i in range(9):
+            horsizer = wx.BoxSizer(wx.HORIZONTAL)
+            horsizer.Add(wx.StaticText(panel, label=_('Color ') + str(i + 1)), 0, wx.ALL, 2)
+            color = COLORS1TO9[i]
+            color = wx.Colour(color[0], color[1], color[2], color[3])
+            self.pickers[i] = wx.ColourPickerCtrl(panel, colour=color)
+            horsizer.Add(self.pickers[i], 0, wx.ALL, 2)
+            sizer.Add(horsizer, 0, wx.ALL, 2)
+
+        cmdOK = wx.Button(panel, wx.ID_OK, _('OK'))
+        cmdCancel = wx.Button(panel, wx.ID_CANCEL, _('Cancel'))
+
+        horsizer = wx.BoxSizer(wx.HORIZONTAL)
+        horsizer.Add(cmdOK, 0, wx.ALL, 5)
+        horsizer.Add(cmdCancel, 0, wx.ALL, 5)
+
+        sizer.Add(horsizer, 0, wx.ALL, 5)
+
+        panel.SetSizer(sizer)
+
+        self.Bind(wx.EVT_BUTTON, self.OnOK, cmdOK)
+        self.Bind(wx.EVT_BUTTON, self.OnCancel, cmdCancel)
+
+        self.Show()
+    
+    def OnOK(self, event):
+        global COLORS1TO9
+
+        for i in range(9):
+            color = self.pickers[i].GetColour()
+            COLORS1TO9[i] = (color.Red(), color.Green(), color.Blue(), color.Alpha())
+
+        self.Close()
+
+    def OnCancel(self, event):
+        self.Close()
+    
 class DragdropFileTarget(wx.FileDropTarget):
     def __init__(self, window:"WolfMapViewer"):
         wx.FileDropTarget.__init__(self)
@@ -609,6 +669,7 @@ class WolfMapViewer(wx.Frame):
         self.helpmenu.Append(wx.ID_ANY, _('Shortcuts'), _('Shortcuts'))
         self.helpmenu.Append(wx.ID_ANY, _('Show logs/informations'), _('Logs'))
         self.helpmenu.Append(wx.ID_ANY, _('Show values'), _('Data/Values'))
+        self.helpmenu.Append(wx.ID_ANY, _('Colors for selections 1->9'), _('Selections'))
         self.helpmenu.Append(wx.ID_ANY, _('About'), _('About'))
         self.helpmenu.Append(wx.ID_ANY, _('Check for updates'), _('Update?'))
 
@@ -4456,6 +4517,11 @@ class WolfMapViewer(wx.Frame):
             self.check_tooltip()
             autoscale = False
 
+        elif itemlabel == _('Colors for selections 1->9'):
+            autoscale = False
+
+            newcolors = Colors_1to9(self)
+
         elif itemlabel == _('About'):
             #print About Frame
             self.print_About()
@@ -9013,12 +9079,21 @@ 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), (128, 128, 128, 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
 
-                    self.active_array.SelectionData.move_selectionto(str(idx+1), colors[idx])
+                    self.active_array.SelectionData.move_selectionto(str(idx+1), COLORS1TO9[idx])
 
             elif key == wx.WXK_F1:
                 self.read_last_result()

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -125,7 +125,7 @@ WOLF_ARRAY_MNAP_INTEGER = 20
 
 WOLF_ARRAY_MB = [WOLF_ARRAY_MB_SINGLE, WOLF_ARRAY_MB_INTEGER, WOLF_ARRAY_MNAP_INTEGER]
 
-VERSION_RGB = 2
+VERSION_RGB = 3
 
 from numba import jit
 
@@ -1908,6 +1908,11 @@ class Ops_Array(wx.Frame):
         sizermask = wx.BoxSizer(wx.VERTICAL)
         self.mask.SetSizer(sizermask)
 
+        maskdata = wx.Button(self.mask, wx.ID_ANY, _("Mask nodes (only Condition )"), wx.DefaultPosition, wx.DefaultSize, 0)
+        maskdata.SetToolTip(_("This action will use the condition AND NOT the operator to mask some selected nodes \n If no node selectd --> Nothing to do !!"))
+        sizermask.Add(maskdata, 1, wx.EXPAND)
+        maskdata.Bind(wx.EVT_BUTTON, self.Onmask)
+
         unmaskall = wx.Button(self.mask, wx.ID_ANY, _("Unmask all"), wx.DefaultPosition, wx.DefaultSize, 0)
         sizermask.Add(unmaskall, 1, wx.EXPAND)
         unmaskall.Bind(wx.EVT_BUTTON, self.Unmaskall)
@@ -1970,10 +1975,10 @@ class Ops_Array(wx.Frame):
         self.SelectOp.SetToolTip(_("This action will use the condition AND NOT the operator to select some nodes"))
         sizeropgen.Add(self.SelectOp, 1, wx.EXPAND)
 
-        maskdata = wx.Button(self.operation, wx.ID_ANY, _("Mask nodes (only Condition )"), wx.DefaultPosition, wx.DefaultSize, 0)
-        maskdata.SetToolTip(_("This action will use the condition AND NOT the operator to mask some selected nodes \n If no node is selectd --> Nothing to do !!"))
-        sizeropgen.Add(maskdata, 1, wx.EXPAND)
-        maskdata.Bind(wx.EVT_BUTTON, self.Onmask)
+        self.nbselect2 = wx.StaticText(self.operation, wx.ID_ANY, _("nb"), wx.DefaultPosition, wx.DefaultSize, 0)
+        self.nbselect2.Wrap(-1)
+        sizeropgen.Add(self.nbselect2, 0, wx.EXPAND)
+        self.nbselect2.SetToolTip(_("Number of selected nodes"))
 
         self.operation.SetSizer(sizeropgen)
         self.operation.Layout()
@@ -2181,6 +2186,7 @@ class Ops_Array(wx.Frame):
 
         self.parentarray.SelectionData.select_all()
         self.parentarray.myops.nbselect.SetLabelText('All')
+        self.parentarray.myops.nbselect2.SetLabelText('All')
 
     def OnMoveSelect(self, event):
         """Transfert de la sélection courante dans un dictionnaire"""
@@ -2203,6 +2209,7 @@ class Ops_Array(wx.Frame):
         self.parentarray.SelectionData.reset()
 
         self.nbselect.SetLabelText('0')
+        self.nbselect2.SetLabelText('0')
         self.minx.SetLabelText('0')
         self.miny.SetLabelText('0')
         self.maxx.SetLabelText('0')
@@ -2308,6 +2315,8 @@ class Ops_Array(wx.Frame):
 
         self.parentarray.SelectionData.condition_select(curcond, curcondvalue)
 
+        self.refresh_array()
+
     def OnApplyNullvalue(self, event:wx.MouseEvent):
         """ Apply null value to the array """
 
@@ -3504,6 +3513,7 @@ class SelectionData():
         if self.parent.myops is not None:
 
             self.parent.myops.nbselect.SetLabelText(str(nb))
+            self.parent.myops.nbselect2.SetLabelText(str(nb))
             if nb>0:
 
                 self.parent.myops.minx.SetLabelText('{:.3f}'.format(xmin))
@@ -4270,6 +4280,7 @@ class SelectionDataMB(SelectionData):
         if self.parent.myops is not None:
 
             self.parent.myops.nbselect.SetLabelText(str(nb))
+            self.parent.myops.nbselect2.SetLabelText(str(nb))
 
             if nb>0:
                 self.parent.myops.minx.SetLabelText('{:.3f}'.format(xmin))
@@ -8192,6 +8203,62 @@ class WolfArray(Element_To_Draw, header_wolf):
                                 wolfogl.addmeall_pal(self.array, clr_float, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
                                                 self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1.)
 
+                    elif VERSION_RGB == 3:
+                        if self.wolftype == WOLF_ARRAY_FULL_INTEGER8:
+                            if self.nbnotnull != self.nbx * self.nby:
+                                if self.nbnotnull > 0:
+                                    wolfogl.addme_int8_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                            elif self.nbnotnull > 0:
+                                wolfogl.addmeall_int8_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                        elif self.wolftype in [WOLF_ARRAY_FULL_INTEGER16, WOLF_ARRAY_FULL_INTEGER16_2]:
+                            if self.nbnotnull != self.nbx * self.nby:
+                                if self.nbnotnull > 0:
+                                    wolfogl.addme_int16_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                            elif self.nbnotnull > 0:
+                                wolfogl.addmeall_int16_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                        elif self.wolftype == WOLF_ARRAY_FULL_INTEGER:
+                            if self.nbnotnull != self.nbx * self.nby:
+                                if self.nbnotnull > 0:
+                                    wolfogl.addme_int_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                            elif self.nbnotnull > 0:
+                                wolfogl.addmeall_int_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                        elif self.wolftype == WOLF_ARRAY_FULL_DOUBLE:
+                            if self.nbnotnull != self.nbx * self.nby:
+                                if self.nbnotnull > 0:
+                                    wolfogl.addme_double_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                            elif self.nbnotnull > 0:
+                                wolfogl.addmeall_double_pal_mask(self.array, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), self.array.mask)
+                        elif self.wolftype not in [WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_HILLSHAPE]:
+                            if self.nbnotnull != self.nbx * self.nby:
+                                if self.nbnotnull > 0:
+                                    wolfogl.addme_pal_mask(self._tmp_float32, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1., self.array.mask)
+                            elif self.nbnotnull > 0:
+                                wolfogl.addmeall_pal_mask(self._tmp_float32, self.mypal.colorsflt, self.mypal.values, ox, oy, dx, dy, jstart,
+                                                jend, istart, iend, cursize, self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1., self.array.mask)
+                        else:
+                            clr_float = self.mypal.colorsflt.copy()
+                            clr_float[:,3] = self.alpha
+                            if '_hillshade' in self.idx:
+                                clr_float[1,3] = 0.
+
+                            if self.nbnotnull != self.nbx * self.nby:
+                                if self.nbnotnull > 0:
+
+                                    wolfogl.addme_pal_mask(self.array, clr_float, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
+                                                self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1., self.array.mask)
+                            elif self.nbnotnull > 0:
+                                wolfogl.addmeall_pal_mask(self.array, clr_float, self.mypal.values, ox, oy, dx, dy, jstart, jend, istart, iend, cursize,
+                                                self.nullvalue, self.alpha, int(self.mypal.interval_cst), -1., self.array.mask)
+
                 except Exception as e:
                     logging.error(repr(e))
                     raise NameError(_('OpenGL error in WolfArray.fillonecellgrid -- Please report this case with the data file and the context in which the error occured'))

{wolfhece-2.1.70.dist-info → wolfhece-2.1.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.70
+Version: 2.1.71
 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.70.dist-info → wolfhece-2.1.71.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=qKdjRbAWIwDw5UqdiY8xJ0tlZE_2sgh7CQMwCT7nkpQ,411126
+wolfhece/PyDraw.py,sha256=AXcgzwvTRRnzj7p45fr8QVMdLdoLPe4yIZaXjUoz040,413560
 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=tJT0Hd--eWg23c01wZYUA494-6f1v7NZEvbvXLcT8M8,380039
+wolfhece/wolf_array.py,sha256=NV1pGcGsXXGIVSjFBsfpenvmBUSTkjPWbgZ2vbWuELA,385914
 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=TLK8WpRHDziujrX3W7jQ4NRLffIcA4WHifPcuYSKkRM,388
+wolfhece/apps/version.py,sha256=rqw8QaFT71GR38qeOp9kpMIUqgZVxzFlK5B3lDQwa5g,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
@@ -194,7 +194,7 @@ wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57
 wolfhece/libs/vcruntime140.dll,sha256=gPBsB0DzEBn3b7E5ihESs-AtG4Cu59OnONR1QI17TGA,98720
 wolfhece/libs/vcruntime140_1.dll,sha256=KZJoe26L6i76Krqne_OribgfhN6LxJQEcs0Xn_01hP8,38304
 wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=Cej6r7o8cOF58sXs97kjPN4ddd-ZjDyYZ_WkR0Nmivo,128512
-wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=l2ZpPh_dGLWcvYxM0BdLHhfSYrLhQI5rT59rRwyQjCY,296448
+wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=0rCDT7-G8Sq7NBisUDZ4HqAfesZChRH-NH9s70Ch2I8,415232
 wolfhece/libs/wolfpy.cp310-win_amd64.pyd,sha256=6omqEaxmQll-Gg24e90wVomAB9rO_tyyOES2FewXn58,36457472
 wolfhece/libs/zlib1.dll,sha256=E9a0e62VgmG1A8ohZzhVCmmfGtbyXxXu4aFeADTNJ30,77824
 wolfhece/libs/GL/gl.h,sha256=IhsS_fOLa8GW9MpiLZebe9QYRy6uIB_qK_uQMWMOoeg,46345
@@ -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.70.dist-info/METADATA,sha256=X-FGlbXULKqEr5VJOxfzSt8-BUMb01SI7dx1wNvssWE,2570
-wolfhece-2.1.70.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-wolfhece-2.1.70.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
-wolfhece-2.1.70.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.70.dist-info/RECORD,,
+wolfhece-2.1.71.dist-info/METADATA,sha256=8vSyAQXGeAxh_xR9kdlgShsERbzgKUbpRnP_n5NGdrE,2570
+wolfhece-2.1.71.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.71.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.71.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.71.dist-info/RECORD,,