##// END OF EJS Templates
schain-jc
RSS
Bug fixed: PLOT_CODE was not defined for HeisSpectra
Ivan Valdez -
r789:680d1e9af46c
parent child
Show More
Show file before | Show file after | Hide comments
@@ -8,6 +8,7 import datetime
8 import numpy
8 import numpy
9
9
10 from figure import Figure, isRealtime
10 from figure import Figure, isRealtime
11 from plotting_codes import *
11
12
12 class SpectraHeisScope(Figure):
13 class SpectraHeisScope(Figure):
13
14
@@ -30,6 +31,8 class SpectraHeisScope(Figure):
30 self.HEIGHTPROF = 0
31 self.HEIGHTPROF = 0
31 self.counter_imagwr = 0
32 self.counter_imagwr = 0
32
33
34 self.PLOT_CODE = SPEC_CODE
35
33 def getSubplots(self):
36 def getSubplots(self):
34
37
35 ncol = int(numpy.sqrt(self.nplots)+0.9)
38 ncol = int(numpy.sqrt(self.nplots)+0.9)
@@ -76,7 +79,8 class SpectraHeisScope(Figure):
76 def run(self, dataOut, id, wintitle="", channelList=None,
79 def run(self, dataOut, id, wintitle="", channelList=None,
77 xmin=None, xmax=None, ymin=None, ymax=None, save=False,
80 xmin=None, xmax=None, ymin=None, ymax=None, save=False,
78 figpath='./', figfile=None, ftp=False, wr_period=1, show=True,
81 figpath='./', figfile=None, ftp=False, wr_period=1, show=True,
79 server=None, folder=None, username=None, password=None):
82 server=None, folder=None, username=None, password=None,
83 ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0):
80
84
81 """
85 """
82
86
@@ -139,7 +143,12 class SpectraHeisScope(Figure):
139 if xmax == None: xmax = numpy.nanmax(x)
143 if xmax == None: xmax = numpy.nanmax(x)
140 if ymin == None: ymin = numpy.nanmin(y)
144 if ymin == None: ymin = numpy.nanmin(y)
141 if ymax == None: ymax = numpy.nanmax(y)
145 if ymax == None: ymax = numpy.nanmax(y)
142
146
147 self.FTP_WEI = ftp_wei
148 self.EXP_CODE = exp_code
149 self.SUB_EXP_CODE = sub_exp_code
150 self.PLOT_POS = plot_pos
151
143 self.isConfig = True
152 self.isConfig = True
144
153
145 self.setWinTitle(title)
154 self.setWinTitle(title)
@@ -185,6 +194,8 class RTIfromSpectraHeis(Figure):
185 self.ydata = None
194 self.ydata = None
186 self.figfile = None
195 self.figfile = None
187
196
197 self.PLOT_CODE = RTI_CODE
198
188 def getSubplots(self):
199 def getSubplots(self):
189
200
190 ncol = 1
201 ncol = 1
@@ -216,7 +227,8 class RTIfromSpectraHeis(Figure):
216 xmin=None, xmax=None, ymin=None, ymax=None,
227 xmin=None, xmax=None, ymin=None, ymax=None,
217 timerange=None,
228 timerange=None,
218 save=False, figpath='./', figfile=None, ftp=False, wr_period=1, show=True,
229 save=False, figpath='./', figfile=None, ftp=False, wr_period=1, show=True,
219 server=None, folder=None, username=None, password=None):
230 server=None, folder=None, username=None, password=None,
231 ftp_wei=0, exp_code=0, sub_exp_code=0, plot_pos=0):
220
232
221 if channelList == None:
233 if channelList == None:
222 channelIndexList = dataOut.channelIndexList
234 channelIndexList = dataOut.channelIndexList
@@ -270,7 +282,12 class RTIfromSpectraHeis(Figure):
270 self.figfile = figfile
282 self.figfile = figfile
271 self.xdata = numpy.array([])
283 self.xdata = numpy.array([])
272 self.ydata = numpy.array([])
284 self.ydata = numpy.array([])
273
285
286 self.FTP_WEI = ftp_wei
287 self.EXP_CODE = exp_code
288 self.SUB_EXP_CODE = sub_exp_code
289 self.PLOT_POS = plot_pos
290
274 self.setWinTitle(title)
291 self.setWinTitle(title)
275
292
276
293
General Comments 0
You need to be logged in to leave comments. Login now