realtime_web Commit - r3:bb0aaf379008

Fix server for noise data, correct codes

jespinoza -

r3:bb0aaf379008

parent child

Context file:

r3:bb0aaf379008

plotter/consumers.py +3 -3

                 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']]

plotter/static/js/jroplots.js +2 -1

                     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(),
                         });
                     }

plotter/templates/base.html +1 -1

                 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");

plotter/templates/rti.html +1 -1

                       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 {

plotter/templates/scatter.html +1 -1

                           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 {

plotter/views.py +1 -1

                 }
                 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'

scripts/experiments.json +1 -1

                     "name" : "JULIA Imaging"
                 },
                 {
-                    "code" : 203,
+                    "code" : 204,
                     "name" : "JULIA Bistatic"
                 }
             ]

scripts/server.py +4 -1

                     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)})

General Comments 0

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

No TODOs yet

	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