wolfhece 2.1.9__py3-none-any.whl → 2.1.10__py3-none-any.whl

wolfhece/PyDraw.py

@@ -2055,7 +2055,8 @@ class WolfMapViewer(wx.Frame):
         """
         Récupère un graphique matplotlib sur base de la fenêtre OpenGL et de la palette de la matrice active
         """
-        self.zoom_on(center=center, width=width, height= height, canvas_height=self.canvasheight)
+        self.zoom_on(center=center, width=width, height= height, canvas_height=self.canvasheight, forceupdate=True)
+        
 
         fig,axes = plt.subplots(1,2, gridspec_kw={'width_ratios': [20, 1]})
         self.display_canvasogl(fig=fig,ax=axes[0])
@@ -2188,7 +2189,7 @@ class WolfMapViewer(wx.Frame):
                                    ax=ax[0],
                                    title=_('Current time {:0>8} s'.format(el_time)))
 
-    def get_canvas_as_impage(self) -> Image.Image:
+    def get_canvas_as_image(self) -> Image.Image:
         """
         Récupère la fenêtre OpenGL sous forme d'image
         """
@@ -3326,7 +3327,7 @@ class WolfMapViewer(wx.Frame):
                 for cur in self.linkedList:
                     if cur is not self:
                         cur.update()
-
+        
     def zoom_on_active_profile(self, size:float=500., forceupdate:bool=True):
         """ Zoom on active profile """
 
@@ -8515,7 +8516,8 @@ class WolfMapViewer(wx.Frame):
                     curarray.updatepalette(onzoom=[self.xmin, self.xmax, self.ymin, self.ymax])
                 curarray.delete_lists()
 
-        self.Refresh()
+        self.Paint()
+        # self.Refresh()
 
     def _plotting(self, drawing_type: draw_type, checked_state: bool = True):
         """ Drawing objets on canvas"""
@@ -8875,7 +8877,7 @@ class WolfMapViewer(wx.Frame):
             curobj.uncheck_plot()
 
         curitem = self.gettreeitem(curobj)
-        self.treelist.CheckItem(curitem, False)
+        self.treelist.UncheckItem(curitem)
 
     def get_current_zoom(self):
         """

wolfhece/PyParams.py

@@ -1029,6 +1029,9 @@ class Wolf_Param(wx.Frame):
             page.Append(pg.FontProperty(label = param_name, name = locname, value = locvalue))
 
         else:
+            if locvalue is None:
+                locvalue = ""
+                
             page.Append(pg.StringProperty(label = param_name, name = locname, value = locvalue))
 
     def _add_elem_to_page(self, page:pg.PropertyGridPage, group:str, param:dict, param_def:dict = None, prefix:str=''):

wolfhece/apps/version.py

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

wolfhece/multiprojects.py

@@ -26,8 +26,21 @@ class Project(Wolf_Param):
     Il s'agit d'une surcharge d'un objet Wolf_Param qui est organisé en groupes de paramètres
     Chaque paramètre peut être défini par une clé, une valeur et un commentaire (+ éventuellement une chaîne JSON)
     """
-    def __init__(self, wdir='', parent=None, title="Default Title", w=500, h=800, ontop=False, to_read=True, filename='', withbuttons=True, DestroyAtClosing=True, toShow=True):
-        super().__init__(parent, title, w, h, ontop, to_read, filename, withbuttons, DestroyAtClosing, toShow)
+    def __init__(self, 
+                 wdir='', 
+                 parent=None, 
+                 title="Default Title", 
+                 w=500, h=800, 
+                 ontop=False, 
+                 to_read=True, 
+                 filename='', 
+                 withbuttons=True, 
+                 DestroyAtClosing=True, 
+                 toShow=True,
+                 init_GUI:bool = False,
+                 force_even_if_same_default:bool = False):
+        
+        super().__init__(parent, title, w, h, ontop, to_read, filename, withbuttons, DestroyAtClosing, toShow, init_GUI, force_even_if_same_default)
         self.wdir = wdir
 
 class Wolf2D_Project(Project):
@@ -73,6 +86,7 @@ class Wolf2D_Project(Project):
         super().__init__(wdir, parent, title, w, h, ontop, to_read, filename, withbuttons, DestroyAtClosing, toShow)
 
         self.mysims:dict[str,Union[Wolfresults_2D, wolfres2DGPU]]={}
+        
         self.mycontours={}
         self.mycolormaps={}
         self.epsilon=5e-4

wolfhece/report/reporting.py

@@ -17,6 +17,7 @@ from datetime import datetime
 import os
 import socket
 import hashlib
+import re
 
 from gettext import gettext as _
 
@@ -61,24 +62,22 @@ class RapidReport:
 
     def __init__(self, main_title:str, author:str):
         
-        self._main_title = None
-        self._author = None
+        self._main_title = main_title
+        self._author = author
         self._date = None
 
         self._content = []
-        self._document = Document()
+        self._document = None
 
         self._filename = None
 
         self._idx_figure = 0
 
         self._styles={}
-        self.define_default_styles()
 
         self._has_first_page = False
-        self.fill_first_page(main_title, author)
  
-    def define_default_styles(self):
+    def _define_default_styles(self):
         
         # Définir le style de titre
         self._title_style = self._document.styles.add_style('TitleStyle', 1)
@@ -90,7 +89,7 @@ class RapidReport:
         # Définir le style de légende
         self._caption_style = self._document.styles.add_style('CaptionStyle', 1)
         self._caption_style.font.name = 'Arial'
-        self._caption_style.font.size = Pt(10)
+        self._caption_style.font.size = Pt(9)
         self._caption_style.font.italic = True
         self._caption_style._element.rPr.rFonts.set(qn('w:eastAsia'), 'Arial')
         self._caption_style.paragraph_format.alignment = WD_PARAGRAPH_ALIGNMENT.CENTER
@@ -98,26 +97,27 @@ class RapidReport:
         # Définir le style de corps de texte
         self._body_text_style = self._document.styles.add_style('BodyTextStyle', 1)
         self._body_text_style.font.name = 'Arial'
-        self._body_text_style.font.size = Pt(12)
+        self._body_text_style.font.size = Pt(11)
         self._body_text_style._element.rPr.rFonts.set(qn('w:eastAsia'), 'Arial')
+        self._body_text_style.paragraph_format.alignment = WD_PARAGRAPH_ALIGNMENT.JUSTIFY
 
         # Définir le style de liste à puce
         self._bullet_list_style = self._document.styles.add_style('BulletListStyle', 1)
         self._bullet_list_style.font.name = 'Arial'
-        self._bullet_list_style.font.size = Pt(12)
+        self._bullet_list_style.font.size = Pt(9)
         self._bullet_list_style._element.rPr.rFonts.set(qn('w:eastAsia'), 'Arial')
         self._bullet_list_style.paragraph_format.alignment = WD_PARAGRAPH_ALIGNMENT.LEFT
         self._bullet_list_style.paragraph_format.left_indent = Inches(0.25)
 
         self._table_grid_style = self._document.styles.add_style('TableGrid', 3)
         self._table_grid_style.font.name = 'Arial'
-        self._table_grid_style.font.size = Pt(10)
+        self._table_grid_style.font.size = Pt(9)
         self._table_grid_style._element.rPr.rFonts.set(qn('w:eastAsia'), 'Arial')
         self._table_grid_style.paragraph_format.alignment = WD_PARAGRAPH_ALIGNMENT.CENTER
 
         self._figure_style = self._document.styles.add_style('FigureStyle', 1)
         self._figure_style.font.name = 'Arial'
-        self._figure_style.font.size = Pt(10)
+        self._figure_style.font.size = Pt(9)
         self._figure_style._element.rPr.rFonts.set(qn('w:eastAsia'), 'Arial')
         self._figure_style.paragraph_format.alignment = WD_PARAGRAPH_ALIGNMENT.CENTER
 
@@ -142,6 +142,8 @@ class RapidReport:
         Ajouter le titre, l'auteur et la date.
         
         """
+        if self._has_first_page:
+            return
 
         # Récupérer le nom de l'utilisateur
         user_name = os.getlogin()
@@ -155,17 +157,17 @@ class RapidReport:
         self._author = author
         self._date = datetime.now().strftime('%d/%m/%Y')
 
-        self._document.add_heading(self._main_title, level=0)
-        self.add_figure(logo_path,caption=None, width=2.0)
+        self._insert_title(self._main_title, level=0, index=0)
+        self._insert_figure(logo_path,caption=None, width=2.0, index=1)
 
-        self.add_paragraph('Ce document a été généré automatiquement par le paquet Python "wolfhece".')
-        self.add_paragraph(' ')
-        self.add_paragraph(f'Auteur : {self._author}')
-        self.add_paragraph(f'Date : {self._date}')
-        self.add_paragraph(' ')
-        self.add_paragraph(f'Utilisateur : {user_name}')
-        self.add_paragraph(f'Ordinateur : {computer_name}')
-        self.add_paragraph(' ')
+        self._insert_paragraph('Ce document a été généré automatiquement par le paquet Python "wolfhece".', index =2)
+        self._insert_paragraph(' ', index=3)
+        self._insert_paragraph(f'Auteur : {self._author}', index=4)
+        self._insert_paragraph(f'Date : {self._date}', index=5)
+        self._insert_paragraph(' ', index=6)
+        self._insert_paragraph(f'Utilisateur : {user_name}', index=7)
+        self._insert_paragraph(f'Ordinateur : {computer_name}', index=8)
+        self._insert_paragraph(' ', index=9)
 
         chain_hash = hashlib.md5(self._main_title.encode() + 
                                  self._author.encode() +
@@ -173,14 +175,29 @@ class RapidReport:
                                  computer_name.encode()+
                                  self._date.encode()).hexdigest()
         
-        self.add_paragraph('Hash du document : ' + chain_hash)
+        self._insert_paragraph('Hash du document : ' + chain_hash, index=10)
 
-        self.add_new_page()
+        self._insert_new_page(index=11)
 
-        self.add_paragraph('summary')
+        self._insert_paragraph('summary', index=12)
 
         self._has_first_page = True
 
+    def _insert_title(self, title:str, level:int=1, index:int = 0):
+        """ Insère un titre dans le document. """
+
+        self._content.insert(index, ('title', title, level))
+    
+    def _insert_paragraph(self, paragraph_text:str, style:str='BodyTextStyle', index:int = 0):
+        """ Insère un paragraphe dans le document. """
+
+        self._content.insert(index, ('paragraph', paragraph_text, style))
+
+    def _insert_figure(self, image_path:Union[str, Path, Image.Image, Figure], caption:str, width:float=7.0, index:int = 0):
+        """ Insère une figure dans le document. """
+
+        self._content.insert(index, ('figure', image_path, caption, width, self._idx_figure))
+
     def add_title(self, title:str, level:int=1):
         """ Ajoute un titre au document. """
         
@@ -271,7 +288,7 @@ class RapidReport:
 
         return self
 
-    def add_figure(self, image_path:Union[str,Path,Image.Image], caption:str, width:float=7.0):
+    def add_figure(self, image_path:Union[str, Path, Image.Image, Figure], caption:str, width:float=7.0):
         """ Ajoute une figure au document avec une légende. """
 
         if caption:
@@ -289,6 +306,11 @@ class RapidReport:
         """ Ajoute une nouvelle page au document. """
 
         self._content.append(('newpage', '', None))
+
+    def _insert_new_page(self, index:int = 0):
+        """ Insère une nouvelle page au document. """
+
+        self._content.insert(index, ('newpage', '', None))
     
     def add_table_from_listoflists(self, data:List[List[str]], style:str='TableGrid'):
         """ 
@@ -353,6 +375,10 @@ class RapidReport:
     def _apply_text_styles(self, paragraph, text):
         """ Search for bold and italic styles in the text and apply them."""
 
+        text = text.replace('\n\n', 'DOUBLE_NEWLINE')
+        text = text.replace('\n', ' ')
+        text = text.replace('DOUBLE_NEWLINE', '\n')
+
         def split_bold(text):
             return text.split('**')
         
@@ -408,6 +434,11 @@ class RapidReport:
                 elif isinstance(item[1], Path):
                     tmp_name = str(item[1])
 
+                elif isinstance(item[1], Figure):
+                    item[1].tight_layout()
+                    tmp_name = NamedTemporaryFile(suffix='.png').name
+                    item[1].savefig(tmp_name)
+
                 if Path(tmp_name).exists():
                     self._document.add_picture(tmp_name, width=Inches(item[3]) if item[3] else Inches(7.0))
                     self._document.paragraphs[-1].style = 'FigureStyle'
@@ -444,6 +475,12 @@ class RapidReport:
 
         if file_path is None:
             raise ValueError("Le chemin du fichier n'a pas été spécifié.")
+        
+        self._document = Document()
+        
+        self._define_default_styles()
+
+        self.fill_first_page(self._main_title, self._author)
 
         self.parse_content()
         try:

{wolfhece-2.1.9.dist-info → wolfhece-2.1.10.dist-info}/METADATA

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

{wolfhece-2.1.9.dist-info → wolfhece-2.1.10.dist-info}/RECORD

@@ -6,12 +6,12 @@ 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=WJDGhaD7N6udY5WUynS9f-26FQ6Uj0bJZFM2gxkzuWU,378354
+wolfhece/PyDraw.py,sha256=eYv0X1NFCWlgOgiRaIjW0SPlR_uVLdZhFpztY1jX6Lo,378408
 wolfhece/PyGui.py,sha256=VKE785z9XLIWNbxqpyEceLK_wtmPJyq6A_M_qX_94Lg,104772
 wolfhece/PyGuiHydrology.py,sha256=wKhR-KthPRyzJ887NmsozmUpm2CIQIwO3IbYORCYjrE,7290
 wolfhece/PyHydrographs.py,sha256=GKK8U0byI45H9O_e4LAOOi7Aw0Tg7Q0Lx322stPg5IQ,3453
 wolfhece/PyPalette.py,sha256=_Nm2Lc4UxYlZgK8ifZDioG8a0at8oiteYC0x_4XugFc,24384
-wolfhece/PyParams.py,sha256=963fkDSEadlLLxe7WM4Nl6nLOeZsOWSFmfg7hIsWPU4,96785
+wolfhece/PyParams.py,sha256=xUmtwna4rhTCqa3-fpq7bG5pxMpoa4PFRi5hEjxOxPw,96868
 wolfhece/PyPictures.py,sha256=-mJB0JL2YYiEK3D7_ssDkvYiMWK4ve9kXhozQXNeSx8,2216
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=dHTjyYYTn0F_NWerlAOBKHV79RUzEEtMJMldQtVc1Cs,40092
@@ -34,7 +34,7 @@ wolfhece/import_ascfiles.py,sha256=jg4urcLdSgFS1Knvh7AVGJqM44qc_uYDNrR568tMh-A,4
 wolfhece/ins.py,sha256=0aU1mo4tYbw64Gwzrqbh-NCTH1tukmk0mpPHjRPHZXU,12661
 wolfhece/irm_qdf.py,sha256=749SlAXiN1oXp5tfBJoPNJWxydQlY55K0qvIM5YexlM,15436
 wolfhece/ismember.py,sha256=fkLvaH9fhx-p0QrlEzqa6ySO-ios3ysjAgXVXzLgSpY,2482
-wolfhece/multiprojects.py,sha256=tHrAdOBoEEsuNS8hV7udbvduOZLj_NqF3ee5hSDBhN8,20903
+wolfhece/multiprojects.py,sha256=K40kM09xNkQSjiwANTsA4CpaW7KEkawpBkpoiehk9yo,21251
 wolfhece/picc.py,sha256=KKPNk1BEe7QBzo2icIsdsxUopJ1LXYTomfdfeG2gCeA,7419
 wolfhece/pyGui1D.py,sha256=pzLWXQ_w3Y_yI846w1GklFO9h5lWZOqiUzg1BUPkuRI,121616
 wolfhece/pybridges.py,sha256=4PRSsWngDmQnlVuN2tJj0C_HT1h47ExH9QTUPs_Wxlg,57215
@@ -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=LkEVMK0eCc84NeCWD3CGja7fuQ_k1PrZdyqD3GQk_8c,2118
-wolfhece/apps/version.py,sha256=FOnRXwi0LTd0u8m3r5Ap-8eX-pLzJQIG3E9iImOCttA,387
+wolfhece/apps/version.py,sha256=p7F6qFk_CdXhKrAOXaQdIRVqeFmOEFL0SsGEAojsQgo,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
@@ -242,7 +242,7 @@ wolfhece/rem/REMMaker.py,sha256=kffClHHpf8P4ruZpEb9EB__HBzg9rFAkiVCh-GFtIHU,3079
 wolfhece/rem/RasterViz.py,sha256=TDhWyMppcYBL71HfhpZuMgYKhz7faZg-MEOQJo_3Ivo,29128
 wolfhece/rem/__init__.py,sha256=S2-J5uEGK_VaMFjRUYFIdSScJjZyuXH4RmMmnG3OG7I,19
 wolfhece/report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wolfhece/report/reporting.py,sha256=ptsObq4hrVc1b_cfu2ISL6oesSsBphk03QtFnr8E9hc,17565
+wolfhece/report/reporting.py,sha256=LrOUI7j1vPefsGhqag1f2KpKRXR-5cH7SyGIsf6nOG0,19196
 wolfhece/report/wolf_report.png,sha256=NoSV58LSwb-oxCcZScRiJno-kxDwRdm_bK-fiMsKJdA,592485
 wolfhece/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 wolfhece/scenario/check_scenario.py,sha256=nFiCscEGHyz1YvjmZoKlYrfmW03-nLiDTDdRoeE6MUs,4619
@@ -267,8 +267,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.1.9.dist-info/METADATA,sha256=kTZzCdCRgXrjJ2HsS_7YS8fXP8zYlxvXNigdrYepDqg,2281
-wolfhece-2.1.9.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-wolfhece-2.1.9.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
-wolfhece-2.1.9.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.1.9.dist-info/RECORD,,
+wolfhece-2.1.10.dist-info/METADATA,sha256=Zzg2Nmd6IpZTLHVQohBtHfLxq6TwzEOzad-ue6QTJJk,2282
+wolfhece-2.1.10.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
+wolfhece-2.1.10.dist-info/entry_points.txt,sha256=AIu1KMswrdsqNq_2jPtrRIU4tLjuTnj2dCY-pxIlshw,276
+wolfhece-2.1.10.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.1.10.dist-info/RECORD,,