@@ -72,32 +72,27 class Figure: | |||||
72 |
|
72 | |||
73 | def getTimeLim(self, x, xmin=None, xmax=None, timerange=None): |
|
73 | def getTimeLim(self, x, xmin=None, xmax=None, timerange=None): | |
74 |
|
74 | |||
75 | if xmin != None and xmax != None: |
|
75 | if self.xmin != None and self.xmax != None: | |
76 | if timerange == None: |
|
76 | if timerange == None: | |
77 | timerange = xmax - xmin |
|
77 | timerange = self.xmax - self.xmin | |
78 | xmin = xmin + timerange |
|
78 | xmin = self.xmin + timerange | |
79 | xmax = xmax + timerange |
|
79 | xmax = self.xmax + timerange | |
80 |
|
80 | |||
81 | return xmin, xmax |
|
81 | return xmin, xmax | |
82 |
|
82 | |||
83 |
|
83 | |||
84 | if timerange != None and xmin == None and xmax == None: |
|
84 | if timerange != None and self.xmin == None and self.xmax == None: | |
85 | txmin = x[0] - x[0]%timerange |
|
85 | txmin = x[0] - x[0]%timerange | |
86 | else: |
|
86 | else: | |
87 | txmin = numpy.min(x) |
|
87 | txmin = numpy.min(x) | |
88 |
timerange = |
|
88 | timerange = self.timerange | |
89 |
|
89 | thisdatetime = datetime.datetime.utcfromtimestamp(txmin) | ||
|
90 | thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0)) | |||
90 | if xmin == None and xmax == None: |
|
91 | if xmin == None and xmax == None: | |
91 | thisdatetime = datetime.datetime.utcfromtimestamp(txmin) |
|
|||
92 | thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0)) |
|
|||
93 | xmin = (thisdatetime - thisdate).seconds/(60*60.) |
|
92 | xmin = (thisdatetime - thisdate).seconds/(60*60.) | |
94 | xmax = xmin + timerange/(60*60.) |
|
93 | xmax = xmin + timerange/(60*60.) | |
95 |
|
94 | |||
96 |
|
95 | |||
97 | if timerange == None: |
|
|||
98 |
|
||||
99 | thisdatetime = datetime.datetime.utcfromtimestamp(txmin) |
|
|||
100 | thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0)) |
|
|||
101 |
|
96 | |||
102 | mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds=time.timezone) |
|
97 | mindt = thisdate + datetime.timedelta(hours=xmin) - datetime.timedelta(seconds=time.timezone) | |
103 | xmin_sec = time.mktime(mindt.timetuple()) |
|
98 | xmin_sec = time.mktime(mindt.timetuple()) |
General Comments 0
You need to be logged in to leave comments.
Login now