wolfhece 2.1.81__py3-none-any.whl → 2.1.82__py3-none-any.whl

wolfhece/PyDraw.py

@@ -9602,6 +9602,14 @@ class WolfMapViewer(wx.Frame):
 
         return self.canvas.SetCurrent(self.context)
 
+    def _set_gl_projection_matrix(self):
+        glMatrixMode(GL_PROJECTION)
+        glLoadIdentity()
+        glOrtho(self.xmin, self.xmax, self.ymin, self.ymax, -99999, 99999)
+
+        glMatrixMode(GL_MODELVIEW)
+        glLoadIdentity()
+
     def Paint(self):
         """ Dessin des éléments ajoutés au viewer """
 
@@ -9626,12 +9634,7 @@ class WolfMapViewer(wx.Frame):
             glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
             glViewport(0, 0, int(width), int(height))
 
-            glMatrixMode(GL_PROJECTION)
-            glLoadIdentity()
-            glOrtho(self.xmin, self.xmax, self.ymin, self.ymax, -99999, 99999)
-
-            glMatrixMode(GL_MODELVIEW)
-            glLoadIdentity()
+            self._set_gl_projection_matrix()
 
             # dessin du background
             self._plotting(draw_type.WMSBACK)

wolfhece/apps/version.py

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

wolfhece/gpuview.py

@@ -523,6 +523,7 @@ class VectorField(Element_To_Draw):
             glMatrixMode(GL_PROJECTION)
             # glPopMatrix()
             # glLoadIdentity()
+            self.get_mapviewer()._set_gl_projection_matrix()
 
     def _plot(self, projection_matrix):
         assert self._gl_texture is not None, "Did you set the data ?"

wolfhece/mesh2d/wolf2dprev.py

@@ -9488,8 +9488,7 @@ class prev_sim2D():
         """ Common mask for multiblock arrays """
 
         if self.mymnap is not None:
-            # return [cur.array.mask for cur in self.mymnap.myblocks.values()]
-            return [cur.array.data != 1 for cur in self.mymnap.myblocks.values()]
+            return self.mymnap.get_all_masks()
         else:
             return None
 

wolfhece/pyviews.py

@@ -27,15 +27,17 @@ class WolfViews(Element_To_Draw):
 
         super().__init__(idx, plotted, mapviewer, need_for_wx)
 
-        self.view = []
-        self.pals = []
+        self.view = [] # list of elements to plot
+        self.pals = [] # list of palettes to use for the elements
+        self.fix  = [] # list of boolean to fix some elements - avoid to delete OpenGL lists during "delete_lists"
 
     def delete_lists(self):
         """ Delete the lists of elements and palettes."""
 
-        for cur in self.view:
-            if isinstance(cur, WolfArray) or isinstance(cur, WolfArrayMB):
-                cur.delete_lists()
+        for cur, fix in zip(self.view, self.fix):
+            if not fix:
+                if isinstance(cur, WolfArray) or isinstance(cur, WolfArrayMB):
+                    cur.delete_lists()
 
     def read_from_file(self, fn):
         myproject = Wolf_Param(None, filename=fn, toShow=False)
@@ -181,7 +183,7 @@ class WolfViews(Element_To_Draw):
             else:
                 cur.mapviewer = newmapviewer
 
-    def add_elemt(self, added_elemt, pal=None):
+    def add_elemt(self, added_elemt, pal= None, fix= False):
         """ Add an element to the view.
 
         :param added_elemt: Element to add.
@@ -192,8 +194,9 @@ class WolfViews(Element_To_Draw):
 
         self.view.append(added_elemt)
         self.pals.append(pal)
+        self.fix.append(fix)
 
-    def add_elemts(self, added_elemts: list, pals=None):
+    def add_elemts(self, added_elemts: list, pals=None, fixes=None):
         """ Add a list of elements to the view.
 
         :param added_elemts: List of elements to add.
@@ -220,6 +223,21 @@ class WolfViews(Element_To_Draw):
 
             self.pals += pals
 
+        if fixes is None:
+            self.fix += [False]*len(added_elemts)
+        else:
+            if len(fixes) != len(added_elemts):
+                logging.warning('The number of fixes must be the same as the number of elements.')
+
+                if len(fixes) < len(added_elemts):
+                    logging.warning('The missing fixes will be set to None.')
+                    fixes += [False]*(len(added_elemts)-len(fixes))
+                else:
+                    logging.warning('The extra fixes will be ignored.')
+                    fixes = fixes[:len(added_elemts)]
+
+            self.fix += fixes
+
     def plot(self, sx=None, sy=None, xmin=None, ymin=None, xmax=None, ymax=None, size=None):
         """ Plot the view. """
 

wolfhece/wolf_array.py

@@ -10165,3 +10165,22 @@ class WolfArrayMNAP(WolfArrayMB):
 
         # Imposition du type de stockage
         self.wolftype = WOLF_ARRAY_MNAP_INTEGER
+
+    def get_one_mask(self, which:int | str):
+        """
+        Return the mask of the block `which`
+        """
+
+        if isinstance(which, int):
+            key = getkeyblock(which)
+        else:
+            key = which
+
+        return self.myblocks[key].array.data != 1
+    
+    def get_all_masks(self):
+        """
+        Return all masks
+        """
+
+        return [curblock.array.data != 1 for curblock in self.myblocks.values()]

wolfhece/wolfresults_2D.py

@@ -2278,7 +2278,7 @@ class Wolfresults_2D(Element_To_Draw):
         """ Common mask for multiblock arrays """
 
         if self.mymnap is not None:
-            return [cur.array.data !=1 for cur in self.mymnap.myblocks.values()]
+            return self.mymnap.get_all_masks()
         else:
             return None
 
@@ -4178,35 +4178,8 @@ class Wolfresults_2D(Element_To_Draw):
         """Dessin OpenGL"""
         self.mimic_plotdata(True)
 
-        if self._which_current_view in VIEWS_COMPLEX:
-            # FIXME : Force to plot all blocks in complex views.
-            #         There is an issue with GPUVIEW
-            if self.plotted:
-                lists = []
-                pals = []
-                for i in range(len(self.myblocks[getkeyblock(0)]._view.view)):
-                    lists.append([cur._view.view[i] for cur in self.myblocks.values()])
-                    pals.append([cur._view.pals[i] for cur in self.myblocks.values()])
-
-                for curlist, curpal in zip(lists, pals):
-                    for cur, pal in zip(curlist, curpal):
-                        oldplotted = cur.plotted
-                        cur.plotted = True
-                        # force True even if not "plotted",
-                        # we must plot all the arrays in a complex view,
-                        # which can use some objects that are not plotted
-                        # as individual arrays (e.g. Topography)
-                        if pal is None:
-                            cur.plot(sx, sy,xmin,ymin,xmax,ymax,size)
-                        else:
-                            oldpal = cur.mypal
-                            cur.mypal = pal
-                            cur.plot(sx, sy,xmin,ymin,xmax,ymax,size)
-                            cur.mypal = oldpal
-                        cur.plotted = oldplotted
-        else:
-            for curblock in self.myblocks.values():
-                curblock.plot(sx, sy,xmin,ymin,xmax,ymax)
+        for curblock in self.myblocks.values():
+            curblock.plot(sx, sy,xmin,ymin,xmax,ymax)
 
         if self.myparam is not None:
             #conditions limites faibles

{wolfhece-2.1.81.dist-info → wolfhece-2.1.82.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wolfhece
-Version: 2.1.81
+Version: 2.1.82
 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.81.dist-info → wolfhece-2.1.82.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=Pwjn5TFcO4OgyA1sdKjfnf-xMnXphiqmdih4_gtr19Q,422813
+wolfhece/PyDraw.py,sha256=-Qq81Eo4BDNDTinvjboJFY3gadWQNPyZER06sCtsPCw,422883
 wolfhece/PyGui.py,sha256=HY0beOMSp1JEyq8-vfVynzVrmKxvaO_sJSMwlNqCNrg,105289
 wolfhece/PyGuiHydrology.py,sha256=f60E8K9eGTnRq5RDF6yvt-ahf2AYegwQ9t25zZ2Mk1A,14946
 wolfhece/PyHydrographs.py,sha256=jwtSNMMACwarxrtN1UeQYth99UNrhwPx1IGgUwcooHA,3774
@@ -30,7 +30,7 @@ wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,3
 wolfhece/drawing_obj.py,sha256=7vY04B6r08nurTTFmBXHyR5tVIF1YzAEw_uz4pqTDIw,4233
 wolfhece/flow_SPWMI.py,sha256=XDAelwAY-3rYOR0WKW3fgYJ_r8DU4IP6Y5xULW421tk,20956
 wolfhece/friction_law.py,sha256=MtZJLo-pTj3-Fw-w12z1LSgSIDrH-JGR0iD9wer_fpQ,5498
-wolfhece/gpuview.py,sha256=3QD2GOxbZSsCgGy3krBkH8zBrS5r7oz5KszL2Op8MuY,24142
+wolfhece/gpuview.py,sha256=ggFoxBntUjHqsoxwTZQOE-UsbtC8YAIwZD1i3veAe-o,24204
 wolfhece/import_ascfiles.py,sha256=6Zl8qBR9c6VtyziookQ8YE9KC0GtW_J9WFt5ubyGp-s,4465
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=gDuM9sEowQndLTL8vzbZW879M1go2xiKeE4EAJD2bA4,16532
@@ -43,18 +43,18 @@ wolfhece/pydike.py,sha256=hPBQsmSTW4QAp1wcOzb-TL3L7eet2WT1sJx2q-WNQ-Q,2241
 wolfhece/pylogging.py,sha256=4TI8hgBB65z-zpvU5Rfa2jkPXPhJaqXjHVPwbcdzTNc,4528
 wolfhece/pypolygons_scen.py,sha256=x-tnYLNq3MPV51NbaU14trgRj8qyUyOrMdF1zDsUX3I,37444
 wolfhece/pyshields.py,sha256=7k-qe2EJgr9fJE62jyPmlWQwRj8T0DK4iuMU844ZhYs,23281
-wolfhece/pyviews.py,sha256=lNoK0LydFbQzVzsLEVGj1Ma1ynoXiUHK10yTBeTeL6M,12824
+wolfhece/pyviews.py,sha256=5Hqqo9MRw1eiomYkmc7QywNu1KmEkytLJG-wH_aG38Y,13748
 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=Vw9z4QWUHH0jXG2WXT0k6BaAjsjldppGbOOaY7bEGLU,401353
+wolfhece/wolf_array.py,sha256=L6OV70nFSmzfO_beNbPRQ_VoklC_cx6fyhoslI3AMXg,401812
 wolfhece/wolf_hist.py,sha256=7jeVrgSkM3ErJO6SRMH_PGzfLjIdw8vTy87kesldggk,3582
 wolfhece/wolf_texture.py,sha256=DS5eobLxrq9ljyebYfpMSQPn8shkUAZZVfqrOKN_QUU,16951
 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=icmrgbzRn0mMozx1GLrrFJFghzz-MuLgdmi-Kf3vh6Q,169941
+wolfhece/wolfresults_2D.py,sha256=Iq_eOcQ_UkgfWN386oFt_VZysMt8uyYrqd36iAkkM2Q,168473
 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
@@ -74,7 +74,7 @@ wolfhece/apps/curvedigitizer.py,sha256=Yps4bcayzbsz0AoVc_dkSk35dEhhn_esIBy1Ziefg
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 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=84BbOWuyjD0m7UKJmKJ4diPd2VS3kshthkwN_wFUto8,388
+wolfhece/apps/version.py,sha256=SpIz9DzdUfm6CdBEDSCQMvpAeu_I5QhRFbGY92mw1h0,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
@@ -220,7 +220,7 @@ wolfhece/mesh2d/bc_manager.py,sha256=QTGkb5TR8Y5xVnGUXPXzscGyTEQ6PA8CZPkVNwrlR1Y
 wolfhece/mesh2d/cell_tracker.py,sha256=mPmnD5lEf3gLPuLqtAIo-Gp-ipAwQdPxzjWOGt0b7jM,8958
 wolfhece/mesh2d/config_manager.py,sha256=DcdxCIIs_dyC6ayJOBULeY364LONogL9PBaqBtC9eQ4,14736
 wolfhece/mesh2d/cst_2D_boundary_conditions.py,sha256=Y4DF68uAklF3fXJgf05nb_JvJk2pvzcu_wu5nFXpWJo,5008
-wolfhece/mesh2d/wolf2dprev.py,sha256=kAqRxVlMEkDciEXTgbX6xz6Ck3OqQsSz1IF8NTbnbmM,491575
+wolfhece/mesh2d/wolf2dprev.py,sha256=CvCsutTwLr-BIxzYpzbg3YxIASJtMMtJpuZ77gxCue8,491460
 wolfhece/models/5_coul.pal,sha256=OI1UqcNIDBpJn2k_VDel__r-hKjjvdob0eqinGCI3QY,160
 wolfhece/models/6_coul.pal,sha256=z7NK2dg0tAQBUweRQV54dIwJbPM1U5y1AR2LLw19Idw,148
 wolfhece/models/7_coul.pal,sha256=XTnnUyCE8ONokScB2YzYDnSTft7E6sppmr7P-XwMsCE,205
@@ -284,8 +284,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.81.dist-info/METADATA,sha256=82JlbxS-qLm_YgV4kDhs_mxseccct_N3ktWr2kCqQeU,2570
-wolfhece-2.1.81.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-wolfhece-2.1.81.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
-wolfhece-2.1.81.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.81.dist-info/RECORD,,
+wolfhece-2.1.82.dist-info/METADATA,sha256=CoPxo3FK2QOAflVM4viGV2e3I5l5YcQICTzfwm2FXcg,2570
+wolfhece-2.1.82.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+wolfhece-2.1.82.dist-info/entry_points.txt,sha256=ZZ-aSfbpdcmo-wo84lRFzBN7LaSnD1XRGSaAKVX-Gpc,522
+wolfhece-2.1.82.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.82.dist-info/RECORD,,