radarsys Commit - r175:a7fbf14a85a6 · Jicamarca Repository

Improve RC pulses plot and Operation view...

Juan C. Espinoza -

r175:a7fbf14a85a6

parent child

Context file:

r175:a7fbf14a85a6

Collapse all files

apps/main/models.py +5 0

                      return color
+                 @property
+                 def url(self):
+                     return 'http://{}:{}/'.format(self.ip_address, self.port_address)
                  def get_absolute_url(self):
                      return reverse('url_device', args=[str(self.id)])

apps/main/templates/dev_conf.html +1 -1

              <table class="table table-bordered">
              	<tr>
              		<th>Status</th>
-             		<td>{%if status != "No connected" %} <span class="glyphicon glyphicon-ok-circle text-success" aria-hidden="true"></span> {{status}}  {% else %} <span class="glyphicon glyphicon-remove-circle text-danger" aria-hidden="true"></span> {{status}} {% endif %}</td>
+             		<td class="text-{{dev_conf.device.status_color}}"> {{dev_conf.device.get_status_display}} </td>
              	</tr>
              	{% for key in dev_conf_keys %}

apps/main/templates/operation.html +3 -2

              			{% for item in location.experiments %}
              			    {% if location.name in item.location.name  %}
              					<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}" >
              						<td>{{ forloop.counter }}</td>
              			        	{% for key in experiment_keys %}
-             			        	    {% if 'status' in key %}
+             			        	    {% if 'name' in key %}
+                                             <td class="col-md-5">{{ item|value:key }}</td>
+             			        	    {% elif 'status' in key %}
              			        	        <td class="text-{{item.status_color}}">{{ item|value:key }}</td>
              			        	    {% else %}
              			        	        <td>{{ item|value:key }}</td>

apps/main/views.py +2 -3

              def operation(request, id_camp=None):
                  kwargs = {}
+                 kwargs['no_sidebar'] = True
                  campaigns = Campaign.objects.filter(start_date__lte=datetime.now(),
                                                      end_date__gte=datetime.now()).order_by('-start_date')
                      kwargs['form'] = form
                      return render(request, 'operation.html', kwargs)
                  #---Experiment
                  keys = ['id', 'name', 'start_time', 'end_time', 'status']
                  kwargs['experiment_keys'] = keys[1:]
                  #---Else
                  kwargs['title'] = 'Campaign'
                  kwargs['suptitle'] = campaign.name
-                 kwargs['form'] = form
+                 kwargs['form'] = form
                  return render(request, 'operation.html', kwargs)

apps/rc/models.py +145 -53

              import ast
              import json
+             import requests
              import numpy as np
+             from base64 import b64encode
              from django.db import models
              from django.core.urlresolvers import reverse
                  def add_data(self, value):
                      return (254, value-1)
-                 def parms_to_binary(self):
+                 def parms_to_binary(self, dat=True):
                      '''
                      Create "dat" stream to be send to CR
                      '''
-                     data = []
+                     data = bytearray()
                      # create header
-                     data.append(self.add_cmd('DISABLE'))
-                     data.append(self.add_cmd('CONTINUE'))
-                     data.append(self.add_cmd('RESTART'))
+                     data.extend(self.add_cmd('DISABLE'))
+                     data.extend(self.add_cmd('CONTINUE'))
+                     data.extend(self.add_cmd('RESTART'))
                      if self.control_sw:
-                         data.append(self.add_cmd('SW_ONE'))
+                         data.extend(self.add_cmd('SW_ONE'))
                      else:
-                         data.append(self.add_cmd('SW_ZERO'))
+                         data.extend(self.add_cmd('SW_ZERO'))
                      if self.control_tx:
-                         data.append(self.add_cmd('TX_ONE'))
+                         data.extend(self.add_cmd('TX_ONE'))
                      else:
-                         data.append(self.add_cmd('TX_ZERO'))
+                         data.extend(self.add_cmd('TX_ZERO'))
                      # write divider
-                     data.append(self.add_cmd('CLOCK_DIVIDER'))
-                     data.append(self.add_data(self.clock_divider))
+                     data.extend(self.add_cmd('CLOCK_DIVIDER'))
+                     data.extend(self.add_data(self.clock_divider))
                      # write delays
-                     data.append(self.add_cmd('DELAY_START'))
+                     data.extend(self.add_cmd('DELAY_START'))
                      # first delay is always zero
-                     data.append(self.add_data(1))
+                     data.extend(self.add_data(1))
                      delays = self.get_delays()
                      for delay in delays:
                          while delay>252:
-                             data.append(self.add_data(253))
+                             data.extend(self.add_data(253))
                              delay -= 253
-                         data.append(self.add_data(delay))
+                         data.extend(self.add_data(int(delay)))
                      # write flips
-                     data.append(self.add_cmd('FLIP_START'))
+                     data.extend(self.add_cmd('FLIP_START'))
                      states = self.get_pulses(binary=False)
                      for flips, delay in zip(states, delays):
                          flips.reverse()
                          flip = int(''.join([str(x) for x in flips]), 2)
-                         data.append(self.add_data(flip+1))
+                         data.extend(self.add_data(flip+1))
                          while delay>252:
-                             data.append(self.add_data(1))
+                             data.extend(self.add_data(1))
                              delay -= 253
                      # write sampling period
-                     data.append(self.add_cmd('SAMPLING_PERIOD'))
+                     data.extend(self.add_cmd('SAMPLING_PERIOD'))
                      wins = self.get_lines(line_type__name='windows')
                      if wins:
                          win_params = json.loads(wins[0].params)['params']
                              dh = 1
                      else:
                          dh = 1
-                     data.append(self.add_data(dh))
+                     data.extend(self.add_data(dh))
                      # write enable
-                     data.append(self.add_cmd('ENABLE'))
+                     data.extend(self.add_cmd('ENABLE'))
+                     if not dat:
+                         return data
+                     return '\n'.join(['{}'.format(x) for x in data])
-                     return '\n'.join(['{}'.format(x) for tup in data for x in tup])
                  def update_from_file(self, filename):
                      '''
                      for line in self.get_lines():
                          line.update_pulses()
-                 def plot_pulses(self, km=False):
+                 def plot_pulses2(self, km=False):
                      import matplotlib.pyplot as plt
                      from bokeh.resources import CDN
                      N = len(lines)
                      npoints = self.total_units/self.km2unit if km else self.total_units
-                     fig = plt.figure(figsize=(10, 2+N*0.5))
+                     fig = plt.figure(figsize=(12, 2+N*0.5))
                      ax = fig.add_subplot(111)
                      labels = ['IPP']
                      ax.set_yticks(range(len(labels)))
                      ax.set_yticklabels(labels)
                      ax.set_xlabel = 'Units'
-                     plot = to_bokeh(fig, use_pandas=False)
+                     plot = to_bokeh(fig, use_pandas=False)
                      plot.tools = [PanTool(dimensions=['width']), WheelZoomTool(dimensions=['width']), ResetTool(), SaveTool()]
                      plot.toolbar_location="above"
                      return components(plot, CDN)
-                 def status_device(self):
+                 def plot_pulses(self, km=False):
-                     return 0
+                     from bokeh.plotting import figure
+                     from bokeh.resources import CDN
+                     from bokeh.embed import components
+                     from bokeh.models import FixedTicker, PrintfTickFormatter
+                     from bokeh.models.tools import WheelZoomTool, ResetTool, PanTool, HoverTool, SaveTool
+                     from bokeh.models.sources import ColumnDataSource
-                 def stop_device(self):
+                     lines = self.get_lines().reverse()
+                     N = len(lines)
+                     npoints = self.total_units/self.km2unit if km else self.total_units
+                     ipp = self.ipp if km else self.ipp*self.km2unit
+                     hover = HoverTool(tooltips=[("Line", "@name"),
+                                                 ("IPP", "@ipp"),
+                                                 ("X", "@left")])
+                     tools = [PanTool(dimensions=['width']),
+                              WheelZoomTool(dimensions=['width']),
+                              hover, SaveTool()]
+                     plot = figure(width=1000,
+                                   height=40+N*50,
+                                   y_range = (0, N),
+                                   tools=tools,
+                                   toolbar_location='above',
+                                   toolbar_sticky=False,)
+                     plot.xaxis.axis_label = 'Km' if km else 'Units'
+                     plot.xaxis[0].formatter = PrintfTickFormatter(format='%d')
+                     plot.yaxis.axis_label = 'Pulses'
+                     plot.yaxis[0].ticker=FixedTicker(ticks=list(range(N)))
+                     plot.yaxis[0].formatter = PrintfTickFormatter(format='Line %d')
+                     for i, line in enumerate(lines):
+                         points = [tup for tup in line.pulses_as_points(km=km) if tup!=(0,0)]
+                         source = ColumnDataSource(data = dict(
+                                                               bottom = [i for tup in points],
+                                                               top = [i+0.5 for tup in points],
+                                                               left = [tup[0] for tup in points],
+                                                               right = [tup[1] for tup in points],
+                                                               ipp = [int(tup[0]/ipp) for tup in points],
+                                                               name = [line.get_name() for tup in points]
+                                                               ))
+                         plot.quad(
+                                  bottom = 'bottom',
+                                  top = 'top',
+                                  left = 'left',
+                                  right = 'right',
+                                  source = source,
+                                  fill_alpha = 0,
+                                  #line_color = 'blue',
+                                  )
+                         plot.line([0, npoints], [i, i])#, color='blue')
+                     return components(plot, CDN)
-                     answer = api.disable(ip = self.device.ip_address,
-                                          port = self.device.port_address)
+                 def status_device(self):
-                     if answer[0] != "1":
-                         self.message = answer[0:]
+                     try:
+                         req = requests.get(self.device.url)
+                         payload = req.json()
+                         if payload['status']=='ok':
+                             self.device.status = 3
+                         else:
+                             self.device.status = 1
+                     except:
+                         self.device.status = 0
+                     self.device.save()
+                     return self.device.status
+                 def reset_device(self):
+                     payload = bytearray()
+                     payload.extend(self.add_cmd('RESTART'))
+                     data = b64encode(payload)
+                     req = requests.put(self.device.url, data)
+                     if data==req.text.encode('utf8'):
+                         return 1
+                     else:
                          return 0
+                 def stop_device(self):
-                     self.message = answer[2:]
-                     return 1
+                     payload = bytearray()
+                     payload.extend(self.add_cmd('DISABLE'))
+                     data = b64encode(payload)
+                     req = requests.put(self.device.url, data)
+                     if data==req.text.encode('utf8'):
+                         return 1
+                     else:
+                         return 0
                  def start_device(self):
-                     answer = api.enable(ip = self.device.ip_address,
-                                         port = self.device.port_address)
-                     if answer[0] != "1":
-                         self.message = answer[0:]
+                     payload = bytearray()
+                     payload.extend(self.add_cmd('ENABLE'))
+                     data = b64encode(payload)
+                     req = requests.put(self.device.url, data)
+                     if data==req.text.encode('utf8'):
+                         return 1
+                     else:
                          return 0
-                     self.message = answer[2:]
-                     return 1
                  def write_device(self):
-                     answer = api.write_config(ip = self.device.ip_address,
-                                              port = self.device.port_address,
-                                              parms = self.parms_to_dict())
-                     if answer[0] != "1":
-                         self.message = answer[0:]
+                     data = b64encode(self.parms_to_binary(dat=False))
+                     req = requests.put(self.device.url, data)
+                     print(req.text)
+                     if data==req.text.encode('utf8'):
+                         return 1
+                     else:
                          return 0
-                     self.message = answer[2:]
-                     return 1
              class RCLineCode(models.Model):
                      km2unit = self.rc_configuration.km2unit
                      us2unit = self.rc_configuration.us2unit
                      ipp = self.rc_configuration.ipp
-                     ntx = self.rc_configuration.ntx
+                     ntx = int(self.rc_configuration.ntx)
                      ipp_u = int(ipp*km2unit)
                      total = ipp_u*ntx if self.rc_configuration.total_units==0 else self.rc_configuration.total_units
                      y = []

apps/rc/urls.py +1 0

                  url(r'^(?P<conf_id>-?\d+)/import/$', views.import_file, name='url_import_rc_conf'),
                  url(r'^(?P<conf_id>-?\d+)/edit/$', views.conf_edit, name='url_edit_rc_conf'),
                  url(r'^(?P<conf_id>-?\d+)/plot/$', views.plot_pulses, name='url_plot_rc_pulses'),
+                 url(r'^(?P<conf_id>-?\d+)/plot2/$', views.plot_pulses2, name='url_plot_rc_pulses'),
                  #url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_rc_conf'),
                  #url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_rc_conf'),

apps/rc/views.py +24 0

                  script, div = conf.plot_pulses(km=km)
                  kwargs = {}
+                 kwargs['no_sidebar'] = True
+                 kwargs['title'] = 'RC Pulses'
+                 kwargs['suptitle'] = conf.name
+                 kwargs['div'] = mark_safe(div)
+                 kwargs['script'] = mark_safe(script)
+                 kwargs['units'] = conf.km2unit
+                 kwargs['kms'] = 1/conf.km2unit
+                 if km:
+                     kwargs['km_selected'] = True
+                 if 'json' in request.GET:
+                     return HttpResponse(json.dumps({'div':mark_safe(div), 'script':mark_safe(script)}), content_type="application/json")
+                 else:
+                     return render(request, 'rc_pulses.html', kwargs)
+             def plot_pulses2(request, conf_id):
+                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
+                 km = True if 'km' in request.GET else False
+                 script, div = conf.plot_pulses2(km=km)
+                 kwargs = {}
+                 kwargs['no_sidebar'] = True
                  kwargs['title'] = 'RC Pulses'
                  kwargs['suptitle'] = conf.name
                  kwargs['div'] = mark_safe(div)

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