wolfhece 2.2.38__py3-none-any.whl → 2.2.39__py3-none-any.whl

wolfhece/Coordinates_operations.py

@@ -151,6 +151,11 @@ def reproject_and_resample_raster(input_raster_path:str, output_raster_path:str,
     # Transform the origin and the limits into the new projection 'Lambert 72'
     Orig_out = transform_coordinates(Orig, inputEPSG=input_srs, outputEPSG=output_srs)
 
+    if xRes is None or xRes <= 0:
+        xRes = xres
+    if yRes is None or yRes <= 0:
+        yRes = yres
+
     # Round each coordinate to the nearest multiple of the wanted resolution
     Orig_out[:,0] = np.round(Orig_out[:,0]/xRes)*xRes
     Orig_out[:,1] = np.round(Orig_out[:,1]/yRes)*yRes

wolfhece/GraphNotebook.py

@@ -130,6 +130,10 @@ class PlotCS(PlotPanel):
             curs=5000
             self.slidergenhor = wx.Slider(self, wx.ID_ANY, curs, 0, 10000, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL,name='sliderhor' )
             self.slidergenver = wx.Slider(self, wx.ID_ANY, curs, 0, 10000, wx.DefaultPosition, wx.DefaultSize, wx.SL_VERTICAL,name='sliderver' )
+
+            self.slidergenhor.SetToolTip(_("To shift Horizontal position of the section"))
+            self.slidergenver.SetToolTip(_("To shift Vertical position of the section"))
+
             self.sizer.Add(self.slidergenhor,0,wx.EXPAND)
             self.sizerfig.Add(self.slidergenver,0,wx.EXPAND)
 
@@ -140,6 +144,10 @@ class PlotCS(PlotPanel):
             curs = 0
             self.sliderleft = wx.Slider(self, wx.ID_ANY, curs, 0, 10000, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL,name='sliderleft' )
             self.txtleft = wx.TextCtrl( self, wx.ID_ANY, str(curs), wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER|wx.TE_PROCESS_ENTER,name='textleft' )
+
+            self.sliderleft.SetToolTip(_("To shift Left bank position of the section"))
+            self.txtleft.SetToolTip(_("Curvilinear left bank position of the section [m]"))
+
             self.sizerslider1.Add( self.sliderleft, 1, wx.EXPAND)
             self.sizerslider1.Add( self.txtleft, 0, wx.EXPAND)
             self.sizerposbank.Add(self.sizerslider1,1,wx.EXPAND)
@@ -148,6 +156,10 @@ class PlotCS(PlotPanel):
             curs = 0
             self.sliderbed = wx.Slider(self, wx.ID_ANY, curs, 0, 10000, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL,name='sliderbed' )
             self.txtbed = wx.TextCtrl( self, wx.ID_ANY, str(curs), wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER|wx.TE_PROCESS_ENTER,name='textbed' )
+
+            self.sliderbed.SetToolTip(_("To shift Bed position of the section"))
+            self.txtbed.SetToolTip(_("Curvilinear bed position of the section [m]"))
+
             self.sizerslider2.Add( self.sliderbed, 1, wx.EXPAND)
             self.sizerslider2.Add( self.txtbed, 0, wx.EXPAND)
             self.sizerposbank.Add(self.sizerslider2, 1, wx.EXPAND)
@@ -156,13 +168,30 @@ class PlotCS(PlotPanel):
             curs = 0
             self.sliderright = wx.Slider(self, wx.ID_ANY, curs, 0, 10000, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL,name='sliderright' )
             self.txtright = wx.TextCtrl( self, wx.ID_ANY, str(curs), wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER|wx.TE_PROCESS_ENTER,name='textright' )
+
+            self.sliderright.SetToolTip(_("To shift Right bank position of the section"))
+            self.txtright.SetToolTip(_("Curvilinear right bank position of the section [m]"))
+
             self.sizerslider3.Add( self.sliderright, 1, wx.EXPAND)
             self.sizerslider3.Add( self.txtright, 0, wx.EXPAND)
             self.sizerposbank.Add(self.sizerslider3, 1, wx.EXPAND)
 
+            self._sizer_shift_general = wx.BoxSizer(wx.HORIZONTAL)
+            self._txt_zdatum = wx.TextCtrl(self, wx.ID_ANY, str(0), wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER|wx.TE_PROCESS_ENTER,name='textzdatum' )
+            self._txt_zdatum.SetToolTip(_("Vertical shifting position of the section [m]"))
+            self._txt_sdatum = wx.TextCtrl(self, wx.ID_ANY, str(0), wx.DefaultPosition, wx.DefaultSize, style=wx.TE_CENTER|wx.TE_PROCESS_ENTER,name='textsdatum' )
+            self._txt_sdatum.SetToolTip(_("Horizontal shifting position of the section [m]"))
+
+            self._sizer_shift_general.Add(self._txt_sdatum, 1, wx.EXPAND)
+            self._sizer_shift_general.Add(self._txt_zdatum, 1, wx.EXPAND)
+
+            self.sizer.Add(self._sizer_shift_general, 0, wx.EXPAND)
+
             self.txtbed.Bind(wx.EVT_TEXT_ENTER,self.movebanksslider)
             self.txtleft.Bind(wx.EVT_TEXT_ENTER,self.movebanksslider)
             self.txtright.Bind(wx.EVT_TEXT_ENTER,self.movebanksslider)
+            self._txt_zdatum.Bind(wx.EVT_TEXT_ENTER,self.movegenslider)
+            self._txt_sdatum.Bind(wx.EVT_TEXT_ENTER,self.movegenslider)
 
             self.sliderleft.Bind(wx.EVT_SLIDER,self.movebanksslider)
             self.sliderbed.Bind(wx.EVT_SLIDER,self.movebanksslider)
@@ -190,7 +219,7 @@ class PlotCS(PlotPanel):
 
         if self.wx_exists:
 
-            sl,sb,sr,yl,yb,yr = self.mycs.get_sz_banksbed()
+            sl,sb,sr,yl,yb,yr, sld,srd,yld,yrd = self.mycs.get_sz_banksbed()
             length = self.mycs.length3D
 
             if self.mycs.bankleft is not None:
@@ -214,6 +243,16 @@ class PlotCS(PlotPanel):
                 self.sliderright.SetValue(10000)
                 self.txtright.SetLabelText(str(self.mycs.length3D))
 
+            if self.mycs.add_zdatum:
+                self._txt_zdatum.SetValue(str(self.mycs.zdatum))
+            else:
+                self._txt_zdatum.SetValue(str(0))
+
+            if self.mycs.add_sdatum:
+                self._txt_sdatum.SetValue(str(self.mycs.sdatum*10000./self.mycs.length3D))
+            else:
+                self._txt_sdatum.SetValue(str(0))
+
         if plot:
             self.plot_cs()
 
@@ -228,9 +267,35 @@ class PlotCS(PlotPanel):
         if id=='sliderhor':
             cs.sdatum = float(self.slidergenhor.Value-5000)/10000.*length
             cs.add_sdatum=True
+            self._txt_sdatum.SetValue(str(cs.sdatum))
+
         elif id=='sliderver':
             cs.zdatum = -float(self.slidergenver.Value-5000)/1000.
             cs.add_zdatum=True
+            self._txt_zdatum.SetValue(str(cs.zdatum))
+
+        elif id=='textzdatum':
+            try:
+                cs.zdatum = float(self._txt_zdatum.Value)
+                cs.add_zdatum=True
+                self.slidergenver.SetValue(int(cs.zdatum*1000.)+ 5000)
+            except ValueError:
+                self._txt_zdatum.SetValue(str(cs.zdatum))
+                logging.error("Invalid value for zdatum: %s", self._txt_zdatum.Value)
+                return
+
+        elif id=='textsdatum':
+            try:
+                cs.sdatum = float(self._txt_sdatum.Value)
+                cs.add_sdatum=True
+                self.slidergenhor.SetValue(int(cs.sdatum/length*10000.)+ 5000)
+            except ValueError:
+                self._txt_sdatum.SetValue(str(cs.sdatum))
+                logging.error("Invalid value for sdatum: %s", self._txt_sdatum.Value)
+                return
+
+        if cs.prepared:
+            cs.prepare()
 
         self.plot_cs()
 
@@ -303,17 +368,21 @@ class PlotCS(PlotPanel):
         if cs.down is not None and cs.down is not cs:
             cs.down._plot_only_cs(fig=fig, ax=ax, label=cs.down.myname, centerx=sb)
 
+        fig.canvas.draw()
+
         cursup=1
         if cursup in self.figsuppl.keys():
             fig=self.figsuppl[cursup]['figure']
             ax=self.figsuppl[cursup]['ax']
             cs.plot_cs(fig=fig, ax=ax, linked_arrays=self.linked_arrays)
+            fig.canvas.draw()
 
         cursup=2
         if cursup in self.figsuppl.keys():
             fig=self.figsuppl[cursup]['figure']
             ax=self.figsuppl[cursup]['ax']
             cs.plot_cs(fig=fig,ax=ax,forceaspect=False, linked_arrays=self.linked_arrays)
+            fig.canvas.draw()
 
         cursup=3
         if cursup in self.figsuppl.keys():
@@ -326,6 +395,7 @@ class PlotCS(PlotPanel):
                 cs.up._plot_only_cs(fig=fig,ax=ax,style='dashdot',label=cs.up.myname,centerx=sl+(sr-sl)/2.)
             if cs.down is not None and cs.down is not cs:
                 cs.down._plot_only_cs(fig=fig,ax=ax,label=cs.down.myname,centerx=sl+(sr-sl)/2.)
+            fig.canvas.draw()
 
         cursup=4
         if cursup in self.figsuppl.keys():
@@ -336,6 +406,7 @@ class PlotCS(PlotPanel):
                 cs.up._plot_only_cs(fig=fig,ax=ax,style='dashdot',label=cs.up.myname,centerx=sl+(sr-sl)/2.,centery=yb)
             if cs.down is not None and cs.down is not cs:
                 cs.down._plot_only_cs(fig=fig,ax=ax,label=cs.down.myname,centerx=sl+(sr-sl)/2.,centery=yb)
+            fig.canvas.draw()
 
     def plot_up(self,event):
 

wolfhece/GraphProfile.py

@@ -507,7 +507,7 @@ class PlotCSAll(ProfilePanel):
         self.txthor.SetLabel("{0:.3f}".format(0))
         self.txtver.SetLabel("{0:.3f}".format(0))
 
-        sl,sb,sr,yl,yb,yr = self.mycs.get_sz_banksbed()
+        sl,sb,sr,yl,yb,yr, sld, srd, yld, yrd = self.mycs.get_sz_banksbed()
 
         # Banks (sliders positions and text control values).
         if self.mycs.bankleft is not None: