wolfhece 2.1.36__py3-none-any.whl → 2.1.38__py3-none-any.whl

wolfhece/apps/splashscreen.py

@@ -17,12 +17,12 @@ import wx
 import time
 from   wx.adv import SplashScreen as SplashScreen,SPLASH_CENTRE_ON_SCREEN,SPLASH_TIMEOUT,Sound
 
-# try:
-#     from ..libs import wolfogl
-# except:
-#     print("** WolfOGL not found **")
-#     print("Without WolfOGL, the application will not work !")
-#     print("Please reinstall 'wolfhece' package -- pip install wolfhece")
+try:
+    from ..libs import wolfogl
+except:
+    print("** WolfOGL not found **")
+    print("Without WolfOGL, the application will not work !")
+    print("Please reinstall 'wolfhece' package -- pip install wolfhece --force-reinstall")
 
 class WolfLauncher(SplashScreen):
     """
@@ -32,7 +32,7 @@ class WolfLauncher(SplashScreen):
     done = False
 
     def __init__(self, parent=None, play_sound=True):
-        
+
         if self.done:
             return
 

wolfhece/apps/version.py

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

wolfhece/wolf_array.py

@@ -694,7 +694,7 @@ class header_wolf():
             """
 
             dtype = raster.GetRasterBand(1).DataType
-            
+
             if dtype == 1:
                 self.wolftype = WOLF_ARRAY_FULL_INTEGER8
             elif dtype in [2,3]:
@@ -745,8 +745,8 @@ class header_wolf():
                     shape, fortran, dtype = np.lib.format.read_array_header_2_0(f)
                 else:
                     raise ValueError("Unknown numpy version: %s" % version)
-        
-            self.nbx, self.nby = shape         
+
+            self.nbx, self.nby = shape
 
             if dtype == np.float32:
                 self.wolftype = WOLF_ARRAY_FULL_SINGLE
@@ -4349,7 +4349,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         """
 
         if self.nbz == 0:
-            size = self.nbx * self.nby 
+            size = self.nbx * self.nby
         else:
             size = self.nbx * self.nby * self.nbz
 
@@ -4365,7 +4365,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             return size
         else:
             return size * 4
-        
+
     @property
     def memory_usage_mask(self):
         """
@@ -4383,13 +4383,13 @@ class WolfArray(Element_To_Draw, header_wolf):
         """ Destructeur de la classe """
         import gc
         self.delete_lists()
-        del self.array 
+        del self.array
         if VERSION_RGB==1 : del self.rgb
         del self._array3d
         del self.mypal
         del self.shaded
         gc.collect()
-    
+
     def extract_selection(self):
         """ Extract the current selection """
 
@@ -4449,9 +4449,9 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self._quads = self.get_centers()
         ztext = np.require(self.array.data.copy(), dtype=np.float32, requirements=['C'])
-        
+
         assert ztext.flags.c_contiguous, _('ztext is not C-contiguous')
-        
+
         ztext[self.array.mask] = self.array.min()
         self._array3d = WolfArray_plot3D(self._quads,
                                          self.dx, self.dy,
@@ -4820,7 +4820,7 @@ class WolfArray(Element_To_Draw, header_wolf):
         band.ComputeStatistics(True)
 
     def _import_npy(self, fn:str='', crop:list[float]=None):
-        """ 
+        """
         Import a numpy file.
 
         Must be called after the header is initialized, e.g. read_txt_header.
@@ -6055,7 +6055,7 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         self.loaded = True
 
-        if VERSION_RGB==1 : 
+        if VERSION_RGB==1 :
             if self.rgb is None:
                 self.updatepalette(0)
 
@@ -6569,7 +6569,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             if self.wx_exists:
                 logging.warning(_('No data file : ')+self.filename)
             return
-        
+
         def check_threshold(nbx, nby, THRESHOLD) -> bool:
             if nbx * nby > THRESHOLD:
                 logging.info(_('The array is very large > 100M pixels'))
@@ -6585,7 +6585,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             self.read_txt_header()
 
             if self.preload:
-                
+
                 update_min_max = check_threshold(self.nbx, self.nby, THRESHOLD)
 
                 self.import_geotif(which= which_band, crop = self.cropini)
@@ -7346,7 +7346,7 @@ class WolfArray(Element_To_Draw, header_wolf):
             else:
                 self.mypal.isopop(self.get_working_array(), self.nbnotnull)
 
-        if VERSION_RGB==1 : 
+        if VERSION_RGB==1 :
             if self.nbx * self.nby > 1_000_000 : logging.info(_('Computing colors'))
             if self.wolftype not in [WOLF_ARRAY_FULL_SINGLE, WOLF_ARRAY_FULL_INTEGER8]:
                 # FIXME: Currently, only some types are supported in Cython/OpenGL library
@@ -7357,7 +7357,7 @@ class WolfArray(Element_To_Draw, header_wolf):
                 self.rgb = self.mypal.get_rgba(self.array)
             if self.nbx * self.nby > 1_000_000 : logging.info(_('Colors computed'))
         elif VERSION_RGB==2 :
-            if self.wolftype not in [WOLF_ARRAY_FULL_SINGLE, 
+            if self.wolftype not in [WOLF_ARRAY_FULL_SINGLE,
                                      WOLF_ARRAY_FULL_INTEGER8,
                                      WOLF_ARRAY_FULL_INTEGER16,
                                      WOLF_ARRAY_FULL_INTEGER16_2,
@@ -7539,7 +7539,7 @@ class WolfArray(Element_To_Draw, header_wolf):
     def fillonecellgrid(self, curscale, loci, locj, force=False):
         """ Fill one cell of the plotted grid """
 
-        
+
 
         cursize = curscale  # 2**curscale
 
@@ -7651,12 +7651,12 @@ class WolfArray(Element_To_Draw, header_wolf):
 
             curlist['done'][loci, locj] = 1
 
-    def suxsuy_contour(self, 
-                       filename:str='', 
+    def suxsuy_contour(self,
+                       filename:str='',
                        abs:bool=False,
-                       one_vec_if_ml:bool = True) -> tuple[list[int,int], 
-                                                           list[int,int], 
-                                                           vector | zone, 
+                       one_vec_if_ml:bool = True) -> tuple[list[int,int],
+                                                           list[int,int],
+                                                           vector | zone,
                                                            bool]:
         """
         The borders are computed on basis of the current *mask*
@@ -8160,7 +8160,7 @@ class WolfArrayMB(WolfArray):
                 if self.masknull:
                     self.mask_data(self.nullvalue)
 
-                if VERSION_RGB==1 : 
+                if VERSION_RGB==1 :
                     if self.rgb is None:
                         self.rgb = np.ones((self.nbx, self.nby, 4), order='F', dtype=np.integer)
 
@@ -8434,8 +8434,8 @@ class WolfArrayMB(WolfArray):
                 self.mypal.isopop(allarrays, self.nbnotnull)
 
         self.link_palette()
-        
-        if VERSION_RGB ==1: 
+
+        if VERSION_RGB ==1:
             for curblock in self.myblocks.values():
                 curblock.rgb = self.mypal.get_rgba(curblock.array)
 

wolfhece/wolfresults_2D.py

@@ -64,12 +64,6 @@ except Exception as ex:
     if is_submodule:
         msg = _("wolfpy was found but we were not able to load it. It may be an issue with its DLL dependencies")
         msg += _("The actual error was: {}").format(str(ex))
-    else:
-        msg=_('Error importing wolfpy.pyd')
-        msg+=_('   Python version : ' + sys.version)
-        msg+=_('   If your Python version is not 3.7.x or 3.9.x, you need to compile an adapted library with compile_wcython.py in wolfhece library path')
-        msg+=_('   See comments in compile_wcython.py or launch *python compile_wcython.py build_ext --inplace* in :')
-        msg+='      ' + dirname(__file__)
 
     raise Exception(msg)
 
@@ -1789,7 +1783,7 @@ class OneWolfResult:
 
         self._current.mypal = curpal
         self._current.mypal.interval_cst = curpal.interval_cst
-        if VERSION_RGB==1 : 
+        if VERSION_RGB==1 :
             self._current.rgb = curpal.get_rgba(self._current.array)
             self._current.rgb[self._current.array.mask] = [1., 1., 1., 1.]
 
@@ -2022,7 +2016,7 @@ class Wolfresults_2D(Element_To_Draw):
         self._epsilon_default = self.epsilon
 
         self.loaded=True
-        
+
         self.current_result = -1
         self._step_interval = 1
 
@@ -2328,7 +2322,7 @@ class Wolfresults_2D(Element_To_Draw):
     @property
     def step_interval_results(self):
         return self._step_interval
-    
+
     @step_interval_results.setter
     def step_interval_results(self, value:int):
         self._step_interval = value
@@ -4184,7 +4178,7 @@ class Wolfresults_2D(Element_To_Draw):
 
                     ij = np.where(~wd.array.mask)
 
-                    # 
+                    #
                     mom = np.zeros_like(wd.array)
                     v   = np.zeros_like(wd.array)
                     z   = np.zeros_like(wd.array)
@@ -4208,7 +4202,7 @@ class Wolfresults_2D(Element_To_Draw):
 
                 ij = np.where(~wd.array.mask)
 
-                # 
+                #
                 mom = np.zeros_like(wd.array)
                 v   = np.zeros_like(wd.array)
                 z   = np.zeros_like(wd.array)

{wolfhece-2.1.36.dist-info → wolfhece-2.1.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.36
+Version: 2.1.38
 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
@@ -13,6 +13,7 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Requires-Python: <3.11,>=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: wxpython
+Requires-Dist: intel-fortran-rt
 Requires-Dist: scikit-learn
 Requires-Dist: cryptography
 Requires-Dist: jax

{wolfhece-2.1.36.dist-info → wolfhece-2.1.38.dist-info}/RECORD

@@ -47,13 +47,13 @@ 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=CZRtCd9XE1GcYegL_id3qyuywZJ4XzQh6Yv8pon--zk,356265
+wolfhece/wolf_array.py,sha256=m0Akg1jpe8L7139afVANhqUI09q7YlQvlGm2mcs7gJQ,356155
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=EqZI6qCR6ouT3wEtnG_NkVLdvUhfY65JVTj5b6o4lXI,16576
 wolfhece/wolf_tiles.py,sha256=2Ho2I20rHRY81KXxjgLOYISdF4OkJ2d6omeY4shDoGI,10386
 wolfhece/wolf_vrt.py,sha256=89XoDhCJMHiwPQUuOduxtTRKuIa8RDxgNqX65S4xp9M,10569
 wolfhece/wolf_zi_db.py,sha256=baE0niMCzybWGSvPJc5FNxo9ZxsGfU4p-FmfiavFHAs,12967
-wolfhece/wolfresults_2D.py,sha256=wxLXD2D46LMBiUYZzIsKtaUkryPB-xrd2T1CoRKSxE0,165906
+wolfhece/wolfresults_2D.py,sha256=U6k8BeQj2g3EUpAQq7m0nSdLtNKrrn_knWKKs1KoAQ8,165462
 wolfhece/xyz_file.py,sha256=Se4nCPwYAYLSA5i0zsbnZUKoAMAD0mK1FJea5WSZUkk,5755
 wolfhece/acceptability/Parallels.py,sha256=h4tu3SpC_hR5Hqa68aruxhtAyhs8u666YuZ40_fR5zg,3979
 wolfhece/acceptability/__init__.py,sha256=hfgoPKLDpX7drN1Vpvux-_5Lfyc_7feT2C2zQr5v-Os,258
@@ -70,8 +70,8 @@ wolfhece/apps/__init__.py,sha256=OzzKItATWV0mDkz_LC2L3w5sgT2rt8ExXXCbR_FwvlY,24
 wolfhece/apps/check_install.py,sha256=icFpkjfwNGDX-0NZVa-ijrCrqmGHEKDiFphjN8uTyh8,928
 wolfhece/apps/curvedigitizer.py,sha256=_hRR2PWow7PU7rTHIbc6ykZ08tCXcK9uy7RFrb4EKkE,5196
 wolfhece/apps/isocurrent.py,sha256=MuwTodHxdc6PrqNpphR2ntYf1NLL2n9klTPndGrOHDQ,4109
-wolfhece/apps/splashscreen.py,sha256=2o1NRxs48BC8m0XCbDgWmWxWDddDXaCtZ-lSnU-cSkM,2922
-wolfhece/apps/version.py,sha256=b4QUjeosMLU1tdLlu7uvGlp3GeubVH8VFCVliut20o0,388
+wolfhece/apps/splashscreen.py,sha256=Z95ca-r_SZFpTJZIILuAcKyzl6ElZR08Y5mpQ5y4ZDc,2920
+wolfhece/apps/version.py,sha256=oID8AvPVNdgq4kmuDFo7jFiw8pv1XddrAgr_ttxcAgk,388
 wolfhece/apps/wolf.py,sha256=mM6Tyi4DlKQILmO49cDUCip9fYVy-hLXkY3YhZgIeUQ,591
 wolfhece/apps/wolf2D.py,sha256=yPQGee7fsegoQ8GfWKrWEjX1Az_ApL-UWlBiqPvaIyY,565
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -169,39 +169,10 @@ wolfhece/lazviewer/vfuncsdir/vfuncs.cp39-win_amd64.pyd,sha256=MzAEyrgnqja-FjHGtL
 wolfhece/lazviewer/viewer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/lazviewer/viewer/viewer.exe,sha256=pF5nwE8vMWlEzkk-SOekae9zpOsPhTWhZbqaJntumJc,202240
 wolfhece/lazviewer/viewer/viewer.py,sha256=8_MQCaQOS0Z_oRPiGoRy1lq-aCirReX3hWEBjQID0ig,24665
-wolfhece/libs/MSVCP140.dll,sha256=2GrBWBI6JFuSdZLIDMAg_qKcjErdwURGbEYloAypx3o,565640
-wolfhece/libs/WolfDll.dll,sha256=E8SeV0AHVXW5ikAQuVtijqIvaYx7UIMeqvnnsmTMCT8,132934144
-wolfhece/libs/api-ms-win-crt-heap-l1-1-0.dll,sha256=r0euvgZa8vBFoZ8g7H5Upuc8DD6aUQimMJWnIyt1OBo,19720
-wolfhece/libs/api-ms-win-crt-math-l1-1-0.dll,sha256=ol0GVN6wzqGu8Ym6IXTQ8TvfUvCY06nsNtFeS_swxJk,27912
-wolfhece/libs/api-ms-win-crt-runtime-l1-1-0.dll,sha256=NxpEq5FhSowm0Vm-uHKntD9WnLX6yK2pms6Y8mSjtQM,23304
-wolfhece/libs/fribidi-0.dll,sha256=MCLSH_tGJXcJdcnUXilGNTVMH6KU8OumYyJX8yN08bQ,111616
 wolfhece/libs/get_infos.cp310-win_amd64.pyd,sha256=45b6uo0r2zPD4KbpHR8QZC0TwQHDb9S0It7-kv0GWTA,77824
-wolfhece/libs/glu32.dll,sha256=gLubeeL9b_RDYTQ2JL0iHzpRMg8uapKCOEpZ15k1SUQ,164352
-wolfhece/libs/hdf5.dll,sha256=quTNP4GZtVNJ6Ptx__ltuGTN0gQ96rvkGL5yBLuUcF4,3129856
-wolfhece/libs/hdf5_hl.dll,sha256=alZLhLXbReBtwbwsariWWRPAlrwzrePr-Mbdgiy922Y,112128
-wolfhece/libs/libcurl.dll,sha256=xYNKOWwPynyHNEwgN61GRHHMqjFyBxu4GWemFe89Ipc,311296
-wolfhece/libs/libifcoremd.dll,sha256=iMZ5S09HKQEXM0BTNHyR4_0XSm5Es50UKnVenTRvWus,1868144
-wolfhece/libs/libifcoremdd.dll,sha256=fwHgfZsj91kt5Y0owPL7ZFV55bxN91bU1bB0G0RQaTw,1868144
-wolfhece/libs/libifportmd.dll,sha256=JoQ9RBPndNZSvTOwAAm3wjDlzmBqs7nhW5dYPTiz49Q,421480
-wolfhece/libs/libiomp5md.dll,sha256=7mxKgVa2r-qCZHMmIZyJytxuA2SEZ9A_LbE-Rxtteds,1959528
-wolfhece/libs/libmmd.dll,sha256=pEL3ajD5Jvdlre4ZGFq8m5EYxL6Hj2LZ8pdkExmweKg,4514672
-wolfhece/libs/libmmdd.dll,sha256=sItDYCWLr0whr4RIhw1c6gQva19Dq4Cc922NfS9ReAI,4728176
-wolfhece/libs/libpardiso600-WIN-X86-64.dll,sha256=4UsSdj3TWf0IR4Peac05mLXCuZvzazix5_KGfurTRKE,16288256
-wolfhece/libs/libraqm.dll,sha256=p48j-ZNSQJRqrh8NHez7wdxZCKItW4DNSmWd082o60Y,1304064
-wolfhece/libs/mkl_core.2.dll,sha256=4xeYPkr7_iUqoyWZXqJgxkAeeLG1eJbM0c2ggeibdb4,78197776
-wolfhece/libs/mkl_intel_thread.2.dll,sha256=DCjZ8oUBZIpV9H0qLsk5WGAUppuNKnzIWsc1ko3WChk,54758416
-wolfhece/libs/mkl_rt.2.dll,sha256=70mFtgbn354EPdLP-_maDO4tJmWYrv0f7G-_AEED3BU,23857168
-wolfhece/libs/msvcr100.dll,sha256=rjy2xq-6mkqlyF9mAjw1M4ylebMDJt0CkY-dVSWVA9U,829264
-wolfhece/libs/netcdf.dll,sha256=6u6oyapv6lRB1KlDeEB1For0JjMYHtVYUYkH_ht_ICY,958976
-wolfhece/libs/paho-mqtt3cs.dll,sha256=i1v0CSIWEGPIlJrEEcmXDLXO2D1bCOQNIDPiWzIpMbI,134656
-wolfhece/libs/svml_dispmd.dll,sha256=GdwVZSC_XYiNpVVUqTqxAcYAf4zP6tr-E1N-3skVS7s,22291048
-wolfhece/libs/vcomp100.dll,sha256=NKvXc8hc4MrFa9k8ErALA6OmldGfR3zidaZPCZhMVJI,57168
-wolfhece/libs/vcruntime140.dll,sha256=YYMpkONk3KW_osYdkw8ArKrm0aqjEwOSQDRVrpoRJaU,89880
-wolfhece/libs/vcruntime140_1.dll,sha256=FVS1gClo_bJwWmfLthWF6VYLnkKdBDpap0LvPJu_tr8,37240
 wolfhece/libs/verify_wolf.cp310-win_amd64.pyd,sha256=ceWkovmTDfQcIzlxOBjUUDoHu6ZglOlUFADaRuAe3WM,127488
 wolfhece/libs/wolfogl.cp310-win_amd64.pyd,sha256=1nQE30ZDXTmnjnaJisDDlP5zvt5Chu2Lxz1a-bZTY1A,294912
 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
 wolfhece/libs/GL/glaux.h,sha256=I3vxXdrzVH05TmjEeAOgKn3egbPt34WMjbeKq5LaBvE,7130
 wolfhece/libs/GL/glcorearb.h,sha256=wfbeOYhbDpIowerrO50sOT2ZKRy5TIhiw6CbNw77m8c,243226
@@ -278,8 +249,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.36.dist-info/METADATA,sha256=Tlb74Iqx7ORkpGXPfl2fQwEAhBiBhYuIAn9tDwQRPTY,2430
-wolfhece-2.1.36.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-wolfhece-2.1.36.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
-wolfhece-2.1.36.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.36.dist-info/RECORD,,
+wolfhece-2.1.38.dist-info/METADATA,sha256=YabVhQz0G97k82q5CR8b4lqyCKpVhdhWpbIrjeJ9Yuw,2463
+wolfhece-2.1.38.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+wolfhece-2.1.38.dist-info/entry_points.txt,sha256=yggeO1Fa80pi2BrOd9k5dTkiFlefGPwG6HztZhY0-qw,366
+wolfhece-2.1.38.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.38.dist-info/RECORD,,