wolfhece 2.0.49__py3-none-any.whl → 2.0.51__py3-none-any.whl

wolfhece/PyDraw.py

@@ -6943,7 +6943,11 @@ class WolfMapViewer(wx.Frame):
                 if r == wx.ID_YES:
                     self.active_vector.close_force()
 
-                self.active_vector.parentzone.plot(prep = True)
+                # force to prepare OpenGL to accelerate the plot
+                # Le test not(self in self.linkedList) permet de ne pas créer le liste OpenGL en cas de multi-viewers
+                # car une liste OpenGL ne sera pas tracée sur les autres fenêtres
+                # C'est donc plus lent mais plus sûr pour que l'affichage dynamique soit correct
+                self.active_vector.parentzone.plot(prep = not(self in self.linkedList))
 
             elif self.action == 'modify vertices':
 
@@ -6951,7 +6955,10 @@ class WolfMapViewer(wx.Frame):
                 self.end_action(_('End of vertices modification'))
 
                 # force to prepare OpenGL to accelerate the plot
-                self.active_vector.parentzone.plot(prep = True)
+                # Le test not(self in self.linkedList) permet de ne pas créer le liste OpenGL en cas de multi-viewers
+                # car une liste OpenGL ne sera pas tracée sur les autres fenêtres
+                # C'est donc plus lent mais plus sûr pour que l'affichage dynamique soit correct
+                self.active_vector.parentzone.plot(prep = not(self in self.linkedList))
                 self.active_zones.find_minmax(True)
 
                 self.active_vertex = None
@@ -6960,7 +6967,10 @@ class WolfMapViewer(wx.Frame):
                 self.end_action(_('End of vertices insertion'))
 
                 # force to prepare OpenGL to accelerate the plot
-                self.active_vector.parentzone.plot(prep = True)
+                # Le test not(self in self.linkedList) permet de ne pas créer le liste OpenGL en cas de multi-viewers
+                # car une liste OpenGL ne sera pas tracée sur les autres fenêtres
+                # C'est donc plus lent mais plus sûr pour que l'affichage dynamique soit correct
+                self.active_vector.parentzone.plot(prep = not(self in self.linkedList))
                 self.active_zones.find_minmax(True)
 
                 self.active_vertex = None
@@ -6973,7 +6983,10 @@ class WolfMapViewer(wx.Frame):
                 self.active_zones.find_minmax(True)
 
                 # force to prepare OpenGL to accelerate the plot
-                self.active_vector.parentzone.plot(prep = True)
+                # Le test not(self in self.linkedList) permet de ne pas créer le liste OpenGL en cas de multi-viewers
+                # car une liste OpenGL ne sera pas tracée sur les autres fenêtres
+                # C'est donc plus lent mais plus sûr pour que l'affichage dynamique soit correct
+                self.active_vector.parentzone.plot(prep = not(self in self.linkedList))
 
                 self.active_vertex = None
 

wolfhece/PyGui.py

@@ -871,14 +871,14 @@ class Wolf2DModel(GenMapManager):
             fname = self.filenamegen + curextent
             if exists(fname):
                 fname += '.txt'
-                fhead.write_txt_header(fname,wolftype)
+                fhead.write_txt_header(fname, wolftype, forceupdate=True)
 
         mb = self.files_MB_array['Initial Conditions']
         for curextent,text,wolftype in mb:
             fname = self.filenamegen + curextent
             if exists(fname):
                 fname += '.txt'
-                mbhead.write_txt_header(fname,wolftype)
+                mbhead.write_txt_header(fname, wolftype, forceupdate=True)
 
         fname = self.filenamegen + '.lst'
         if not exists(fname):

wolfhece/PyVertexvectors.py

@@ -130,6 +130,9 @@ class Triangulation(Element_To_Draw):
             buffer = gltf.buffers[bufferView.buffer]
             data = gltf.get_data_from_buffer_uri(buffer.uri)
 
+            logging.info(_('Importing GLTF file : {}').format(fn))
+            logging.info(_('Number of vertices : {}').format(accessor.count))
+
             # pull each vertex from the binary buffer and convert it into a tuple of python floats
             points = np.zeros([accessor.count, 3], order='F', dtype=np.float64)
             for i in range(accessor.count):
@@ -139,6 +142,9 @@ class Triangulation(Element_To_Draw):
 
                 points[i, :] = np.asarray([v[0], -v[2], v[1]])
 
+                if np.mod(i,100000)==0:
+                    logging.info(_('Reading vertex {}').format(i))
+
             accessor = gltf.accessors[primitive.indices]
 
             bufferView = gltf.bufferViews[accessor.bufferView]
@@ -153,6 +159,7 @@ class Triangulation(Element_To_Draw):
                 size=12
                 format='<LLL'
 
+            logging.info(_('Number of triangles : {}').format(int(accessor.count/3)))
             for i in range(int(accessor.count/3)):
 
                 index = bufferView.byteOffset + accessor.byteOffset + i*size  # the location in the buffer of this vertex
@@ -160,6 +167,9 @@ class Triangulation(Element_To_Draw):
                 v = struct.unpack(format, d)   # convert from base64 to three floats
                 triangles.append(list(v))
 
+                if np.mod(i,100000)==0:
+                    logging.info(_('Reading triangle {}').format(i))
+
         # On souhaite obtenir une triangulation du type :
         #   - liste de coordonnées des sommets des triangles
         #   - par triangle, liste de 3 indices, un pour chaque sommet
@@ -167,7 +177,9 @@ class Triangulation(Element_To_Draw):
         # Si le fichier GLTF vient de Blender, il y aura des informations de normales ...
         # Il est donc préférable de filtrer les points pour ne garder que des valeurs uniques
         # On ne souhaite pas gérer le GLTF dans toute sa généralité mais uniquement la triangulation de base
+        logging.info(_('Sorting information ...'))
         xyz_u,indices = np.unique(np.array(points),return_inverse=True,axis=0)
+        logging.info(_('Creating triangles ...'))
         triangles = [[indices[curtri[0]],indices[curtri[1]],indices[curtri[2]]] for curtri in list(triangles)]
 
         self.pts = xyz_u
@@ -1543,7 +1555,7 @@ class vector:
             return
 
         if self.myprop.imagevisible:
-            
+
             if self.myprop.textureimage is None:
                 self.myprop.load_unload_image()
 

wolfhece/apps/version.py

@@ -5,7 +5,7 @@ class WolfVersion():
 
         self.major = 2
         self.minor = 0
-        self.patch = 49
+        self.patch = 51
 
     def __str__(self):
 

wolfhece/wolf_array.py

@@ -2015,7 +2015,7 @@ class Ops_Array(wx.Frame):
         if self.mapviewer is not None:
             if self.mapviewer.linked:
                 if self.mapviewer.link_shareopsvect:
-                        if self.myzones.parent in self.mapviewer.linkedList:
+                        if self.myzones.get_mapviewer() in self.mapviewer.linkedList:
                             self.myzones.showstructure()
                         return
 
@@ -2469,6 +2469,10 @@ class SelectionData():
         if len(curlist) == 0:
             return ''
 
+        if curlist == 'all':
+            txt += 'all\n'
+            return txt
+
         for cur in curlist:
             txt += str(cur[0]) + '\t' + str(cur[1]) + '\n'
 
@@ -4547,25 +4551,37 @@ class WolfArray(Element_To_Draw, header_wolf):
 
         fromarray: WolfArray
 
+        # Récupération des bornes de la matrice source dans la matrice de destination
         i1, j1 = self.get_ij_from_xy(fromarray.origx, fromarray.origy)
         i2, j2 = self.get_ij_from_xy(fromarray.origx + fromarray.nbx * fromarray.dx,
                                      fromarray.origy + fromarray.nby * fromarray.dy)
 
+        # Limitation des bornes à la matrice de destination
         i1 = max(0, i1)
         j1 = max(0, j1)
         i2 = min(self.nbx, i2)
         j2 = min(self.nby, j2)
 
+        # Conversion des bornes utiles en coordonnées
         x1, y1 = self.get_xy_from_ij(i1, j1)
         x2, y2 = self.get_xy_from_ij(i2, j2)
 
-        i3, j3 = self.get_ij_from_xy(x1, y1)
-        i4, j4 = self.get_ij_from_xy(x2, y2)
+        # Récupération des bornes utiles dans la matrice source
+        i3, j3 = fromarray.get_ij_from_xy(x1, y1)
+        i4, j4 = fromarray.get_ij_from_xy(x2, y2)
 
+        # Sélection des valeurs non masquées
+        # Attention : le résultat est en indices relatifs à [i3,j3] --> demande une conversion en indices absolus pour retrouver les valeurs dans la matrice complète
         usefulij = np.where(np.logical_not(fromarray.array.mask[i3:i4, j3:j4]))
-        usefulij[0][:] += i1
-        usefulij[1][:] += j1
-        self.array.data[usefulij] = fromarray.array.data[usefulij]
+
+        i5, j5 = self.get_ij_from_xy(x1, y1)
+
+        # Décalage des indices pour la matrice de destination
+        usefulij_dest = (usefulij[0] + i5, usefulij[1] + j5)
+        usefulij[0][:] += i3
+        usefulij[1][:] += j3
+
+        self.array.data[usefulij_dest] = fromarray.array.data[usefulij]
 
         self.mask_data(self.nullvalue)
         self.reset_plot()

{wolfhece-2.0.49.dist-info → wolfhece-2.0.51.dist-info}/METADATA

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

{wolfhece-2.0.49.dist-info → wolfhece-2.0.51.dist-info}/RECORD

@@ -6,8 +6,8 @@ wolfhece/ManageParams.py,sha256=Wgt5Zh7QBtyiwTAltPHunSLqt4XuVuRH76GTUrXabS4,219
 wolfhece/Model1D.py,sha256=-cMz-ePSYzrKVVDidiDOz6cojEZ3y6u9gIb7RPwT6Y8,476593
 wolfhece/PyConfig.py,sha256=oGSL1WsLM9uinlNP4zGBLK3uHPmBfduUi7R-VtWuRFA,8034
 wolfhece/PyCrosssections.py,sha256=f4dNYRUGZKePruaaBiTcn5vlrw8TFTj9XwTDrdiF_uU,112450
-wolfhece/PyDraw.py,sha256=Zz2pcBUGA7s3FURP-4CPdoBqENtSrf-RLH1o-xZ6qrA,343578
-wolfhece/PyGui.py,sha256=LZtmQuEa0p-67iYyvLHJRK8uBs1zKmA3UqDzejWogy8,59795
+wolfhece/PyDraw.py,sha256=nUHEMpTG0zJvBJYOnreTvAISeP7cLsx14Qyrv-y32OY,344956
+wolfhece/PyGui.py,sha256=-LTnUVkRsqJw41DPN0jvhBOmDyygw6GgdGsno78cI_o,59833
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=SYKYx_vxF_FVuceLhcIqFQsivGD6EoO_Xu-EGN9Ivko,22252
@@ -15,7 +15,7 @@ wolfhece/PyParams.py,sha256=-0cax_Db6kFTe46BAgT24Ga2Xyp2Dm3gpuI-5uUSMxw,84758
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=OFo8VFxTSViWSTzv2paHeJ9O5BkFUyamXrRPFamlWoU,39630
-wolfhece/PyVertexvectors.py,sha256=T3k8gIZA5Z89hfgJaV90sNeUbc31Shw3ZiOlmcTwl4g,217423
+wolfhece/PyVertexvectors.py,sha256=fnUsCYZHL9WPweW_fBkq16MiyxWb6Kklwupwd5Y25qs,217974
 wolfhece/PyWMS.py,sha256=t6jVZpTxTNSLJxABk8A79cEMWTKoRM_S_SXRipsHLzw,4493
 wolfhece/RatingCurve.py,sha256=YSQvSvdMHE6hSlWVBF5Oe0-Fh3waNMpOdmcymaCCTis,21706
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
@@ -48,7 +48,7 @@ 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=ZdiL2UngJ3gpxu0in36bXqDXAFkNXfXgoNKlYshe5qI,288379
+wolfhece/wolf_array.py,sha256=E6u0d6kABsegIZxPUZjtWS88lOrVc2d-lyW0uJgj6qo,289157
 wolfhece/wolf_hist.py,sha256=JpRXvzJLUP-RkSkvth3DQWglgTMFI2ZEUDb4RYOfeeI,3284
 wolfhece/wolf_texture.py,sha256=llQ7aV8scWXIkhpri9XjaPejzoBJsGfsln2ZnlRbFkU,16270
 wolfhece/wolf_tiles.py,sha256=F2JsJHdAP8fIffNJdG_J26bonCIRtIwMmxKFqdSCRDA,10088
@@ -66,7 +66,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=m9hMTqzhSUcTudApyNNjoAK9e2u5vgEkJVV79xmfM1s,2118
-wolfhece/apps/version.py,sha256=tejIrO28wyVtzgDMOfulj8-lCo6fAuZLVAHNwyLgfLM,388
+wolfhece/apps/version.py,sha256=4x0IKF2qm1W3uxFB9BRzNjYqm8k_SyM9RGJ3UyHNjJo,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
@@ -256,8 +256,8 @@ wolfhece/sounds/sonsw2.wav,sha256=pFLVt6By0_EPQNt_3KfEZ9a1uSuYTgQSX1I_Zurv9Rc,11
 wolfhece/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=yGbU_JsF56jsmms0gh7mxa7tbNQ_SxqhpAZxhm-mTy4,14860
 wolfhece/ui/wolf_times_selection_comparison_models.py,sha256=wCxGRnE3kzEkWlWA6-3X8ADOFux_B0a5QWJ2GnXTgJw,4709
-wolfhece-2.0.49.dist-info/METADATA,sha256=yvh37UvJwhh4d8FQvjpMLs2A9VYIMcuQRNmD02fszi8,2233
-wolfhece-2.0.49.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wolfhece-2.0.49.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.0.49.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.0.49.dist-info/RECORD,,
+wolfhece-2.0.51.dist-info/METADATA,sha256=oDXRv7-KNrA4hjLZ-afljqgeZeZkzCwyCoUwXNtl-Cc,2233
+wolfhece-2.0.51.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wolfhece-2.0.51.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.0.51.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.0.51.dist-info/RECORD,,