| @@ -1250,9 +1250,6 class PhasePlot(Figure): | |||||
| 1250 | server=None, folder=None, username=None, password=None, |
|
1250 | server=None, folder=None, username=None, password=None, | |
| 1251 | ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0): |
|
1251 | ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0): | |
| 1252 |
|
1252 | |||
| 1253 |
|
||||
| 1254 | if timerange != None: |
|
|||
| 1255 | self.timerange = timerange |
|
|||
| 1256 |
|
1253 | |||
| 1257 | tmin = None |
|
1254 | tmin = None | |
| 1258 | tmax = None |
|
1255 | tmax = None | |
| @@ -1280,8 +1277,12 class PhasePlot(Figure): | |||||
| 1280 | wintitle=wintitle, |
|
1277 | wintitle=wintitle, | |
| 1281 | showprofile=showprofile, |
|
1278 | showprofile=showprofile, | |
| 1282 | show=show) |
|
1279 | show=show) | |
| 1283 |
|
|
1280 | ||
| 1284 | tmin, tmax = self.getTimeLim(x, xmin, xmax) |
|
1281 | if timerange != None: | |
|
|
1282 | self.timerange = timerange | |||
|
|
1283 | ||||
|
|
1284 | self.xmin, self.xmax = self.getTimeLim(x, xmin, xmax, timerange) | |||
|
|
1285 | ||||
| 1285 | if ymin == None: ymin = numpy.nanmin(phase_beacon) - 10.0 |
|
1286 | if ymin == None: ymin = numpy.nanmin(phase_beacon) - 10.0 | |
| 1286 | if ymax == None: ymax = numpy.nanmax(phase_beacon) + 10.0 |
|
1287 | if ymax == None: ymax = numpy.nanmax(phase_beacon) + 10.0 | |
| 1287 |
|
1288 | |||
| @@ -1324,7 +1325,7 class PhasePlot(Figure): | |||||
| 1324 |
|
1325 | |||
| 1325 |
|
1326 | |||
| 1326 | axes.pmultilineyaxis(x=self.xdata, y=self.ydata, |
|
1327 | axes.pmultilineyaxis(x=self.xdata, y=self.ydata, | |
| 1327 |
xmin= |
|
1328 | xmin=self.xmin, xmax=self.xmax, ymin=ymin, ymax=ymax, | |
| 1328 | xlabel=xlabel, ylabel=ylabel, title=title, legendlabels=legendlabels, marker='x', markersize=8, linestyle="solid", |
|
1329 | xlabel=xlabel, ylabel=ylabel, title=title, legendlabels=legendlabels, marker='x', markersize=8, linestyle="solid", | |
| 1329 | XAxisAsTime=True, grid='both' |
|
1330 | XAxisAsTime=True, grid='both' | |
| 1330 | ) |
|
1331 | ) | |
| @@ -843,8 +843,6 class HDF5Writer(Operation): | |||||
| 843 | def putData(self): |
|
843 | def putData(self): | |
| 844 |
|
844 | |||
| 845 | if not self.firsttime: |
|
845 | if not self.firsttime: | |
| 846 | self.fp.flush() |
|
|||
| 847 | self.fp.close() |
|
|||
| 848 | self.readBlock() |
|
846 | self.readBlock() | |
| 849 |
|
847 | |||
| 850 | if self.blockIndex == self.blocksPerFile: |
|
848 | if self.blockIndex == self.blocksPerFile: | |
| @@ -854,6 +852,8 class HDF5Writer(Operation): | |||||
| 854 | self.setBlock() |
|
852 | self.setBlock() | |
| 855 | self.writeBlock() |
|
853 | self.writeBlock() | |
| 856 |
|
854 | |||
|
|
855 | self.fp.flush() | |||
|
|
856 | self.fp.close() | |||
| 857 |
|
857 | |||
| 858 | return |
|
858 | return | |
| 859 |
|
859 | |||
General Comments 0
You need to be logged in to leave comments.
Login now