wolfhece 2.1.32__py3-none-any.whl → 2.1.33__py3-none-any.whl

wolfhece/apps/version.py

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

wolfhece/opengl/py3d.py

@@ -1220,22 +1220,25 @@ class CanvasOGL(glcanvas.GLCanvas):
 
         x,y,idx,alpha = self.picker[locx, locy]
 
-        logging.info('coords: {} - {}'.format(x,y))
-
-        r,g,b = self.colors[locx, locy]
-        logging.info('color: {} - {} - {}'.format(r,g,b))
+        # r,g,b = self.colors[locx, locy]
+        # logging.info('color: {} - {} - {}'.format(r,g,b))
 
         self.drawposition = not self.drawposition
 
         curarray = self.arrays[list(self.arrays.keys())[int(idx)-1]]
-        i = int(x / curarray.dx)
-        j = int(y / curarray.dy)
-        z = curarray.ztexture[i, j]
-        xyz = self.mvp_glm * vec4(x, y, z, 1.)
+        i = int(x)
+        j = int(y)
+        
+        if i > 0 and i < curarray.ztexture.shape[0] and j > 0 and j < curarray.ztexture.shape[1]:
+            z = curarray.ztexture[i, j]
 
-        self.textTodraw.append(Text_Image_Texture('{z:.3f}', self.parent, Text_Infos(Font_Priority.FONTSIZE, colour=(255,255,255,255)), None, x, y))
+            logging.info('coords: {} - {} - {}'.format(x,y,z))
 
-        self.Refresh()
+            # xyz = self.mvp_glm * vec4(x, y, z, 1.)
+
+            # self.textTodraw.append(Text_Image_Texture('{z:.3f}', self.parent, Text_Infos(Font_Priority.FONTSIZE, colour=(255,255,255,255)), None, x, y))
+
+            # self.Refresh()
 
     def OnRightUp(self, event:wx.MouseEvent):
         """ Called when the right mouse button is released."""
@@ -1702,10 +1705,10 @@ class CanvasOGL(glcanvas.GLCanvas):
 
             glFinish()
 
-            glBindTexture(GL_TEXTURE_2D, self._textureout)
-            self.colors = np.zeros((self.height, self.width, 3), dtype=np.uint8)
-            glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, self.colors, np.uint8)
-            self.colors = self.colors.swapaxes(0, 1)
+            # glBindTexture(GL_TEXTURE_2D, self._textureout)
+            # self.colors = np.zeros((self.height, self.width, 3), dtype=np.uint8)
+            # glGetTexImage(GL_TEXTURE_2D, 0, GL_RGB, GL_UNSIGNED_BYTE, self.colors, np.uint8)
+            # self.colors = self.colors.swapaxes(0, 1)
 
             glBindTexture(GL_TEXTURE_2D, self._posout)
             self.picker = np.zeros((self.height, self.width, 4), dtype=np.float32)
@@ -1754,6 +1757,8 @@ class Wolf_Viewer3D(wx.Frame):
 
         super(Wolf_Viewer3D, self).__init__(parent, title=title, size=(640, 480))
         self.canvas = CanvasOGL(self)
+        self.sx = 1.
+        self.sy = 1.
         self.Show()
 
     @property

wolfhece/shaders/quad_geom_shader.glsl

@@ -56,7 +56,8 @@ float get_value(sampler2DRect tex, vec2 pos) {
     float posx = (pos.x - origx) / dx;
     float posy = (pos.y - origy) / dy;
 
-    vec2 texCoord = vec2(posx, posy);
+    //vec2 texCoord = vec2(posx, posy);
+    vec2 texCoord = vec2(posy, posx);
 
     float zValue = texture(tex, texCoord).r * zScale;
     return zValue;

wolfhece/wolf_array.py

@@ -46,9 +46,10 @@ try:
 except:
     msg=_('Error importing wolfogl.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+=_('   If your Python version is not 3.10.x, you need to get an adapted library in wolfhece library path libs')
+    msg+=_('   Please contact us or launch *python compile_wcython.py build_ext --inplace* in :')
     msg+='      ' + os.path.dirname(__file__)
+    msg+=_('   if you have the source files of the Cython modules.')
 
     raise Exception(msg)
 
@@ -4437,7 +4438,10 @@ class WolfArray(Element_To_Draw, header_wolf):
             return
 
         self._quads = self.get_centers()
-        ztext = np.require(self.array.data, dtype=np.float32, requirements=['F'])
+        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,
@@ -5018,11 +5022,16 @@ class WolfArray(Element_To_Draw, header_wolf):
         try:
             if geotr[5] <0.:
                 self.origy = geotr[3]+geotr[5]*self.nby
-                self.array = np.transpose(np.flipud(np.ma.asarray(band.ReadAsArray())))
+                tmp_array = np.transpose(np.flipud(band.ReadAsArray()))
             else:
                 self.origy = geotr[3]
-                self.array = np.transpose(np.ma.asarray(band.ReadAsArray()))
+                tmp_array = np.transpose(band.ReadAsArray())
+
+            self.array = np.ma.asarray(tmp_array.copy())
+
+            assert self.array.iscontiguous(), _('Array is not contiguous')
 
+            del tmp_array
 
             if self.array.dtype == np.float64:
                 self.wolftype = WOLF_ARRAY_FULL_DOUBLE

wolfhece/wolf_texture.py

@@ -402,7 +402,7 @@ class Text_Image_Texture(genericImagetexture):
         self.oldview = [self.xmin, self.xmax, self.ymin, self.ymax, self.width, self.height]
 
     def findscale(self):
-
+        
         self.proptext.setscale(self.mapviewer.sx, self.mapviewer.sy)
 
     def load(self, imageFile=""):

{wolfhece-2.1.32.dist-info → wolfhece-2.1.33.dist-info}/METADATA

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

{wolfhece-2.1.32.dist-info → wolfhece-2.1.33.dist-info}/RECORD

@@ -48,9 +48,9 @@ wolfhece/rain_SPWMI.py,sha256=YqsF-yFro3y_a6MfVRFfr-Rxi7NR1gl_i8VX7scmzes,13548
 wolfhece/test_Results2DGPU.py,sha256=NOJ_hFXrcLSQXS1dtsqXRQltqIZtDSHMz_EgAJ2_FHU,307
 wolfhece/textpillow.py,sha256=zEfLrKhfCDyMaVuQOUjHqz6MGKeQ4aewMxOsWi5-wKI,13832
 wolfhece/tools_mpl.py,sha256=q8Yc4aukPPiUcEzREvZRM_em67XqXaahdoaNt0DETfE,266
-wolfhece/wolf_array.py,sha256=7TOryanTy1kyO480VJ6zBjaTRXxcUu7c9TeDAKT-76c,355712
+wolfhece/wolf_array.py,sha256=u-mgO65i-6Cv7ZyTwVehHeRV-j0AApeNa-UwSR82eEE,355967
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
-wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
+wolfhece/wolf_texture.py,sha256=KAzrA86Sl2HSkATXKDG8AEL0rEL560XTAl_HZw7VBos,16278
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
 wolfhece/wolf_vrt.py,sha256=un5CKzAUmzSsjLXK7YLnQEWz8FLoafXJs8oqUvS_-h0,10271
 wolfhece/wolf_zi_db.py,sha256=Ok0MxQYZMMLRJN1QY-HSplLhUzzb6gkXgBQ3ihhLQHk,12669
@@ -72,7 +72,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=EjEjZGuWV-8ZfHhnFH4XLrrtB-YpzPDVhFzRrjgFUzI,2624
-wolfhece/apps/version.py,sha256=P4inP6CexgdmRIkkT_nMwMYPjOHtwIwHikcTMnJuoTk,388
+wolfhece/apps/version.py,sha256=T0LmEbb20s-W-mCYSeft4TW97CGnPrEnRHM-RvHocZM,388
 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
@@ -241,7 +241,7 @@ wolfhece/models/waterdepths.pal,sha256=8rcQfuZOeLKzYv5sARPkhpvZYc1OToj3ZukcbuRUg
 wolfhece/models/white_black.pal,sha256=BKjVN1kuk1OtJB9S3uM5fxteWbggI3Pb8p9WdDptT4c,51
 wolfhece/opengl/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/opengl/gl_utils.py,sha256=-eH2WAWdLFr6mzEwN8XdfJfM8U2rgvRryCAqjH-zeys,66136
-wolfhece/opengl/py3d.py,sha256=Ws2VM8TNHR4Tx_Ud14c38FEco3LZWevH7UvtSUt6osw,66451
+wolfhece/opengl/py3d.py,sha256=oSxkGW3om3jHAy3C-4XQhpWicvkRBIHk26iiKsiZxR4,66623
 wolfhece/opengl/tile_packer.py,sha256=0B1-Q-Jm-lKIXrw2lFbrrVL9gbtbl50jeWl67ymYbsc,15841
 wolfhece/pythonfortran/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/pythonfortran/example_makendarray.py,sha256=FNPp6lsU9Mv0O8VLN3JHWk5Qn1zZxUSCPeDyUI1-x48,2718
@@ -263,7 +263,7 @@ wolfhece/scenario/update_void.py,sha256=MmiDiwWHvuk0mpXOlMeB2ImY-d1Wi3Wfmg9hrDTA
 wolfhece/shaders/fragment_shader_texture.glsl,sha256=w6h8d5mJqFaGbao0LGmjRcFFdcEQ3ICIl9JpuT71K5k,177
 wolfhece/shaders/geom_grid.glsl,sha256=7eAkutCrwoeJpIdF69Ar7K18YyClvVG8ArJJARcmC-Q,742
 wolfhece/shaders/quad_frag_shader.glsl,sha256=GYGg9q4vFXiMuLK-pxSLz7crAE3dvlzJ7-e7PMfwSq0,1227
-wolfhece/shaders/quad_geom_shader.glsl,sha256=VluEhUBzi5DlPFE2wWO4Om0N6NBc_DljkPygjZ-8Cbg,9283
+wolfhece/shaders/quad_geom_shader.glsl,sha256=rgj86_Vwq4_mFhttTQhykcvHKYwxPfjGnPRZwxOuhRc,9324
 wolfhece/shaders/quadpos_frag_shader.glsl,sha256=0wwkMAg34VX2UrUsSp5lBcJ7x1cT03jZ6f31E2d43yo,152
 wolfhece/shaders/quadpos_geom_shader.glsl,sha256=3yoG50qKvNX1Gga8vNOX1OfVWTnXmbur--OmfQaqvNo,2272
 wolfhece/shaders/simple_fragment_shader.glsl,sha256=3CpRsdReYwHC-rM5YJLZJFHbUbfA-4jxiGX-AS34Gpo,173
@@ -280,8 +280,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
 wolfhece/wintab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/wintab/wintab.py,sha256=8A-JNONV6ujgsgG3lM5Uw-pVgglPATwKs86oBzzljoc,7179
-wolfhece-2.1.32.dist-info/METADATA,sha256=WC53YHFEL1sGIHLobwvzv65N9zIFDqSRBLKmVHrMdpk,2356
-wolfhece-2.1.32.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-wolfhece-2.1.32.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
-wolfhece-2.1.32.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.32.dist-info/RECORD,,
+wolfhece-2.1.33.dist-info/METADATA,sha256=UyiiBEQYpkHue3QRTDuWbtuZBkMf5iS12_pM2oQe85E,2356
+wolfhece-2.1.33.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+wolfhece-2.1.33.dist-info/entry_points.txt,sha256=MAG6NrF64fcxiVNb2g1JPYPGcn9C0HWtqqNurB83oX0,330
+wolfhece-2.1.33.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.33.dist-info/RECORD,,