@@ -130,7 +130,7 class Figure(Operation): | |||||
130 |
|
130 | |||
131 | def init(self, id, nplots, wintitle): |
|
131 | def init(self, id, nplots, wintitle): | |
132 |
|
132 | |||
133 |
raise NotImplementedError, "This method has been replaced |
|
133 | raise NotImplementedError, "This method has been replaced by createFigure" | |
134 |
|
134 | |||
135 | def createFigure(self, id, wintitle, widthplot=None, heightplot=None, show=True): |
|
135 | def createFigure(self, id, wintitle, widthplot=None, heightplot=None, show=True): | |
136 |
|
136 |
@@ -86,7 +86,7 class SpectraPlot(Figure): | |||||
86 | save=False, figpath='./', figfile=None, show=True, ftp=False, wr_period=1, |
|
86 | save=False, figpath='./', figfile=None, show=True, ftp=False, wr_period=1, | |
87 | server=None, folder=None, username=None, password=None, |
|
87 | server=None, folder=None, username=None, password=None, | |
88 | ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0, realtime=False, |
|
88 | ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0, realtime=False, | |
89 |
xaxis=" |
|
89 | xaxis="frequency"): | |
90 |
|
90 | |||
91 | """ |
|
91 | """ | |
92 |
|
92 | |||
@@ -122,7 +122,7 class SpectraPlot(Figure): | |||||
122 |
|
122 | |||
123 | if xaxis == "frequency": |
|
123 | if xaxis == "frequency": | |
124 | x = dataOut.getFreqRange(1)/1000. |
|
124 | x = dataOut.getFreqRange(1)/1000. | |
125 | xlabel = "Frquency (kHz)" |
|
125 | xlabel = "Frequency (kHz)" | |
126 |
|
126 | |||
127 | elif xaxis == "time": |
|
127 | elif xaxis == "time": | |
128 | x = dataOut.getAcfRange(1) |
|
128 | x = dataOut.getAcfRange(1) | |
@@ -280,7 +280,8 class CrossSpectraPlot(Figure): | |||||
280 | save=False, figpath='./', figfile=None, ftp=False, wr_period=1, |
|
280 | save=False, figpath='./', figfile=None, ftp=False, wr_period=1, | |
281 | power_cmap='jet', coherence_cmap='jet', phase_cmap='RdBu_r', show=True, |
|
281 | power_cmap='jet', coherence_cmap='jet', phase_cmap='RdBu_r', show=True, | |
282 | server=None, folder=None, username=None, password=None, |
|
282 | server=None, folder=None, username=None, password=None, | |
283 |
ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0 |
|
283 | ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0, | |
|
284 | xaxis='frequency'): | |||
284 |
|
285 | |||
285 | """ |
|
286 | """ | |
286 |
|
287 | |||
@@ -337,9 +338,21 class CrossSpectraPlot(Figure): | |||||
337 | #thisDatetime = dataOut.datatime |
|
338 | #thisDatetime = dataOut.datatime | |
338 | thisDatetime = datetime.datetime.utcfromtimestamp(dataOut.getTimeRange()[0]) |
|
339 | thisDatetime = datetime.datetime.utcfromtimestamp(dataOut.getTimeRange()[0]) | |
339 | title = wintitle + " Cross-Spectra: %s" %(thisDatetime.strftime("%d-%b-%Y %H:%M:%S")) |
|
340 | title = wintitle + " Cross-Spectra: %s" %(thisDatetime.strftime("%d-%b-%Y %H:%M:%S")) | |
340 | xlabel = "Velocity (m/s)" |
|
341 | # xlabel = "Velocity (m/s)" | |
341 | ylabel = "Range (Km)" |
|
342 | ylabel = "Range (Km)" | |
342 |
|
343 | |||
|
344 | if xaxis == "frequency": | |||
|
345 | x = dataOut.getFreqRange(1)/1000. | |||
|
346 | xlabel = "Frequency (kHz)" | |||
|
347 | ||||
|
348 | elif xaxis == "time": | |||
|
349 | x = dataOut.getAcfRange(1) | |||
|
350 | xlabel = "Time (ms)" | |||
|
351 | ||||
|
352 | else: | |||
|
353 | x = dataOut.getVelRange(1) | |||
|
354 | xlabel = "Velocity (m/s)" | |||
|
355 | ||||
343 | if not self.isConfig: |
|
356 | if not self.isConfig: | |
344 |
|
357 | |||
345 | nplots = len(pairsIndexList) |
|
358 | nplots = len(pairsIndexList) | |
@@ -998,7 +1011,7 class SpectraCutPlot(Figure): | |||||
998 | save=False, figpath='./', figfile=None, show=True, |
|
1011 | save=False, figpath='./', figfile=None, show=True, | |
999 | ftp=False, wr_period=1, server=None, |
|
1012 | ftp=False, wr_period=1, server=None, | |
1000 | folder=None, username=None, password=None, |
|
1013 | folder=None, username=None, password=None, | |
1001 |
xaxis=" |
|
1014 | xaxis="frequency"): | |
1002 |
|
1015 | |||
1003 |
|
1016 | |||
1004 | if channelList == None: |
|
1017 | if channelList == None: |
General Comments 0
You need to be logged in to leave comments.
Login now