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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. wolfhece/PyGui.py +51 -30
  2. wolfhece/apps/splashscreen.py +1 -1
  3. wolfhece/apps/version.py +1 -1
  4. {wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/METADATA +1 -1
  5. {wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/RECORD +8 -8
  6. {wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/WHEEL +0 -0
  7. {wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/entry_points.txt +0 -0
  8. {wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/top_level.txt +0 -0
wolfhece/PyGui.py CHANGED
@@ -69,8 +69,7 @@ class GenMapManager(wx.Frame):
69
69
  # the garbage collector don't remove it
70
70
  # before us (WolfLauncher has no parent
71
71
  # so it dangles).
72
- self._MySplash = WolfLauncher(
73
- play_sound=self._configuration[ConfigurationKeys.PLAY_WELCOME_SOUND])
72
+ self._MySplash = WolfLauncher(play_sound=self._configuration[ConfigurationKeys.PLAY_WELCOME_SOUND])
74
73
  # Don't pollute the call to wf.Frame.__init__
75
74
  kw.pop(SPLASH_PARAM, None)
76
75
 
@@ -148,41 +147,63 @@ class MapManager(GenMapManager):
148
147
  def __init__(self,*args, **kw):
149
148
  super().__init__(*args, **kw)
150
149
 
151
- icon = wx.Icon()
152
- icon.CopyFromBitmap(wx.Bitmap("wolf_logo.bmp", wx.BITMAP_TYPE_ANY))
153
- self.SetIcon(icon)
150
+ icon = wx.EmptyIcon()
151
+
152
+ icon_path = Path(__file__).parent / "apps/wolf_logo.bmp"
153
+
154
+ icon.CopyFromBitmap(wx.Bitmap(str(icon_path), wx.BITMAP_TYPE_ANY))
154
155
 
155
156
  self.setup_mapviewer(title = 'Wolf - main data manager', wolfparent=self)
156
157
 
157
- dir_hydro = join(getcwd(),'data\\hydrometry')
158
+ try:
159
+ self.mylogs.GetFrame().SetIcon(icon)
160
+ except:
161
+ logging.error("No icon for the log window")
162
+
163
+ try:
164
+ self.mapviewer.mytooltip.SetIcon(icon)
165
+ except:
166
+ logging.error("No icon for the tooltip window")
167
+
168
+ try:
169
+ self.mapviewer.SetIcon(icon)
170
+ except:
171
+ logging.error("No icon for the mapviewer window")
172
+
173
+ # dir_hydro = join(getcwd(),'data\\hydrometry')
174
+ dir_hydro = Path(__file__).parent / "data/hydrometry"
158
175
  if not exists(dir_hydro):
159
176
  makedirs(dir_hydro, exist_ok=True)
160
177
 
161
- self.SPWhydrometry = hydrometry_wolfgui(dir=dir_hydro, idx = 'SPW hydrometry', mapviewer=self.mapviewer, parent = self, plotted=False)
162
- self.picc = Picc_data(data_dir=Path(r'data/PICC'), mapviewer=self.mapviewer)
163
- self.cadaster = Cadaster_data(data_dir=Path(r'data/Cadaster'), mapviewer=self.mapviewer)
164
- self.landmaps = PlansTerrier(mapviewer=self.mapviewer, parent = self, idx='LandMaps', plotted=True)
165
- self.mapviewer.menu_walous()
178
+ try:
179
+ self.SPWhydrometry = hydrometry_wolfgui(dir=dir_hydro, idx = 'SPW hydrometry', mapviewer=self.mapviewer, parent = self, plotted=False)
180
+ self.picc = Picc_data(data_dir=Path(r'data/PICC'), mapviewer=self.mapviewer)
181
+ self.cadaster = Cadaster_data(data_dir=Path(r'data/Cadaster'), mapviewer=self.mapviewer)
182
+ self.landmaps = PlansTerrier(mapviewer=self.mapviewer, parent = self, idx='LandMaps', plotted=True)
183
+
184
+ self.mapviewer.add_object(which='other',
185
+ newobj=self.SPWhydrometry,
186
+ ToCheck=False,
187
+ id='SPW hydrometry')
188
+
189
+ self.mapviewer.add_object(which='other',
190
+ newobj=self.picc,
191
+ ToCheck=False,
192
+ id='PICC data')
193
+
194
+ self.mapviewer.add_object(which='other',
195
+ newobj=self.cadaster,
196
+ ToCheck=False,
197
+ id='Cadaster data')
198
+
199
+ self.mapviewer.add_object(which='other',
200
+ newobj=self.landmaps,
201
+ ToCheck=False,
202
+ id='Land maps')
203
+ except:
204
+ logging.error("Can't load some data (hydrometry, picc, cadaster, landmaps) -- Please check the data directories and/or report the issue")
166
205
 
167
- self.mapviewer.add_object(which='other',
168
- newobj=self.SPWhydrometry,
169
- ToCheck=False,
170
- id='SPW hydrometry')
171
-
172
- self.mapviewer.add_object(which='other',
173
- newobj=self.picc,
174
- ToCheck=False,
175
- id='PICC data')
176
-
177
- self.mapviewer.add_object(which='other',
178
- newobj=self.cadaster,
179
- ToCheck=False,
180
- id='Cadaster data')
181
-
182
- self.mapviewer.add_object(which='other',
183
- newobj=self.landmaps,
184
- ToCheck=False,
185
- id='Land maps')
206
+ self.mapviewer.menu_walous()
186
207
 
187
208
  class GPU2DModel(GenMapManager):
188
209
 
wolfhece/apps/splashscreen.py CHANGED
@@ -25,7 +25,7 @@ class WolfLauncher(SplashScreen):
25
25
  mask = wx.Mask(mybitmap, wx.Colour(255,0,204))
26
26
  mybitmap.SetMask(mask)
27
27
  splash = SPLASH_CENTRE_ON_SCREEN | SPLASH_TIMEOUT
28
- duration = 2000 # milliseconds
28
+ duration = 1000 # milliseconds
29
29
 
30
30
  # Call the constructor with the above arguments
31
31
  # in exactly the following order.
wolfhece/apps/version.py CHANGED
@@ -5,7 +5,7 @@ class WolfVersion():
5
5
 
6
6
  self.major = 2
7
7
  self.minor = 1
8
- self.patch = 3
8
+ self.patch = 5
9
9
 
10
10
  def __str__(self):
11
11
 
{wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wolfhece
3
- Version: 2.1.3
3
+ Version: 2.1.5
4
4
  Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
5
5
  License: AGPL-v3 License
6
6
  Project-URL: Homepage, https://uee.uliege.be/hece
{wolfhece-2.1.3.dist-info → wolfhece-2.1.5.dist-info}/RECORD RENAMED
@@ -7,7 +7,7 @@ wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
7
7
  wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
8
8
  wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
9
9
  wolfhece/PyDraw.py,sha256=2pGgV1VwE-zfCiJnrPbJrjKfCG41ARhGTo_sF_kpd-s,376852
10
- wolfhece/PyGui.py,sha256=TTRvqRiZ0gTaxOfDTMVLFYQ56QvdDMS032fRXcXxvUs,104024
10
+ wolfhece/PyGui.py,sha256=vyqeacfPXvMZJXBo5GLn1ZsygA8HhKBeZJR6UCWGVSg,104777
11
11
  wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
12
12
  wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
13
13
  wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
@@ -65,8 +65,8 @@ wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
65
65
  wolfhece/apps/check_install.py,sha256=jrKR-njqnpIh6ZJqvP6KbDUPVCfwTNQj4glQhcyzs9o,630
66
66
  wolfhece/apps/curvedigitizer.py,sha256=avWERHuVxPnJBOD_ibczwW_XG4vAenqWS8W1zjhBox8,4898
67
67
  wolfhece/apps/isocurrent.py,sha256=4XnNWPa8mYUK7V4zdDRFrHFIXNG2AN2og3TqWKKcqjY,3811
68
- wolfhece/apps/splashscreen.py,sha256=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
69
- wolfhece/apps/version.py,sha256=Or-ozTUagYZHC8C-Y56TsIQ5c1jVkNiIlxclTgBDkSc,387
68
+ wolfhece/apps/splashscreen.py,sha256=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
69
+ wolfhece/apps/version.py,sha256=qThNbWPus4Eoal744IqgA9Y2OXgnS7Y9UIsQeVikGzc,387
70
70
  wolfhece/apps/wolf.py,sha256=gqfm-ZaUJqNsfCzmdtemSeqLw-GVdSVix-evg5WArJI,293
71
71
  wolfhece/apps/wolf2D.py,sha256=gWD9ee2-1pw_nUxjgRaJMuSe4kUT-RWhOeoTt_Lh1mM,267
72
72
  wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -264,8 +264,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
264
264
  wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
265
265
  wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
266
266
  wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
267
- wolfhece-2.1.3.dist-info/METADATA,sha256=LvZPcQCsOcMiJYf7lSYhlTHa29Ld57npIH4HZCqx3fU,2281
268
- wolfhece-2.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
269
- wolfhece-2.1.3.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
270
- wolfhece-2.1.3.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
271
- wolfhece-2.1.3.dist-info/RECORD,,
267
+ wolfhece-2.1.5.dist-info/METADATA,sha256=kKeoABb_oeKVIscNeEIVN3yTgy83__gUhVILC8tSi90,2281
268
+ wolfhece-2.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
269
+ wolfhece-2.1.5.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
270
+ wolfhece-2.1.5.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
271
+ wolfhece-2.1.5.dist-info/RECORD,,