diff --git a/plotter/consumers.py b/plotter/consumers.py index c3d2dc2..a1b9f41 100644 --- a/plotter/consumers.py +++ b/plotter/consumers.py @@ -18,15 +18,15 @@ def ws_connect(message, code, plot): message.reply_channel.send({'accept': True}) pk = message.content['query_string'].split('=')[1] Group('{}_{}'.format(pk, plot)).add(message.reply_channel) - print('New connection from: {}, creating Group: {}_{}'.format(message.content['client'][0], pk, plot)) + print('New connection from: {}, Group: {}_{}'.format(message.content['client'][0], pk, plot)) def ws_message(message, code, plot): # Accept the incoming connection print 'incoming message' dt = datetime.strptime(str(json.loads(message.content['text'])['date']), '%d/%m/%Y') exp = DB.exp_meta.find_one({'code': int(code), 'date': dt}) - print exp - if exp: + + if exp and plot in exp['plots']: if plot == 'spc': datas = DB.exp_data.find({'expmeta': exp['_id']}, ['time', 'data']).sort('time', -1).limit(1)[0] exp['time'] = [datas['time']] diff --git a/plotter/static/js/jroplots.js b/plotter/static/js/jroplots.js index d419ddc..8f7e4cd 100644 --- a/plotter/static/js/jroplots.js +++ b/plotter/static/js/jroplots.js @@ -155,9 +155,10 @@ class PcolorBuffer{ for (var i = 0; i < obj[this.key].length; i++){ this.zbuffer[i].push(obj[this.key][i]); // update title + var title = this.props.title || '' var div = document.getElementById(this.divs[i]); Plotly.relayout(div, { - title: 'Channel ' + i + ' - ' + t.toLocaleString(), + title: title + ': Channel ' + i + ' - ' + t.toLocaleString(), }); } diff --git a/plotter/templates/base.html b/plotter/templates/base.html index e9b8f8c..fea4be6 100644 --- a/plotter/templates/base.html +++ b/plotter/templates/base.html @@ -94,7 +94,7 @@ socket.onmessage = function message(event) { var data = JSON.parse(event.data); - console.log(data); + console.log(data.time); if (data.interval == 0) { $("#loader").removeClass("loader").addClass("no-data"); $("#loader").html("No data found"); diff --git a/plotter/templates/rti.html b/plotter/templates/rti.html index 1c383b2..d2c5e0e 100644 --- a/plotter/templates/rti.html +++ b/plotter/templates/rti.html @@ -10,7 +10,7 @@ div: 'plot', data: data, key: 'rti', - props: { title: '{{title}}', zmin: 15, zmax: 30, throttle: 10, timespan: 12 }, + props: { title: '{{title}}', zmin: 15, zmax: 35, throttle: 10, timespan: 12, colormap: 'Jet' }, }); return true; } else { diff --git a/plotter/templates/scatter.html b/plotter/templates/scatter.html index edc183d..a44f4f2 100644 --- a/plotter/templates/scatter.html +++ b/plotter/templates/scatter.html @@ -16,7 +16,7 @@ div: 'plot', data: data, key: '{{plot}}', - props: {title: '{{title}}', ylabel:'Noise [dB]', ymin:10, ymax:20 }, + props: {title: '{{title}}', ylabel:'Noise [dB]', ymin:18, ymax:22 }, }); return true; } else { diff --git a/plotter/views.py b/plotter/views.py index 7df581c..9fd7ec9 100644 --- a/plotter/views.py +++ b/plotter/views.py @@ -70,7 +70,7 @@ def main(request, code=None, plot=None): } if code and exps: - kwargs['title'] = [t[1] for t in exps if t[0]==int(code)][0] + kwargs['title'] = [t[1] for t in exps if int(t[0])==int(code)][0] else: kwargs['title'] = 'JRO' diff --git a/scripts/experiments.json b/scripts/experiments.json index 247f03d..ec33404 100644 --- a/scripts/experiments.json +++ b/scripts/experiments.json @@ -104,7 +104,7 @@ "name" : "JULIA Imaging" }, { - "code" : 203, + "code" : 204, "name" : "JULIA Bistatic" } ] \ No newline at end of file diff --git a/scripts/server.py b/scripts/server.py index 7e3dee4..b297984 100644 --- a/scripts/server.py +++ b/scripts/server.py @@ -73,7 +73,10 @@ def main(): for plot in buffer['data']: dum = buffer.copy() dum['time'] = [buffer['time']] - dum[plot] = buffer['data'][plot] + if plot=='noise': + dum[plot] = [[x] for x in buffer['data'][plot]] + else: + dum[plot] = buffer['data'][plot] dum.pop('data') dum.pop('exp_code') channel.send_group(u'{}_{}'.format(code, plot), {'text': simplejson.dumps(dum, ignore_nan=True)})