schain-jc Commit - r1221:94b941a5310a

Update plots for realtime app

Juan C. Espinoza -

r1221:94b941a5310a

parent child

Context file:

r1221:94b941a5310a

Collapse all files

schainpy/model/data/jrodata.py +27 -28

@@ -1105,6 +1105,7 class PlotterData(object):
1105		1105
1106	def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False):	1106	def __init__(self, code, throttle_value, exp_code, buffering=True, snr=False):
1107		1107
		1108	self.key = code
1108	self.throttle = throttle_value	1109	self.throttle = throttle_value
1109	self.exp_code = exp_code	1110	self.exp_code = exp_code
1110	self.buffering = buffering	1111	self.buffering = buffering
@@ -1202,10 +1203,8 class PlotterData(object):
1202	self.tm = tm	1203	self.tm = tm
1203	self.type = dataOut.type	1204	self.type = dataOut.type
1204	self.parameters = getattr(dataOut, 'parameters', [])	1205	self.parameters = getattr(dataOut, 'parameters', [])
1205	if hasattr(dataOut, 'pairsList'):
1206	self.pairs = dataOut.pairsList
1207	if hasattr(dataOut, 'meta'):	1206	if hasattr(dataOut, 'meta'):
1208	self.meta = dataOut.meta	1207	self.meta.update(dataOut.meta)
1209	self.channels = dataOut.channelList	1208	self.channels = dataOut.channelList
1210	self.interval = dataOut.getTimeInterval()	1209	self.interval = dataOut.getTimeInterval()
1211	self.localtime = dataOut.useLocalTime	1210	self.localtime = dataOut.useLocalTime
@@ -1288,40 +1287,40 class PlotterData(object):
1288		1287
1289	self.__heights = [H for tm in self.__times]	1288	self.__heights = [H for tm in self.__times]
1290		1289
1291	def jsonify(self, decimate=False):	1290	def jsonify(self, plot_name, plot_type, decimate=False):
1292	'''	1291	'''
1293	Convert data to json	1292	Convert data to json
1294	'''	1293	'''
1295		1294
1296	data = {}
1297	tm = self.times[-1]	1295	tm = self.times[-1]
1298	dy = int(self.heights.size/self.MAXNUMY) + 1	1296	dy = int(self.heights.size/self.MAXNUMY) + 1
1299	for key in self.data:	1297	if self.key in ('spc', 'cspc') or not self.buffering:
1300	if key in ('spc', 'cspc') or not self.buffering:	1298	dx = int(self.data[self.key].shape[1]/self.MAXNUMX) + 1
1301	dx = int(self.data[key].shape[1]/self.MAXNUMX) + 1	1299	data = self.roundFloats(
1302	data[key] = self.roundFloats(	1300	self.data[self.key][::, ::dx, ::dy].tolist())
1303	self.data[key][::, ::dx, ::dy].tolist())
1304	else:
1305	data[key] = self.roundFloats(self.data[key][tm].tolist())
1306
1307	ret = {'data': data}
1308	ret['exp_code'] = self.exp_code
1309	ret['time'] = float(tm)
1310	ret['interval'] = float(self.interval)
1311	ret['localtime'] = self.localtime
1312	ret['yrange'] = self.roundFloats(self.heights[::dy].tolist())
1313	if 'spc' in self.data or 'cspc' in self.data:
1314	ret['xrange'] = self.roundFloats(self.xrange[2][::dx].tolist())
1315	else:	1301	else:
1316	ret['xrange'] = []	1302	data = self.roundFloats(self.data[self.key][tm].tolist())
1317	if ~~hasattr~~(self, '~~pairs~~'):	1303	if self.key is 'noise':
1318	ret['pairs'] = [(int(p[0]), int(p[1])) for p in self.pairs]	1304	data = [[x] for x in data]
		1305
		1306	meta = {}
		1307	ret = {
		1308	'plot': plot_name,
		1309	'code': self.exp_code,
		1310	'time': float(tm),
		1311	'data': data,
		1312	}
		1313	meta['type'] = plot_type
		1314	meta['interval'] = float(self.interval)
		1315	meta['localtime'] = self.localtime
		1316	meta['yrange'] = self.roundFloats(self.heights[::dy].tolist())
		1317	if 'spc' in self.data or 'cspc' in self.data:
		1318	meta['xrange'] = self.roundFloats(self.xrange[2][::dx].tolist())
1319	else:	1319	else:
1320	~~ret~~['~~pairs~~'] = []	1320	meta['xrange'] = []
1321
1322	for key, value in list(self.meta.items()):
1323	ret[key] = value
1324		1321
		1322	meta.update(self.meta)
		1323	ret['metadata'] = meta
1325	return json.dumps(ret)	1324	return json.dumps(ret)
1326		1325
1327	@property	1326	@property

schainpy/model/graphics/jroplot_base.py +4 -2

                             'Sending to server: {}'.format(self.plot_server),
                             self.name
                         )
+                    if 'plot_name' in kwargs:
+                        self.plot_name = kwargs['plot_name']
                 def __setup_plot(self):
                     '''
                         self.sender_counter += 1
                     self.sender_counter = 1
+                    self.data.meta['titles'] = self.titles
                     retries = 2
                     while True:
-                        self.socket.send_string(self.data.jsonify())
+                        self.socket.send_string(self.data.jsonify(self.plot_name, self.plot_type))
                         socks = dict(self.poll.poll(5000))
                         if socks.get(self.socket) == zmq.POLLIN:
                             reply = self.socket.recv_string()

schainpy/model/graphics/jroplot_data.py +19 -8

                 CODE = 'spc'
                 colormap = 'jro'
+                plot_name = 'Spectra'
+                plot_type = 'pcolor'
                 def setup(self):
                     self.nplots = len(self.data.channels)
                 CODE = 'cspc'
                 colormap = 'jet'
+                plot_name = 'CrossSpectra'
+                plot_type = 'pcolor'
                 zmin_coh = None
                 zmax_coh = None
                 zmin_phase = None
                 '''
                 CODE = 'spc_moments'
                 colormap = 'jro'
+                plot_name = 'SpectralMoments'
+                plot_type = 'pcolor'
             class RTIPlot(Plot):
                 CODE = 'rti'
                 colormap = 'jro'
+                plot_name = 'RTI'
+                plot_type = 'pcolorbuffer'
                 def setup(self):
                     self.xaxis = 'time'
                 '''
                 CODE = 'coh'
+                plot_name = 'Coherence'
                 def setup(self):
                     self.xaxis = 'time'
                 CODE = 'phase'
                 colormap = 'seismic'
+                plot_name = 'Phase'
             class NoisePlot(Plot):
                 '''
                 CODE = 'noise'
+                plot_name = 'Noise'
+                plot_type = 'scatterbuffer'
                 def setup(self):
                     self.xaxis = 'time'
                 CODE = 'snr'
                 colormap = 'jet'
+                plot_name = 'SNR'
             class DopplerPlot(RTIPlot):
                 CODE = 'dop'
                 colormap = 'jet'
+                plot_name = 'Doppler'
             class SkyMapPlot(Plot):
                 CODE = 'param'
                 colormap = 'seismic'
+                plot_name = 'Parameters'
                 def setup(self):
                     self.xaxis = 'time'
                 CODE = 'output'
                 colormap = 'seismic'
+                plot_name = 'Output'
             class PolarMapPlot(Plot):
                 '''
                 CODE = 'scope'
+                plot_name = 'Scope'
+                plot_type = 'scatter'
                 def setup(self):
                                              thisDatetime,
                                              wintitle1
                                             )
                     else:
                         wintitle = " [Profile = %d] " %self.data.profileIndex
                                         thisDatetime,
                                         wintitle
                                         )
-  No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages