wolfhece 2.2.34__py3-none-any.whl → 2.2.35__py3-none-any.whl

wolfhece/wolf_zi_db.py

@@ -91,6 +91,16 @@ class ColNames_Enquetes(Enum):
     ORIENTATION = 'Orientation'
     DATE = 'Date'
 
+class ColNames_Profils(Enum):
+    """ Enum for the column names in the database """
+
+    KEY   = 'Clé primaire'
+    X = 'XLambert'
+    Y = 'YLambert'
+    PHOTO = 'FichierImage'
+    RIVER   = 'Rivière'
+    DATE = 'DateModif'
+
 def _test_bounds(x:float, y:float, bounds:list[list[float, float], list[float, float]]) -> bool:
     """ Test if the coordinates are inside the bounds
 
@@ -472,6 +482,16 @@ class Ouvrages(PictureCollection):
     def check_plot(self):
         """ Activate the plot if the object is initialized """
 
+        if self.initialized:
+            # Ask if the user wants to reload the database
+            if self.wx_exists:
+                dlg = wx.MessageDialog(None, _("Do you want to reload the database?"), _("Reload Database"),
+                                       wx.YES_NO | wx.ICON_QUESTION)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_YES:
+                    self.initialized = False
+                dlg.Destroy()
+
         if not self.initialized:
 
             # try to get the filename from the parent mapviewer
@@ -487,6 +507,8 @@ class Ouvrages(PictureCollection):
                 self.read_db(self.filename, sel_rivers=self.rivers, sheet_name='Photos', bounds=bounds)
             elif 'features' in self.idx.lower() or 'particularit' in self.idx.lower():
                 self.read_db(self.filename, sel_rivers=self.rivers, sheet_name='Particularités', bounds=bounds)
+            elif 'cross' in self.idx.lower() or 'section' in self.idx.lower():
+                self.read_db(self.filename, sel_rivers=self.rivers, sheet_name='Sections transversales scannées', bounds=bounds)
 
         if self.initialized:
             super().check_plot()
@@ -932,4 +954,137 @@ class Enquetes(Ouvrages):
             pic.myprop.legendlength = 100
 
 
+        self.find_minmax(True)
+
+class Profils(Ouvrages):
+    """ Class to handle the "Profils en travers" -- Pictures of the corss-sections in the ZI. """
+
+    def __init__(self, parent=None, idx = '', plotted = True, mapviewer=None, rivers = None):
+        super().__init__(parent = parent, idx = idx, plotted = plotted, mapviewer = mapviewer, rivers = rivers)
+
+        self._columns = ColNames_Profils
+
+    def read_db(self, filename:str | Path,
+                sel_rivers: list[str] = None,
+                sheet_name: str = 'Sections transversales scannées',
+                bounds: list[list[float, float], list[float, float]] = None):
+        """ Read the database (Excel file) and create the zones and the vectors.
+
+        The user will be prompted to select the rivers to display.
+
+        :param filename: The path to the Excel file containing the database
+        :type filename: str | Path
+        :param sel_rivers: The list of rivers to display, if None, the user will be prompted to select the rivers
+        :type sel_rivers: list[str] | None
+        :param sheet_name: The name of the sheet in the Excel file to read
+        :type sheet_name: str
+        :param bounds: The bounds of the area to display, if None, no test on coordinates will be done - [ [xmin, xmax], [ymin, ymax] ]
+        :type bounds: list[list[float, float], list[float, float]] |
+        """
+
+        self.filename = Path(filename)
+
+        if not self.filename.exists() or filename == '':
+
+            if self.wx_exists:
+
+                dlg= wx.FileDialog(None, _("Choose a file"), defaultDir= "", wildcard="Excel (*.xlsx)|*.xlsx", style = wx.FD_OPEN)
+                ret = dlg.ShowModal()
+                if ret == wx.ID_OK:
+                    self.filename = Path(dlg.GetPath())
+                    dlg.Destroy()
+                else:
+                    logging.error('No file selected')
+                    dlg.Destroy()
+                    return
+
+            else:
+                logging.error('No file selected or the file does not exist.')
+                return
+
+        try:
+            logging.info(f'Reading database from {self.filename}')
+            self.db = pd.read_excel(self.filename, sheet_name=sheet_name)
+            logging.info(f'Database read successfully from {self.filename}')
+        except ValueError as e:
+            logging.error(f"Error reading the Excel file: {e}")
+            return
+
+        rivers = list(self.db[ColNames_Profils.RIVER.value].unique())
+        rivers.sort()
+
+        self.rivers = []
+
+        if sel_rivers is None and self.wx_exists:
+
+            with wx.MessageDialog(None, _("Choose the rivers to display"), _("Rivers"), wx.YES_NO | wx.ICON_QUESTION) as dlg:
+
+                if dlg.ShowModal() == wx.ID_YES:
+
+                    with wx.MultiChoiceDialog(None, _("Choose the rivers to display"), _("Rivers"), rivers) as dlg_river:
+                        ret = dlg_river.ShowModal()
+
+                        if ret == wx.ID_OK:
+                            for curidx in dlg_river.GetSelections():
+                                self.rivers.append(rivers[curidx])
+                else:
+                    self.rivers = rivers
+
+        elif sel_rivers is not None:
+
+            for curruver in sel_rivers:
+                if curruver in rivers:
+                    self.rivers.append(curruver)
+                else:
+                    logging.error(f'River {curruver} not found in the database -- Ignoring !')
+
+        self._filter_db(bounds)
+
+        self.initialized = True
+
+    def _filter_db(self, bounds: list[list[float, float], list[float, float]] = None):
+        """ Filter the database based on the selected rivers and bounds.
+
+        :param bounds: The bounds of the area to display, if None, no test on coordinates will be done - [ [xmin, xmax], [ymin, ymax] ]
+        :type bounds: list[list[float, float], list[float, float]] |
+        """
+
+        if len(self.rivers) == 0:
+            locdb = self.db
+        else:
+            locdb = self.db[self.db[ColNames_Profils.RIVER.value].isin(self.rivers)]
+
+        for id, curline in tqdm(locdb.iterrows()):
+            river = curline[ColNames_Profils.RIVER.value]
+
+            fullpath = curline[ColNames_Profils.PHOTO.value]
+
+            fullpath = fullpath.replace(r'\\192.168.2.185\Intranet\Data\Données et Photos de crues\Données Profils',
+                                        str(self.filename.parent) + r'\Profils')
+            fullpath = Path(fullpath)
+
+            if not fullpath.exists():
+                logging.debug(f'File {fullpath} does not exist')
+                continue
+
+            x = curline[ColNames_Profils.X.value]
+            y = curline[ColNames_Profils.Y.value]
+
+            if bounds is not None and not _test_bounds(x, y, bounds):
+                logging.info(f'Coordinates are out of bounds -- Skipping line {id}')
+                continue
+
+            keyzone = river.strip()
+
+            picture = fullpath
+            self.add_picture(picture, x=x, y=y, name=picture.stem, keyzone=keyzone)
+
+            pic = self[(keyzone, picture.stem)]
+            pic.myprop.legendtext = _sanitize_legendtext(curline[ColNames_Profils.DATE.value])
+            pic.myprop.legendx = pic.centroid.x
+            pic.myprop.legendy = pic.centroid.y
+            pic.myprop.legendpriority = Font_Priority.WIDTH
+            pic.myprop.legendlength = 100
+
+
         self.find_minmax(True)

{wolfhece-2.2.34.dist-info → wolfhece-2.2.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wolfhece
-Version: 2.2.34
+Version: 2.2.35
 Author-email: Pierre Archambeau <pierre.archambeau@uliege.be>
 Project-URL: Homepage, https://uee.uliege.be/hece
 Project-URL: Issues, https://uee.uliege.be/hece

{wolfhece-2.2.34.dist-info → wolfhece-2.2.35.dist-info}/RECORD

@@ -7,9 +7,9 @@ wolfhece/ManageParams.py,sha256=EeuUI5Vvh9ixCvYf8YShMC1s1Yacc7OxOCN7q81gqiQ,517
 wolfhece/Model1D.py,sha256=snEmu8Uj2YGcp1ybPnly-4A389XRnuOujGduqInNcgw,477001
 wolfhece/PandasGrid.py,sha256=YIleVkUkoP2MjtQBZ9Xgwk61zbgMj4Pmjj-clVTfPRs,2353
 wolfhece/PyConfig.py,sha256=13DDWjJdohYHwn1uRVHB0s8Jcwq_b9pwcwbAr8NlZyc,19667
-wolfhece/PyCrosssections.py,sha256=iSmuQ1753bWxRLgOkrRLPd3tiMwGRCvfKD2Mim26_8c,114836
-wolfhece/PyDraw.py,sha256=TVLcgtHbUnzk3-1WyTsRaW1y1M6FESIOXmjwPcwUwUg,687236
-wolfhece/PyGui.py,sha256=fTUlGmUXU17IuZXW41stCWUjhpIRrqg4pXVVBXP8qb8,148120
+wolfhece/PyCrosssections.py,sha256=2m372NSriH41AcIk723y2i44mwUXodbIMIzqkuVMjUY,127365
+wolfhece/PyDraw.py,sha256=yE3Cdhnr74yLnZBRN6vBu0xk3KXfg8Z5SA1P3jzORpM,688239
+wolfhece/PyGui.py,sha256=mcLuHT_pGjW1ltJ-kjNFstVXyeBoZRCvM3vHWv5srB8,148594
 wolfhece/PyGuiHydrology.py,sha256=sKafpOopBg50L5llZCI_fZtbebVTDtxvoRI6-osUwhg,14745
 wolfhece/PyHydrographs.py,sha256=1P5XAURNqCvtSsMQXhOn1ihjTpr725sRsZdlCEhhk6M,3730
 wolfhece/PyPalette.py,sha256=SiRngKml2EXsq1jwQvqh5pBZiV1yS0CY7QrRJGSZD1s,36281
@@ -17,16 +17,16 @@ wolfhece/PyParams.py,sha256=BgTAwxxq831rYEq_KLcFBX_upjiSUpVtfoQnCxCNWUI,100443
 wolfhece/PyPictures.py,sha256=5X2HBkZG1gTaMKMu6UoU-cOY8SRkFyPScJ8bhdoNY7g,18930
 wolfhece/PyTranslate.py,sha256=4appkmNeHHZLFmUtaA_k5_5QL-5ymxnbVN4R2OblmtE,622
 wolfhece/PyVertex.py,sha256=a56oY1NB45QnwARg96Tbnq-z-mhZKFkYOkFOO1lNtlk,51056
-wolfhece/PyVertexvectors.py,sha256=1rkngPLIsqzQAtAffuV90hWYSo2HfTUmZLy6-xXYrY8,359258
+wolfhece/PyVertexvectors.py,sha256=EBZLC54-xAyzofcru4lvdUy0uoZ7pltpZpmyJwtYM34,359259
 wolfhece/PyWMS.py,sha256=XcSlav5icct2UwV7K2r7vpxa5rKZWiHkp732lI94HFI,31534
 wolfhece/RatingCurve.py,sha256=bUjIrQjvIjkD4V-z8bZmA6pe1ILtYNM0-3fT6YUY1RU,22498
 wolfhece/RatingCurveData.py,sha256=5UvnIm89BwqjnEbLCcY3CA8WoFd_xHJbooNy62fX5iY,57660
 wolfhece/RatingCurve_xml.py,sha256=cUjReVMHFKtakA2wVey5zz6lCgHlSr72y7ZfswZDvTM,33891
 wolfhece/ReadDataDCENN.py,sha256=vm-I4YMryvRldjXTvRYEUCxZsjb_tM7U9yj6OaPyD0k,1538
 wolfhece/Results2DGPU.py,sha256=ljMEKHGMbmIAZE6UmMmYDMFqFAwjzxxVUmZdHHb6aME,32106
-wolfhece/__init__.py,sha256=EnpZ2yDEXueP7GAKV0uA2vAwMiZFyBjDAFcL5Y7LzbM,1850
+wolfhece/__init__.py,sha256=bh5zzt90fGJcc97d0DiuZsV9VxwBEy9HUBfexHmQDJk,1978
 wolfhece/_add_path.py,sha256=mAyu85CQHk0KgUI6ZizweeQiw1Gdyea9OEjGLC6lLA4,916
-wolfhece/analyze_poly.py,sha256=2uNdnRy828jR-aFNg9fx-8aHqXuRAg-hNQpvQ3g2qL8,60837
+wolfhece/analyze_poly.py,sha256=0eelAVQPsNM1PpDbdoNN2rXrZh1wyFkhsbHdGAm7p-k,60849
 wolfhece/analyze_vect.py,sha256=3lkMwaQ4KRddBVRvlP9PcM66wZwwC0eCmypP91AW-os,6015
 wolfhece/cli.py,sha256=h1tSMHALiftktreyugKcjbASXfpJUm9UYMeVxR-MtG4,6424
 wolfhece/color_constants.py,sha256=Snc5RX11Ydi756EkBp_83C7DiAQ_Z1aHD9jFIBsosAU,37121
@@ -61,12 +61,12 @@ wolfhece/rain_SPWMI.py,sha256=qCfcmF7LajloOaCwnTrrSMzyME03YyilmRUOqrPrv3U,13846
 wolfhece/textpillow.py,sha256=7hgfsLYAaE_rNKD-g8xsON8sdWvoV8vbqnGGxIayShE,14137
 wolfhece/tools2d_dll.py,sha256=TfvvmyZUqEZIH0uHwUCJf0bdmCks_AiidDt23Unsp5w,13550
 wolfhece/tools_mpl.py,sha256=gQ3Jg1iuZiecmMqa5Eli2ZLSkttu68VXL8YmMDBaEYU,564
-wolfhece/wolf_array.py,sha256=_di7NkNjiaKAO5FLqUgxr8XFoAdnOC5B-oLMpf_g270,526959
+wolfhece/wolf_array.py,sha256=8f1cVLe5kTAlFfsWbpNXJXS04FXK0kVxT-YCbvkD2Ow,572989
 wolfhece/wolf_hist.py,sha256=fTEb60Q4TEwobdZsRU4CFXAId1eOKdWAqF8lnF1xEWc,3590
 wolfhece/wolf_texture.py,sha256=Pt1j_lX74p70Fj3y3qYxYMuN8gghVd8_ih1vFhTIdkA,23884
 wolfhece/wolf_tiles.py,sha256=v-HohqaWuMYdn75XLnA22dlloAG90iwnIqrgnB0ASQ4,10488
 wolfhece/wolf_vrt.py,sha256=wbxXVN7TL9zgdyF79S-4e3pje6wJEAgBEfF_Y8kkzxs,14271
-wolfhece/wolf_zi_db.py,sha256=gK6kJCOlBNYSfxp_DTZ2bz08sglOGTKI3TtF5PD6YJI,36023
+wolfhece/wolf_zi_db.py,sha256=kz1TofsPfuBQqwYEM32wZl4b-jqgAygorZSm2JnGJ_k,42450
 wolfhece/wolfresults_2D.py,sha256=0c3akPDFETE0Uq0JiZ0FZEx6Rxiy9JB5s9P6sDei0E0,245735
 wolfhece/xyz_file.py,sha256=1pzLFmmdHca4yBVR9Jitic6N82rY28mRytGC1zMbY28,6615
 wolfhece/acceptability/Parallels.py,sha256=2wVkfJYor4yl7VYiAZiGGTFwtAab2z66ZfRtBliVweE,4088
@@ -89,7 +89,7 @@ wolfhece/apps/curvedigitizer.py,sha256=lEJJwgAfulrrWQc-U6ij6sj59hWN3SZl4Yu1kQxVz
 wolfhece/apps/hydrometry.py,sha256=lhhJsFeb4zGL4bNQTs0co85OQ_6ssL1Oy0OUJCzhfYE,656
 wolfhece/apps/isocurrent.py,sha256=dagmGR8ja9QQ1gwz_8fU-N052hIw-W0mWGVkzLu6C7I,4247
 wolfhece/apps/splashscreen.py,sha256=EdGDN9NhudIiP7c3gVqj7dp4MWFB8ySizM_tpMnsgpE,3091
-wolfhece/apps/version.py,sha256=lkNimxgbA61nLFsEXYXIm7u-sNgE6Tu5jG4zGrfxLL4,388
+wolfhece/apps/version.py,sha256=egkJ-CI7PXqeLr957LgGxoLyrnz1dwvZQWu9BxkrZFY,388
 wolfhece/apps/wolf.py,sha256=mRnjYsUu4KIsRuamdQWAINFMuwN4eJgMo9erG-hkZ70,729
 wolfhece/apps/wolf2D.py,sha256=4z_OPQ3IgaLtjexjMKX9ppvqEYyjFLt1hcfFABy3-jU,703
 wolfhece/apps/wolf_logo.bmp,sha256=ruJ4MA51CpGO_AYUp_dB4SWKHelvhOvd7Q8NrVOjDJk,3126
@@ -308,8 +308,8 @@ wolfhece/ui/wolf_multiselection_collapsiblepane.py,sha256=u4C7CXe_bUyGKx7c_Bi0x9
 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.2.34.dist-info/METADATA,sha256=dwSE06Hid1yIO9zqFqMbncDkRO7j6o2uimenQkGngvo,2729
-wolfhece-2.2.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wolfhece-2.2.34.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
-wolfhece-2.2.34.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
-wolfhece-2.2.34.dist-info/RECORD,,
+wolfhece-2.2.35.dist-info/METADATA,sha256=IlErgq8aClLEVML_ZDE1ViHY0wmA9LKENombtKwN2U4,2729
+wolfhece-2.2.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wolfhece-2.2.35.dist-info/entry_points.txt,sha256=Jr187pyvA3EeJiQLjZK9yo6mJX7IAn6ygZU9T8qF_gQ,658
+wolfhece-2.2.35.dist-info/top_level.txt,sha256=EfqZXMVCn7eILUzx9xsEu2oBbSo9liWPFWjIHik0iCI,9
+wolfhece-2.2.35.dist-info/RECORD,,