diff --git a/schainpy/model/graphics/figure.py b/schainpy/model/graphics/figure.py index 6665ed5..7a27785 100644 --- a/schainpy/model/graphics/figure.py +++ b/schainpy/model/graphics/figure.py @@ -70,7 +70,7 @@ class Figure: return widthscreen, heightscreen - def getTimeLim(self, x, xmin=None, xmax=None, timerange=None): + def getTimeLim(self, x, xmin=None, xmax=None, timerange=None, timezone=0): if self.xmin != None and self.xmax != None: if timerange == None: @@ -94,10 +94,10 @@ class Figure: - mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds=time.timezone) + mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds=timezone) xmin_sec = time.mktime(mindt.timetuple()) - maxdt = thisdate + datetime.timedelta(hours=xmax) - datetime.timedelta(seconds=time.timezone) + maxdt = thisdate + datetime.timedelta(hours=xmax) - datetime.timedelta(seconds=timezone) xmax_sec = time.mktime(maxdt.timetuple()) return xmin_sec, xmax_sec diff --git a/schainpy/model/graphics/jroplot_heispectra.py b/schainpy/model/graphics/jroplot_heispectra.py index 03b88a9..2449161 100644 --- a/schainpy/model/graphics/jroplot_heispectra.py +++ b/schainpy/model/graphics/jroplot_heispectra.py @@ -269,7 +269,7 @@ class RTIfromSpectraHeis(Figure): showprofile=showprofile, show=show) - tmin, tmax = self.getTimeLim(x, xmin, xmax) + tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(datadB) if ymax == None: ymax = numpy.nanmax(datadB) diff --git a/schainpy/model/graphics/jroplot_parameters.py b/schainpy/model/graphics/jroplot_parameters.py index f502fcc..43113ac 100644 --- a/schainpy/model/graphics/jroplot_parameters.py +++ b/schainpy/model/graphics/jroplot_parameters.py @@ -490,7 +490,7 @@ class WindProfilerPlot(Figure): showprofile=showprofile, show=show) - self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) + self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(y) if ymax == None: ymax = numpy.nanmax(y) @@ -724,7 +724,7 @@ class ParametersPlot(Figure): showprofile=showprofile, show=show) - self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) + self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(y) if ymax == None: ymax = numpy.nanmax(y) @@ -1111,7 +1111,7 @@ class EWDriftsPlot(Figure): showprofile=showprofile, show=show) - self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) + self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(y) if ymax == None: ymax = numpy.nanmax(y) diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index 4201b03..afed8a8 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -543,11 +543,11 @@ class RTIPlot(Figure): showprofile=showprofile, show=show) - self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) + self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) # if timerange != None: # self.timerange = timerange -# self.xmin, self.tmax = self.getTimeLim(x, xmin, xmax, timerange) +# self.xmin, self.tmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) @@ -720,9 +720,9 @@ class CoherenceMap(Figure): showprofile=showprofile, show=show) - #tmin, tmax = self.getTimeLim(x, xmin, xmax) + #tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) - self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) + self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(y) if ymax == None: ymax = numpy.nanmax(y) @@ -1072,7 +1072,7 @@ class Noise(Figure): showprofile=showprofile, show=show) - tmin, tmax = self.getTimeLim(x, xmin, xmax) + tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(noisedB) - 10.0 if ymax == None: ymax = numpy.nanmax(noisedB) + 10.0 @@ -1284,7 +1284,7 @@ class BeaconPhase(Figure): showprofile=showprofile, show=show) - tmin, tmax = self.getTimeLim(x, xmin, xmax) + tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) if ymin == None: ymin = numpy.nanmin(phase_beacon) - 10.0 if ymax == None: ymax = numpy.nanmax(phase_beacon) + 10.0