radarsys_met Commit - r240:7e783bc1dbef

Add start, stop methods to experiment, fix RC dat export file...

Juan C. Espinoza -

r240:7e783bc1dbef

parent child

Context file:

r240:7e783bc1dbef

Collapse all files

apps/main/models.py +11 -2

                  def get_status(self):
                      confs =  Configuration.objects.filter(experiment=self)
+                     for conf in confs:
+                         conf.status_device()
                      total = confs.aggregate(models.Sum('device__status'))['device__status__sum']
                      if total==2*confs.count():
                  def get_absolute_url_export(self):
                      return reverse('url_export_experiment', args=[str(self.id)])
+                 def get_absolute_url_start(self):
+                     return reverse('url_start_experiment', args=[str(self.id)])
+                 def get_absolute_url_stop(self):
+                     return reverse('url_stop_experiment', args=[str(self.id)])
              class Configuration(PolymorphicModel):
                      if format == 'binary':
                          content_type = 'application/octet-stream'
-                         filename = '%s_%s.bin' %(self.device.device_type.name, self.name)
+                         filename = '%s_%s.dat' %(self.device.device_type.name, self.name)
                          content = self.parms_to_binary()
                      if not content_type:

apps/main/templates/experiment.html +3 -3

                  <li><a href="{% url 'url_edit_experiment' experiment.id %}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Edit</a></li>
                  <li><a href="{% url 'url_delete_experiment' experiment.id %}"><span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete</a></li>
                  <li><a href="{{ experiment.get_absolute_url_import }}"><span class="glyphicon glyphicon-import" aria-hidden="true"></span> Import </a></li>
-                 <li><a href="{{ experiment.get_absolute_url_export }}"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> Export </a></li>
-                 {% block extra-menu-actions %}
-                 {% endblock %}
+                 <li><a href="{{ experiment.get_absolute_url_export }}"><span class="glyphicon glyphicon-export" aria-hidden="true"></span> Export </a></li>
                  <li><a>----------------</a></li>
+                 <li><a href="{{ experiment.get_absolute_url_start}}"><span class="glyphicon glyphicon-play" aria-hidden="true"></span> Start</a></li>
+                 <li><a href="{{ experiment.get_absolute_url_stop }}"><span class="glyphicon glyphicon-stop" aria-hidden="true"></span> Stop</a></li>
                  <li><a href="{% url 'url_mix_experiment' experiment.id %}"><span class="glyphicon glyphicon-random" aria-hidden="true"></span> Mix RC Configurations </a></li>
                  <li><a href="{% url 'url_add_dev_conf' experiment.id %}"><span class="glyphicon glyphicon-plus-sign" aria-hidden="true"></span> Add Configuration</a></li>
                  <li><a href="{% url 'url_sum_experiment' experiment.id %}"><span class="glyphicon glyphicon-list-alt" aria-hidden="true"></span> Summary</a></li>

apps/main/urls.py +2 0

                  url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', views.experiment_delete, name='url_delete_experiment'),
                  url(r'^experiment/(?P<id_exp>-?\d+)/export/$', views.experiment_export, name='url_export_experiment'),
                  url(r'^experiment/(?P<id_exp>-?\d+)/import/$', views.experiment_import, name='url_import_experiment'),
+                 url(r'^experiment/(?P<id_exp>-?\d+)/start/$', views.experiment_start, name='url_start_experiment'),
+                 url(r'^experiment/(?P<id_exp>-?\d+)/stop/$', views.experiment_stop, name='url_stop_experiment'),
                  url(r'^experiment/(?P<id_exp>-?\d+)/mix/$', views.experiment_mix, name='url_mix_experiment'),
                  url(r'^experiment/(?P<id_exp>-?\d+)/mix/delete/$', views.experiment_mix_delete, name='url_delete_mix_experiment'),
                  url(r'^experiment/(?P<id_exp>-?\d+)/summary/$', views.experiment_summary, name='url_sum_experiment'),

apps/main/views.py +42 -2

              def experiment(request, id_exp):
                  experiment = get_object_or_404(Experiment, pk=id_exp)
+                 experiment.get_status()
                  configurations = Configuration.objects.filter(experiment=experiment, type=0)
                  kwargs = {}
-                 kwargs['experiment_keys'] = ['template', 'radar_system', 'name', 'start_time', 'end_time']
+                 kwargs['experiment_keys'] = ['radar_system', 'name', 'start_time', 'end_time']
                  kwargs['experiment'] = experiment
                  kwargs['configuration_keys'] = ['name', 'device__ip_address', 'device__port_address', 'device__status']
              @user_passes_test(lambda u:u.is_staff)
+             def experiment_start(request, id_exp):
+                 exp = get_object_or_404(Experiment, pk=id_exp)
+                 if exp.status == 2:
+                     messages.warning(request, 'Experiment {} already running'.format(exp))
+                 elif exp.status == 3:
+                     messages.warning(request, 'Experiment {} already programmed'.format(exp))
+                 else:
+                     task = task_start.delay(exp.pk)
+                     exp.status = task.wait()
+                     if exp.status==0:
+                         messages.error(request, 'Experiment {} not start'.format(exp))
+                     if exp.status==2:
+                         messages.success(request, 'Experiment {} started'.format(exp))
+                 exp.save()
+                 return redirect(exp.get_absolute_url())
+             @user_passes_test(lambda u:u.is_staff)
+             def experiment_stop(request, id_exp):
+                 exp = get_object_or_404(Experiment, pk=id_exp)
+                 if exp.status == 2:
+                     task = task_stop.delay(exp.pk)
+                     exp.status = task.wait()
+                     messages.warning(request, 'Experiment {} stopped'.format(exp))
+                     exp.save()
+                 else:
+                     messages.error(request, 'Experiment {} not running'.format(exp))
+                 return redirect(exp.get_absolute_url())
+             @user_passes_test(lambda u:u.is_staff)
              def experiment_mix(request, id_exp):
                  experiment = get_object_or_404(Experiment, pk=id_exp)

apps/rc/models.py +7 -5

              from apps.main.models import Configuration
              from devices.rc import api
              from .utils import RCFile
+             from django.template.defaultfilters import last
              # Create your models here.
                      # write flips
                      data.extend(self.add_cmd('FLIP_START'))
-                     states = self.get_pulses(binary=False)
+                     states = self.get_pulses(binary=True)
-                     for flips, delay in zip(states, delays):
-                         flips.reverse()
-                         flip = int(''.join([str(x) for x in flips]), 2)
-                         data.extend(self.add_data(flip+1))
+                     last = 0
+                     for flip, delay in zip(states, delays):
+                         data.extend(self.add_data((flip^last)+1))
+                         last = flip
                          while delay>252:
                              data.extend(self.add_data(1))
                              delay -= 253

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