@@ -70,7 +70,7 class Figure: | |||||
70 |
|
70 | |||
71 | return widthscreen, heightscreen |
|
71 | return widthscreen, heightscreen | |
72 |
|
72 | |||
73 | def getTimeLim(self, x, xmin=None, xmax=None, timerange=None): |
|
73 | def getTimeLim(self, x, xmin=None, xmax=None, timerange=None, timezone=0): | |
74 |
|
74 | |||
75 | if self.xmin != None and self.xmax != None: |
|
75 | if self.xmin != None and self.xmax != None: | |
76 | if timerange == None: |
|
76 | if timerange == None: | |
@@ -94,10 +94,10 class Figure: | |||||
94 |
|
94 | |||
95 |
|
95 | |||
96 |
|
96 | |||
97 |
mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds= |
|
97 | mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds=timezone) | |
98 | xmin_sec = time.mktime(mindt.timetuple()) |
|
98 | xmin_sec = time.mktime(mindt.timetuple()) | |
99 |
|
99 | |||
100 |
maxdt = thisdate + datetime.timedelta(hours=xmax) - datetime.timedelta(seconds= |
|
100 | maxdt = thisdate + datetime.timedelta(hours=xmax) - datetime.timedelta(seconds=timezone) | |
101 | xmax_sec = time.mktime(maxdt.timetuple()) |
|
101 | xmax_sec = time.mktime(maxdt.timetuple()) | |
102 |
|
102 | |||
103 | return xmin_sec, xmax_sec |
|
103 | return xmin_sec, xmax_sec |
@@ -269,7 +269,7 class RTIfromSpectraHeis(Figure): | |||||
269 | showprofile=showprofile, |
|
269 | showprofile=showprofile, | |
270 | show=show) |
|
270 | show=show) | |
271 |
|
271 | |||
272 | tmin, tmax = self.getTimeLim(x, xmin, xmax) |
|
272 | tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) | |
273 | if ymin == None: ymin = numpy.nanmin(datadB) |
|
273 | if ymin == None: ymin = numpy.nanmin(datadB) | |
274 | if ymax == None: ymax = numpy.nanmax(datadB) |
|
274 | if ymax == None: ymax = numpy.nanmax(datadB) | |
275 |
|
275 |
@@ -490,7 +490,7 class WindProfilerPlot(Figure): | |||||
490 | showprofile=showprofile, |
|
490 | showprofile=showprofile, | |
491 | show=show) |
|
491 | show=show) | |
492 |
|
492 | |||
493 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) |
|
493 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) | |
494 |
|
494 | |||
495 | if ymin == None: ymin = numpy.nanmin(y) |
|
495 | if ymin == None: ymin = numpy.nanmin(y) | |
496 | if ymax == None: ymax = numpy.nanmax(y) |
|
496 | if ymax == None: ymax = numpy.nanmax(y) | |
@@ -724,7 +724,7 class ParametersPlot(Figure): | |||||
724 | showprofile=showprofile, |
|
724 | showprofile=showprofile, | |
725 | show=show) |
|
725 | show=show) | |
726 |
|
726 | |||
727 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) |
|
727 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) | |
728 |
|
728 | |||
729 | if ymin == None: ymin = numpy.nanmin(y) |
|
729 | if ymin == None: ymin = numpy.nanmin(y) | |
730 | if ymax == None: ymax = numpy.nanmax(y) |
|
730 | if ymax == None: ymax = numpy.nanmax(y) | |
@@ -1111,7 +1111,7 class EWDriftsPlot(Figure): | |||||
1111 | showprofile=showprofile, |
|
1111 | showprofile=showprofile, | |
1112 | show=show) |
|
1112 | show=show) | |
1113 |
|
1113 | |||
1114 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) |
|
1114 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) | |
1115 |
|
1115 | |||
1116 | if ymin == None: ymin = numpy.nanmin(y) |
|
1116 | if ymin == None: ymin = numpy.nanmin(y) | |
1117 | if ymax == None: ymax = numpy.nanmax(y) |
|
1117 | if ymax == None: ymax = numpy.nanmax(y) |
@@ -543,11 +543,11 class RTIPlot(Figure): | |||||
543 | showprofile=showprofile, |
|
543 | showprofile=showprofile, | |
544 | show=show) |
|
544 | show=show) | |
545 |
|
545 | |||
546 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) |
|
546 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) | |
547 |
|
547 | |||
548 | # if timerange != None: |
|
548 | # if timerange != None: | |
549 | # self.timerange = timerange |
|
549 | # self.timerange = timerange | |
550 | # self.xmin, self.tmax = self.getTimeLim(x, xmin, xmax, timerange) |
|
550 | # self.xmin, self.tmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) | |
551 |
|
551 | |||
552 |
|
552 | |||
553 |
|
553 | |||
@@ -720,9 +720,9 class CoherenceMap(Figure): | |||||
720 | showprofile=showprofile, |
|
720 | showprofile=showprofile, | |
721 | show=show) |
|
721 | show=show) | |
722 |
|
722 | |||
723 | #tmin, tmax = self.getTimeLim(x, xmin, xmax) |
|
723 | #tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) | |
724 |
|
724 | |||
725 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) |
|
725 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange, timezone = dataOut.timezone) | |
726 |
|
726 | |||
727 | if ymin == None: ymin = numpy.nanmin(y) |
|
727 | if ymin == None: ymin = numpy.nanmin(y) | |
728 | if ymax == None: ymax = numpy.nanmax(y) |
|
728 | if ymax == None: ymax = numpy.nanmax(y) | |
@@ -1072,7 +1072,7 class Noise(Figure): | |||||
1072 | showprofile=showprofile, |
|
1072 | showprofile=showprofile, | |
1073 | show=show) |
|
1073 | show=show) | |
1074 |
|
1074 | |||
1075 | tmin, tmax = self.getTimeLim(x, xmin, xmax) |
|
1075 | tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) | |
1076 | if ymin == None: ymin = numpy.nanmin(noisedB) - 10.0 |
|
1076 | if ymin == None: ymin = numpy.nanmin(noisedB) - 10.0 | |
1077 | if ymax == None: ymax = numpy.nanmax(noisedB) + 10.0 |
|
1077 | if ymax == None: ymax = numpy.nanmax(noisedB) + 10.0 | |
1078 |
|
1078 | |||
@@ -1284,7 +1284,7 class BeaconPhase(Figure): | |||||
1284 | showprofile=showprofile, |
|
1284 | showprofile=showprofile, | |
1285 | show=show) |
|
1285 | show=show) | |
1286 |
|
1286 | |||
1287 | tmin, tmax = self.getTimeLim(x, xmin, xmax) |
|
1287 | tmin, tmax = self.getTimeLim(x, xmin, xmax, timezone = dataOut.timezone) | |
1288 | if ymin == None: ymin = numpy.nanmin(phase_beacon) - 10.0 |
|
1288 | if ymin == None: ymin = numpy.nanmin(phase_beacon) - 10.0 | |
1289 | if ymax == None: ymax = numpy.nanmax(phase_beacon) + 10.0 |
|
1289 | if ymax == None: ymax = numpy.nanmax(phase_beacon) + 10.0 | |
1290 |
|
1290 |
General Comments 0
You need to be logged in to leave comments.
Login now