wolfhece 2.0.44__py3-none-any.whl → 2.0.45__py3-none-any.whl

wolfhece/GraphProfile.py

@@ -48,6 +48,7 @@ class ProfilePanel(wx.Panel):
         self.ax_hsw= None
 
         self.add_ax()
+        # self.Layout()
 
         if self.wx_exists:
             # impossible to initialize wx.Panel if wx.App is not running
@@ -57,12 +58,14 @@ class ProfilePanel(wx.Panel):
             self.canvas.ClearBackground()
 
             #Sizers
-            self.sizerfig = wx.BoxSizer(wx.VERTICAL)
             self.sizer = wx.BoxSizer(wx.VERTICAL)
+            self.sizerfig = wx.BoxSizer(wx.HORIZONTAL)
+
 
             self.sizerfig.Add(self.canvas, 1, wx.EXPAND) #wx.EXPAND expands the given object proportions in case the windows is resized.
             self.sizer.Add(self.sizerfig, 7, wx.EXPAND)
 
+
             self.SetSizer(self.sizer)
 
     def add_ax(self):                                                   #Just in case a 3D projection is implemented
@@ -90,6 +93,8 @@ class ProfilePanel(wx.Panel):
         """
         return self.figure, self.ax_cs_real, self.ax_cs_anam, self.ax_img, self.ax_dis, self.ax_hsw
 
+
+
 # class for plotting all figures at once
 class PlotCSAll(ProfilePanel):
     """
@@ -128,6 +133,7 @@ class PlotCSAll(ProfilePanel):
 
         self.reset_models()
         self.init_UI()
+        # self.Layout()
 
     def init_UI(self):
         """
@@ -406,6 +412,7 @@ class PlotCSAll(ProfilePanel):
         self.toolbar = NavigationToolbar(self.canvas)           #Ajout d'une barre d'outils pour la figure courante
         self.toolbar.Realize()
         self.sizer.Add(self.toolbar,0.9, wx.ALIGN_CENTER)
+        self.SetAutoLayout(True)
 
     # Functions
     def set_cs(self, my_profile:profile=None, vec: list[vector] = [], Manning=0.04, plot=True) -> None:
@@ -418,9 +425,9 @@ class PlotCSAll(ProfilePanel):
             return # Nothing to do
 
         if self.mycs is not None:
-            self.mycs.uncolor_active_profile()
+            self.mycs.uncolor_active_profile(plot_opengl= False)
 
-        my_profile.color_active_profile()
+        my_profile.color_active_profile(plot_opengl= False)
 
         #Initialisation and reinitialisation of the plot parameters
         self.mycs = my_profile
@@ -536,31 +543,34 @@ class PlotCSAll(ProfilePanel):
 
             ax3 = self.ax_img
             fig = self.figure
-            self.mapviewer.set_active_profile(self.mycs)   #We set the active profile in wolfhece.pydraw
+            # self.mapviewer.set_active_profile(self.mycs)   #We set the active profile in wolfhece.pydraw
             self.mapviewer.set_active_vector(self.mycs)    #To avoid visual confusions, we set the profile as the active vector in wolfhece.pydraw
-            self.mycs.color_active_profile()        #we thicken and color the profile in red.
+            self.mycs.color_active_profile(plot_opengl= True)        #we thicken and color the profile in red.
             size = 200
             self.mapviewer.zoomon_active_profile(size=size)    #We zoom on the profile in the gui.
             self.mapviewer.Paint()                             #We take the visual information in the GUI necessary for a screen shot.
             self.mapviewer.display_canvasogl(fig= fig, ax = ax3) #We return a clear screen shot of the wolfpy GUI as a matplolib graph (ax).
         else:
-            self.mycs.color_active_profile()
+            self.mycs.color_active_profile(plot_opengl= False)
 
             bounds = self.mycs.get_bounds(100.)
 
             """
+            FIXME find a way to better iterate over the different orthophotos
             orthos = {'IMAGERIE': {'1971': 'ORTHO_1971', '1994-2000': 'ORTHO_1994_2000',
                                 '2006-2007': 'ORTHO_2006_2007',
                                 '2009-2010': 'ORTHO_2009_2010',
                                 '2012-2013': 'ORTHO_2012_2013',
                                 '2015': 'ORTHO_2015', '2016': 'ORTHO_2016', '2017': 'ORTHO_2017',
                                 '2018': 'ORTHO_2018', '2019': 'ORTHO_2019', '2020': 'ORTHO_2020',
-                                '2021': 'ORTHO_2021'}}
+                                '2021': 'ORTHO_2021', '2022 printemps': 'ORTHO_2022_PRINTEMPS', '2022 été': 'ORTHO_2022_ETE',
+                               '2023 été': 'ORTHO_2023_ETE'}}
             """
 
             try:
-                mybytes = getWalonmap(cat='IMAGERIE/ORTHO_2021',xl = bounds[0][0], yl = bounds[0][1], xr = bounds[1][0], yr = bounds[1][1], w=500, h=500, tofile=False)
+                mybytes = getWalonmap(cat='IMAGERIE/ORTHO_2022_PRINTEMPS',xl = bounds[0][0], yl = bounds[0][1], xr = bounds[1][0], yr = bounds[1][1], w=500, h=500, tofile=False)
                 image = Image.open(mybytes)
+                self.ax_img.clear()
                 self.ax_img.imshow(image, origin='upper', extent=(bounds[0][0],bounds[1][0],bounds[0][1],bounds[1][1]))
                 self.ax_img.plot([self.mycs.myvertices[0].x, self.mycs.myvertices[-1].x], [self.mycs.myvertices[0].y, self.mycs.myvertices[-1].y], c='red', linewidth=3)
             except:
@@ -1099,7 +1109,7 @@ class PlotCSAll(ProfilePanel):
         if self.mycs.up is None:
             return
 
-        self.mycs.uncolor_active_profile()
+        self.mycs.uncolor_active_profile(plot_opengl= False)
         self.set_cs(self.mycs.up)
         self.plot_cs()
 
@@ -1110,7 +1120,7 @@ class PlotCSAll(ProfilePanel):
         if self.mycs.down is None:
             return
 
-        self.mycs.uncolor_active_profile()
+        self.mycs.uncolor_active_profile(plot_opengl= False)
         self.set_cs(self.mycs.down)
         self.plot_cs()
 
@@ -1126,6 +1136,7 @@ class PlotCSAll(ProfilePanel):
         """
         This method displays on the profile and on the discharge graphs, the hydraulic characteristics in the numerical simulations.
         Also, it triggers a new window containing a table (grid) of the displayed values.
+        FIXME add a plot method for 2D and 1D results.
         """
         # Data from numerical simulations
 
@@ -1678,13 +1689,15 @@ class ProfileWithoutGUI():
     Useful for scripts commands (an example is provide in )
     """
     def __init__(self,  fcrossection ='', fsupport= '', format='') :
-        self.app=wx.App()
 
+        self.cross = crosssections(fcrossection, format) #Crossection data
+        self.myvec = Zones(fsupport)                   #Vector data
+
+        self.app=wx.App()
         self.curprofile : profile
         self.plotter = ProfileNotebook()
         self.plotter.add('Figure 1') # .figure.add_subplot()
-        self.cross = crosssections(fcrossection, format) #Crossection data
-        self.myvec = Zones(fsupport)                   #Vector data
+
 
         if fsupport != '':
             self.cross.sort_along(self.myvec.myzones[0].myvectors[0].asshapely_ls(),'vesdre')