| @@ -32,9 +32,10 class Figure: | |||||
| 32 |
|
32 | |||
| 33 | def getFilename(self, name, ext='.png'): |
|
33 | def getFilename(self, name, ext='.png'): | |
| 34 |
|
34 | |||
| 35 | filename = '%s-%s_%s%s' %(self.wintitle[0:10], self.PREFIX, name, ext) |
|
35 | path = '%s%03d' %(self.PREFIX, self.idfigure) | |
|
|
36 | filename = '%s_%s%s' %(self.PREFIX, name, ext) | |||
| 36 |
|
37 | |||
| 37 | return filename |
|
38 | return os.path.join(path, filename) | |
| 38 |
|
39 | |||
| 39 | def getAxesObjList(self): |
|
40 | def getAxesObjList(self): | |
| 40 |
|
41 | |||
| @@ -55,7 +56,7 class Figure: | |||||
| 55 |
|
56 | |||
| 56 | def getTimeLim(self, x, xmin, xmax): |
|
57 | def getTimeLim(self, x, xmin, xmax): | |
| 57 |
|
58 | |||
| 58 | thisdatetime = datetime.datetime.fromtimestamp(numpy.min(x)) |
|
59 | thisdatetime = datetime.datetime.utcfromtimestamp(numpy.min(x)) | |
| 59 | thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0)) |
|
60 | thisdate = datetime.datetime.combine(thisdatetime.date(), datetime.time(0,0,0)) | |
| 60 |
|
61 | |||
| 61 | #################################################### |
|
62 | #################################################### | |
| @@ -71,10 +72,10 class Figure: | |||||
| 71 | if xmax == None: |
|
72 | if xmax == None: | |
| 72 | xmax = xmin + self.timerange/(60*60.) |
|
73 | xmax = xmin + self.timerange/(60*60.) | |
| 73 |
|
74 | |||
| 74 | mindt = thisdate + datetime.timedelta(0,0,0,0,0, xmin) |
|
75 | mindt = thisdate + datetime.timedelta(0,0,0,0,0, xmin) - datetime.timedelta(time.timezone) | |
| 75 | tmin = time.mktime(mindt.timetuple()) |
|
76 | tmin = time.mktime(mindt.timetuple()) | |
| 76 |
|
77 | |||
| 77 | maxdt = thisdate + datetime.timedelta(0,0,0,0,0, xmax) |
|
78 | maxdt = thisdate + datetime.timedelta(0,0,0,0,0, xmax) - datetime.timedelta(time.timezone) | |
| 78 | tmax = time.mktime(maxdt.timetuple()) |
|
79 | tmax = time.mktime(maxdt.timetuple()) | |
| 79 |
|
80 | |||
| 80 | self.timerange = tmax - tmin |
|
81 | self.timerange = tmax - tmin | |
| @@ -151,6 +152,12 class Figure: | |||||
| 151 | def saveFigure(self, figpath, figfile, *args): |
|
152 | def saveFigure(self, figpath, figfile, *args): | |
| 152 |
|
153 | |||
| 153 | filename = os.path.join(figpath, figfile) |
|
154 | filename = os.path.join(figpath, figfile) | |
|
|
155 | ||||
|
|
156 | fullpath = os.path.split(filename)[0] | |||
|
|
157 | ||||
|
|
158 | if not os.path.exists(fullpath): | |||
|
|
159 | os.mkdir(fullpath) | |||
|
|
160 | ||||
| 154 | self.__driver.saveFigure(self.fig, filename, *args) |
|
161 | self.__driver.saveFigure(self.fig, filename, *args) | |
| 155 |
|
162 | |||
| 156 | def draw(self): |
|
163 | def draw(self): | |
General Comments 0
You need to be logged in to leave comments.
Login now