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

wolfhece/PyDraw.py

@@ -140,24 +140,42 @@ 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))
+        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), 
+                            (128, 128, 128, 255)]
+
+        if self.file.exists():
+            self.OnLoad(None)
+
+    @property
+    def directory(self):
+        tmp = Path(__file__).parent / 'data'
+        if not tmp.exists():
+            tmp.mkdir()
+
+        return tmp
+
+    @property
+    def file(self):
+        return self.directory / 'colors1to9.json'
+
+    def __get_item__(self, i):
+        return self.colors1to9[i]
 
-        global COLORS1TO9
+    def change_colors(self, e):
 
+        super(Colors_1to9, self).__init__(self._parent, title=_('Colors 1 to 9'), size=(200, 400))
         panel = wx.Panel(self)
         panel.SetBackgroundColour(wx.Colour(255, 255, 255))
 
@@ -167,7 +185,7 @@ class Colors_1to9(wx.Frame):
         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 = self.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)
@@ -175,32 +193,65 @@ class Colors_1to9(wx.Frame):
 
         cmdOK = wx.Button(panel, wx.ID_OK, _('OK'))
         cmdCancel = wx.Button(panel, wx.ID_CANCEL, _('Cancel'))
+        cdmSetDefault = wx.Button(panel, wx.ID_APPLY, _('Default'))
+        cmdSave = wx.Button(panel, wx.ID_SAVE, _('Save'))
 
         horsizer = wx.BoxSizer(wx.HORIZONTAL)
-        horsizer.Add(cmdOK, 0, wx.ALL, 5)
-        horsizer.Add(cmdCancel, 0, wx.ALL, 5)
+        horsizer2 = wx.BoxSizer(wx.HORIZONTAL)
+        horsizer.Add(cmdOK, 0, wx.ALL, 2)
+        horsizer.Add(cmdCancel, 0, wx.ALL, 2)
+        horsizer2.Add(cdmSetDefault, 0, wx.ALL, 2)
+        horsizer2.Add(cmdSave, 0, wx.ALL, 2)
 
-        sizer.Add(horsizer, 0, wx.ALL, 5)
+        sizer.Add(horsizer, 0, wx.ALL, 2)
+        sizer.Add(horsizer2, 0, wx.ALL, 2)
 
         panel.SetSizer(sizer)
 
         self.Bind(wx.EVT_BUTTON, self.OnOK, cmdOK)
         self.Bind(wx.EVT_BUTTON, self.OnCancel, cmdCancel)
+        self.Bind(wx.EVT_BUTTON, self.OnSetDefault, cdmSetDefault)
+        self.Bind(wx.EVT_BUTTON, self.OnSave, cmdSave)
 
         self.Show()
     
-    def OnOK(self, event):
-        global COLORS1TO9
+    def Apply(self):
 
         for i in range(9):
             color = self.pickers[i].GetColour()
-            COLORS1TO9[i] = (color.Red(), color.Green(), color.Blue(), color.Alpha())
+            self.colors1to9[i] = (color.Red(), color.Green(), color.Blue(), color.Alpha())
 
+    def OnOK(self, event):
+
+        self.Apply()
         self.Close()
 
     def OnCancel(self, event):
         self.Close()
     
+    def OnSetDefault(self, event):
+        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)]
+        for i in range(9):
+            color = self.colors1to9[i]
+            color = wx.Colour(color[0], color[1], color[2], color[3])
+            self.pickers[i].SetColour(color)
+
+    def OnSave(self, event):
+        self.Apply()
+        with open(self.file, 'w') as f:
+            json.dump(self.colors1to9, f)
+
+    def OnLoad(self, event):
+        with open(self.file, 'r') as f:
+            self.colors1to9 = json.load(f)
 class DragdropFileTarget(wx.FileDropTarget):
     def __init__(self, window:"WolfMapViewer"):
         wx.FileDropTarget.__init__(self)
@@ -368,6 +419,9 @@ class WolfMapViewer(wx.Frame):
 
         """
 
+        self.treewidth = treewidth
+        super(WolfMapViewer, self).__init__(wxparent, title=title, size=(w + self.treewidth, h))
+
         self._wxlogging = wxlogging
         self.action = None  # Action à entreprendre
         self.update_absolute_minmax = False  # Force la MAJ de la palette
@@ -419,8 +473,7 @@ class WolfMapViewer(wx.Frame):
         # self.mylazdata_colors = None
         self.mylazgrid = None
 
-        self.treewidth = treewidth
-        super(WolfMapViewer, self).__init__(wxparent, title=title, size=(w + self.treewidth, h))
+        self.colors1to9 = Colors_1to9(self)
 
         self._dragdrop = DragdropFileTarget(self)
         self.SetDropTarget(self._dragdrop)
@@ -669,7 +722,6 @@ 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?'))
 
@@ -2730,6 +2782,9 @@ class WolfMapViewer(wx.Frame):
             self.option_global = self.menu_options.Append(wx.ID_ANY,_("Global"),_("Modify global options"))
             self.Bind(wx.EVT_MENU, self.GlobalOptionsDialog, self.option_global)
 
+            self.menu_1to9 =self.menu_options.Append(wx.ID_ANY, _('Colors for selections 1->9'), _('Selections'))
+            self.Bind(wx.EVT_MENU, self.colors1to9.change_colors, self.menu_1to9)
+
         self.Show(True)
 
     def OnSize(self, e):
@@ -4517,11 +4572,6 @@ 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()
@@ -9093,7 +9143,7 @@ class WolfMapViewer(wx.Frame):
                     if idx > 8:
                         idx -= 9
 
-                    self.active_array.SelectionData.move_selectionto(str(idx+1), COLORS1TO9[idx])
+                    self.active_array.SelectionData.move_selectionto(str(idx+1), self.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 = 71
+        self.patch = 72
 
     def __str__(self):
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.71
+Version: 2.1.72
 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.71.dist-info → wolfhece-2.1.72.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=AXcgzwvTRRnzj7p45fr8QVMdLdoLPe4yIZaXjUoz040,413560
+wolfhece/PyDraw.py,sha256=oTnhTTP-VNzpEDXKD5rozJL3NLKg-bLs2pjgy_f6JgA,415541
 wolfhece/PyGui.py,sha256=oBIBpgBQRR_XXucKE5-RFrtqKj0DRg9VlUCRo8Mzalc,105009
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -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=rqw8QaFT71GR38qeOp9kpMIUqgZVxzFlK5B3lDQwa5g,388
+wolfhece/apps/version.py,sha256=3A3gjGP_weec_y6tBauBg2qMw-gVkcOM1hHNYwbBK6k,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
@@ -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.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,,
+wolfhece-2.1.72.dist-info/METADATA,sha256=DZos2AlEODsAm_6IcOCXz4XszYsIgdiXEUvXm5URAWo,2570
+wolfhece-2.1.72.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
+wolfhece-2.1.72.dist-info/entry_points.txt,sha256=Q5JuIWV4odeIJI3qc6fV9MwRoz0ezqPVlFC1Ppm_vdQ,395
+wolfhece-2.1.72.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.72.dist-info/RECORD,,