radarsys Commit - r112:90a1581a0938 · Jicamarca Repository

Fix mix RC configurations for different ipp's...

Juan C. Espinoza -

r112:90a1581a0938

parent child

Context file:

r112:90a1581a0938

Collapse all files

apps/main/templates/experiment_mix.html +8 0

             {% extends "base_edit.html" %}
             {% load bootstrap3 %}
             {% load static %}
             {% load main_tags %}
             {% block extra-head %}
             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             <style type="text/css">
                   .tabuled {font-family: Courier New}
                   .check-inline {display: inline}
             </style>
             {% endblock %}
             {% block extra-js%}
             <script src="{% static 'js/moment.min.js' %}"></script>
             <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
             <script src="{% static 'js/cr.js' %}"></script>
             <script type="text/javascript">
               $("#bt_Delete").click(function() {
                 document.location = "{% url 'url_delete_mix_experiment' id_exp  %}";
               });
+              $('input[type=radio][name=mode]').change(function() {
+                if (this.value == '0') {
+                  $('input[type=radio][name=operation]').prop('disabled', false);
+                }else{
+                  $('input[type=radio][name=operation]').prop('disabled', true);
+                }
+              });
             </script>
             {% endblock %}

apps/main/templatetags/main_tags.py +2 -1

             from django.template.defaulttags import register
             from django.utils.safestring import mark_safe
             @register.filter
             def attr(instance, key):
                 display_key = "get_" + key + "_display"
                 if hasattr(instance, display_key):
                     return getattr(instance, display_key)()
                 if hasattr(instance, key):
                     return getattr(instance, key)
                 return instance.get(key)
             @register.filter
             def title(s):
                 return s.split('__')[-1].replace('_', ' ').title()
             @register.filter
             def value(instance, key):
                 item = instance
                 if key=='name':
                     return '%s' % item
                 for my_key in key.split("__"):
                     item = attr(item, my_key)
                 return item
             @register.simple_tag
             def get_verbose_field_name(instance, field_name):
                 """
                 Returns verbose_name for a field.
                 """
+                if field_name=='ipp_unit':
+                    return 'Inter pulse period [Km(Units)]'
                 return mark_safe(instance._meta.get_field(field_name).verbose_name)

apps/main/views.py +38 -22

             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from django.utils.safestring import mark_safe
             from django.http import HttpResponseRedirect
             from django.core.urlresolvers import reverse
             from django.contrib import messages
             from datetime import datetime
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
             from .forms import OperationSearchForm
             from apps.cgs.forms import CGSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
             from apps.usrp.forms import USRPConfigurationForm
             from apps.abs.forms import ABSConfigurationForm
             from apps.rc.forms import RCConfigurationForm, RCMixConfigurationForm
             from apps.dds.forms import DDSConfigurationForm
             from .models import Campaign, Experiment, Device, Configuration, Location, RunningExperiment
             from apps.cgs.models import CGSConfiguration
             from apps.jars.models import JARSConfiguration
             from apps.usrp.models import USRPConfiguration
             from apps.abs.models import ABSConfiguration
             from apps.rc.models import RCConfiguration, RCLine, RCLineType
             from apps.dds.models import DDSConfiguration
             # Create your views here.
             CONF_FORMS = {
                 'rc': RCConfigurationForm,
                 'rc_mix': RCMixConfigurationForm,
                 'dds': DDSConfigurationForm,
                 'jars': JARSConfigurationForm,
                 'cgs': CGSConfigurationForm,
                 'abs': ABSConfigurationForm,
                 'usrp': USRPConfigurationForm,
             }
             CONF_MODELS = {
                 'rc': RCConfiguration,
                 'dds': DDSConfiguration,
                 'jars': JARSConfiguration,
                 'cgs': CGSConfiguration,
                 'abs': ABSConfiguration,
                 'usrp': USRPConfiguration,
             }
             MIX_MODES = {
+                '0': 'P',
+                '1': 'S',
+            }
+            MIX_OPERATIONS = {
                 '0': 'OR',
                 '1': 'XOR',
                 '2': 'AND',
-                '3': 'NAND'
+                '3': 'NAND',
             }
             def index(request):
                 kwargs = {}
                 return render(request, 'index.html', kwargs)
             def locations(request):
                 locations = Location.objects.all().order_by('name')
                 keys = ['id', 'name', 'description']
                 kwargs = {}
                 kwargs['location_keys'] = keys[1:]
                 kwargs['locations'] = locations
                 kwargs['title'] = 'Location'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Location'
                 return render(request, 'locations.html', kwargs)
             def location(request, id_loc):
                 location = get_object_or_404(Location, pk=id_loc)
                 kwargs = {}
                 kwargs['location'] = location
                 kwargs['location_keys'] = ['name', 'description']
                 kwargs['title'] = 'Location'
                 kwargs['suptitle'] = 'Details'
                 return render(request, 'location.html', kwargs)
             def location_new(request):
                 if request.method == 'GET':
                     form = LocationForm()
                 if request.method == 'POST':
                     form = LocationForm(request.POST)
                     if form.is_valid():
                         form.save()
                         return redirect('url_locations')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Location'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'location_edit.html', kwargs)
             def location_edit(request, id_loc):
                 location = get_object_or_404(Location, pk=id_loc)
                 if request.method=='GET':
                     form = LocationForm(instance=location)
                 if request.method=='POST':
                     form = LocationForm(request.POST, instance=location)
                     if form.is_valid():
                         form.save()
                         return redirect('url_locations')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Location'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'location_edit.html', kwargs)
             def location_delete(request, id_loc):
                 location = get_object_or_404(Location, pk=id_loc)
                 if request.method=='POST':
                     if request.user.is_staff:
                         location.delete()
                         return redirect('url_locations')
                     messages.error(request, 'Not enough permission to delete this object')
                     return redirect(location.get_absolute_url())
                 kwargs = {
                           'title': 'Delete',
                           'suptitle': 'Location',
                           'object': location,
                           'previous': location.get_absolute_url(),
                           'delete': True
                           }
                 return render(request, 'confirm.html', kwargs)
             def devices(request):
                 devices = Device.objects.all().order_by('device_type__name')
             #     keys = ['id', 'device_type__name', 'name', 'ip_address']
                 keys = ['id', 'name', 'ip_address', 'port_address', 'device_type']
                 kwargs = {}
                 kwargs['device_keys'] = keys[1:]
                 kwargs['devices'] = devices#.values(*keys)
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Device'
                 return render(request, 'devices.html', kwargs)
             def device(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 kwargs = {}
                 kwargs['device'] = device
                 kwargs['device_keys'] = ['device_type', 'name', 'ip_address', 'port_address', 'description']
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Details'
                 return render(request, 'device.html', kwargs)
             def device_new(request):
                 if request.method == 'GET':
                     form = DeviceForm()
                 if request.method == 'POST':
                     form = DeviceForm(request.POST)
                     if form.is_valid():
                         form.save()
                         return redirect('url_devices')
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'New'
                 kwargs['button'] = 'Create'
                 return render(request, 'device_edit.html', kwargs)
             def device_edit(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method=='GET':
                     form = DeviceForm(instance=device)
                 if request.method=='POST':
                     form = DeviceForm(request.POST, instance=device)
                     if form.is_valid():
                         form.save()
                         return redirect(device.get_absolute_url())
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'device_edit.html', kwargs)
             def device_delete(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method=='POST':
                     if request.user.is_staff:
                         device.delete()
                         return redirect('url_devices')
                     messages.error(request, 'Not enough permission to delete this object')
                     return redirect(device.get_absolute_url())
                 kwargs = {
                           'title': 'Delete',
                           'suptitle': 'Device',
                           'object': device,
                           'previous': device.get_absolute_url(),
                           'delete': True
                           }
                 return render(request, 'confirm.html', kwargs)
             def campaigns(request):
                 campaigns = Campaign.objects.all().order_by('start_date')
                 keys = ['id', 'name', 'start_date', 'end_date']
                 kwargs = {}
                 kwargs['campaign_keys'] = keys[1:]
                 kwargs['campaigns'] = campaigns#.values(*keys)
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Campaign'
                 return render(request, 'campaigns.html', kwargs)
             def campaign(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 experiments = Experiment.objects.filter(campaign=campaign)
                 form = CampaignForm(instance=campaign)
                 kwargs = {}
                 kwargs['campaign'] = campaign
                 kwargs['campaign_keys'] = ['template', 'name', 'start_date', 'end_date', 'tags', 'description']
                 kwargs['experiments'] = experiments
                 kwargs['experiment_keys'] = ['name', 'radar', 'start_time', 'end_time']
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Details'
                 kwargs['form'] = form
                 kwargs['button'] = 'Add Experiment'
                 return render(request, 'campaign.html', kwargs)
             def campaign_new(request):
                 kwargs = {}
                 if request.method == 'GET':
                     if 'template' in request.GET:
                         if request.GET['template']=='0':
                             form = NewForm(initial={'create_from':2},
                                            template_choices=Campaign.objects.filter(template=True).values_list('id', 'name'))
                         else:
                             kwargs['button'] = 'Create'
                             kwargs['experiments'] = Configuration.objects.filter(experiment=request.GET['template'])
                             kwargs['experiment_keys'] = ['name', 'start_time', 'end_time']
                             camp = Campaign.objects.get(pk=request.GET['template'])
                             form = CampaignForm(instance=camp,
                                                 initial={'name':'{} [{:%Y/%m/%d}]'.format(camp.name, datetime.now()),
                                                          'template':False})
                     elif 'blank' in request.GET:
                         kwargs['button'] = 'Create'
                         form = CampaignForm()
                     else:
                         form = NewForm()
                 if request.method == 'POST':
                     kwargs['button'] = 'Create'
                     post = request.POST.copy()
                     experiments = []
                     for id_exp in post.getlist('experiments'):
                         exp = Experiment.objects.get(pk=id_exp)
                         new_exp = exp.clone(template=False)
                         experiments.append(new_exp)
                     post.setlist('experiments', [])
                     form = CampaignForm(post)
                     if form.is_valid():
                         campaign = form.save()
                         for exp in experiments:
                             campaign.experiments.add(exp)
                         campaign.save()
                         return redirect('url_campaign', id_camp=campaign.id)
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'New'
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_edit(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method=='GET':
                     form = CampaignForm(instance=campaign)
                 if request.method=='POST':
                     exps = campaign.experiments.all().values_list('pk', flat=True)
                     post = request.POST.copy()
                     new_exps = post.getlist('experiments')
                     post.setlist('experiments', [])
                     form = CampaignForm(post, instance=campaign)
                     if form.is_valid():
                         camp = form.save()
                         for id_exp in new_exps:
                             if int(id_exp) in exps:
                                 exps.pop(id_exp)
                             else:
                                 exp = Experiment.objects.get(pk=id_exp)
                                 if exp.template:
                                     camp.experiments.add(exp.clone(template=False))
                                 else:
                                     camp.experiments.add(exp)
                         for id_exp in exps:
                             camp.experiments.remove(Experiment.objects.get(pk=id_exp))
                         return redirect('url_campaign', id_camp=id_camp)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'campaign_edit.html', kwargs)
             def campaign_delete(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method=='POST':
                     if request.user.is_staff:
                         for exp in campaign.experiments.all():
                             for conf in Configuration.objects.filter(experiment=exp):
                                 conf.delete()
                             exp.delete()
                         campaign.delete()
                         return redirect('url_campaigns')
                     messages.error(request, 'Not enough permission to delete this object')
                     return redirect(campaign.get_absolute_url())
                 kwargs = {
                           'title': 'Delete',
                           'suptitle': 'Campaign',
                           'object': campaign,
                           'previous': campaign.get_absolute_url(),
                           'delete': True
                           }
                 return render(request, 'confirm.html', kwargs)
             def campaign_export(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 content = campaign.parms_to_dict()
                 content_type = 'application/json'
                 filename     =  '%s_%s.json' %(campaign.name, campaign.id)
                 response = HttpResponse(content_type=content_type)
                 response['Content-Disposition'] = 'attachment; filename="%s"' %filename
                 response.write(content)
                 return response
             def campaign_import(request, id_camp):
                 campaign = get_object_or_404(Campaign, pk=id_camp)
                 if request.method == 'GET':
                     file_form = UploadFileForm()
                 if request.method == 'POST':
                     file_form = UploadFileForm(request.POST, request.FILES)
                     if file_form.is_valid():
                         parms = campaign.import_from_file(request.FILES['file'])
                         if parms:
                             parms['name'] = parms['campaign']
                             new_camp = campaign.dict_to_parms(parms, CONF_MODELS)
                             messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name)
                             return redirect(new_camp.get_absolute_url_edit())
                     messages.error(request, "Could not import parameters from file")
                 kwargs = {}
                 kwargs['title'] = 'Campaign'
                 kwargs['form'] = file_form
                 kwargs['suptitle'] = 'Importing file'
                 kwargs['button'] = 'Import'
                 return render(request, 'campaign_import.html', kwargs)
             def experiments(request):
                 experiment_list = Experiment.objects.all()
                 keys = ['id', 'name', 'start_time', 'end_time']
                 kwargs = {}
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiment_list
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'List'
                 kwargs['button'] = 'New Experiment'
                 return render(request, 'experiments.html', kwargs)
             def experiment(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 configurations = Configuration.objects.filter(experiment=experiment, type=0)
                 kwargs = {}
                 kwargs['experiment_keys'] = ['template', 'radar', 'name', 'start_time', 'end_time']
                 kwargs['experiment'] = experiment
                 kwargs['configuration_keys'] = ['name', 'device__device_type', 'device__ip_address', 'device__port_address']
                 kwargs['configurations'] = configurations
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Configuration'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(experiment=experiment))
                 return render(request, 'experiment.html', kwargs)
             def experiment_new(request, id_camp=None):
                 kwargs = {}
                 if request.method == 'GET':
                     if 'template' in request.GET:
                         if request.GET['template']=='0':
                             form = NewForm(initial={'create_from':2},
                                            template_choices=Experiment.objects.filter(template=True).values_list('id', 'name'))
                         else:
                             kwargs['button'] = 'Create'
                             kwargs['configurations'] = Configuration.objects.filter(experiment=request.GET['template'])
                             kwargs['configuration_keys'] = ['name', 'device__name', 'device__ip_address', 'device__port_address']
                             exp=Experiment.objects.get(pk=request.GET['template'])
                             form = ExperimentForm(instance=exp,
                                                   initial={'name': '{} [{:%Y/%m/%d}]'.format(exp.name, datetime.now()),
                                                            'template': False})
                     elif 'blank' in request.GET:
                         kwargs['button'] = 'Create'
                         form = ExperimentForm()
                     else:
                         form = NewForm()
                 if request.method == 'POST':
                     form = ExperimentForm(request.POST)
                     if form.is_valid():
                         experiment = form.save()
                         if 'template' in request.GET:
                             configurations = Configuration.objects.filter(experiment=request.GET['template'], type=0)
                             for conf in configurations:
                                 conf.clone(experiment=experiment, template=False)
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'New'
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_edit(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 if request.method == 'GET':
                     form = ExperimentForm(instance=experiment)
                 if request.method=='POST':
                     form = ExperimentForm(request.POST, instance=experiment)
                     if form.is_valid():
                         experiment = form.save()
                         return redirect('url_experiment', id_exp=experiment.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Experiment'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 return render(request, 'experiment_edit.html', kwargs)
             def experiment_delete(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 if request.method=='POST':
                     if request.user.is_staff:
                         for conf in Configuration.objects.filter(experiment=experiment):
                             conf.delete()
                         experiment.delete()
                         return redirect('url_experiments')
                     messages.error(request, 'Not enough permission to delete this object')
                     return redirect(experiment.get_absolute_url())
                 kwargs = {
                           'title': 'Delete',
                           'suptitle': 'Experiment',
                           'object': experiment,
                           'previous': experiment.get_absolute_url(),
                           'delete': True
                           }
                 return render(request, 'confirm.html', kwargs)
             def experiment_export(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 content = experiment.parms_to_dict()
                 content_type = 'application/json'
                 filename     =  '%s_%s.json' %(experiment.name, experiment.id)
                 response = HttpResponse(content_type=content_type)
                 response['Content-Disposition'] = 'attachment; filename="%s"' %filename
                 response.write(content)
                 return response
             def experiment_import(request, id_exp):
                 experiment     = get_object_or_404(Experiment, pk=id_exp)
                 configurations = Configuration.objects.filter(experiment=experiment)
                 if request.method == 'GET':
                     file_form = UploadFileForm()
                 if request.method == 'POST':
                     file_form = UploadFileForm(request.POST, request.FILES)
                     if file_form.is_valid():
                         parms = experiment.import_from_file(request.FILES['file'])
                         if parms:
                             new_exp = experiment.dict_to_parms(parms, CONF_MODELS)
                             messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name)
                             return redirect(new_exp.get_absolute_url_edit())
                     messages.error(request, "Could not import parameters from file")
                 kwargs = {}
                 kwargs['title'] = 'Experiment'
                 kwargs['form'] = file_form
                 kwargs['suptitle'] = 'Importing file'
                 kwargs['button'] = 'Import'
                 kwargs.update(sidebar(experiment=experiment))
                 return render(request, 'experiment_import.html', kwargs)
             def experiment_mix(request, id_exp):
                 experiment = get_object_or_404(Experiment, pk=id_exp)
                 rc_confs = [conf for conf in RCConfiguration.objects.filter(experiment=id_exp,
                                                                             mix=False)]
                 if len(rc_confs)<2:
                     messages.warning(request, 'You need at least two RC Configurations to make a mix')
                     return redirect(experiment.get_absolute_url())
                 mix_confs = RCConfiguration.objects.filter(experiment=id_exp, mix=True)
                 if mix_confs:
                     mix = mix_confs[0]
                 else:
                     mix = RCConfiguration(experiment=experiment,
                                           device=rc_confs[0].device,
                                           ipp=rc_confs[0].ipp,
                                           clock_in=rc_confs[0].clock_in,
                                           clock_divider=rc_confs[0].clock_divider,
                                           mix=True,
                                           parameters='')
                     mix.save()
                     line_type = RCLineType.objects.get(name='mix')
                     for i in range(len(rc_confs[0].get_lines())):
                         line = RCLine(rc_configuration=mix, line_type=line_type, channel=i)
                         line.save()
                 initial = {'name': mix.name,
                            'result': parse_mix_result(mix.parameters),
                            'delay': 0,
                            'mask': [0,1,2,3,4,5,6,7]
                            }
                 if request.method=='GET':
                     form = RCMixConfigurationForm(confs=rc_confs, initial=initial)
                 if request.method=='POST':
                     result = mix.parameters
                     if '{}|'.format(request.POST['experiment']) in result:
                         messages.error(request, 'Configuration already added')
                     else:
+                        if 'operation' in request.POST:
+                            operation = MIX_OPERATIONS[request.POST['operation']]
+                        else:
+                            operation = '---'
+                        mode = MIX_MODES[request.POST['mode']]
                         if result:
-                            result = '{}-{}|{}|{}|{}'.format(mix.parameters,
+                            result = '{}-{}|{}|{}|{}|{}'.format(mix.parameters,
-                                                          request.POST['experiment'],
+                                                        request.POST['experiment'],
-                                                          MIX_MODES[request.POST['operation']],
+                                                        mode,
-                                                          float(request.POST['delay']),
+                                                        operation,
-                                                          parse_mask(request.POST.getlist('mask'))
+                                                        float(request.POST['delay']),
+                                                        parse_mask(request.POST.getlist('mask'))
+                                                        )
                         else:
-                            result = '{}|{}|{}|{}'.format(request.POST['experiment'],
+                            result = '{}|{}|{}|{}|{}'.format(request.POST['experiment'],
-                                                       MIX_MODES[request.POST['operation']],
+                                                    mode,
-                                                       float(request.POST['delay']),
+                                                    operation,
-                                                       parse_mask(request.POST.getlist('mask'))
+                                                    float(request.POST['delay']),
+                                                    parse_mask(request.POST.getlist('mask'))
+                                                    )
                         mix.parameters = result
                         mix.name = request.POST['name']
                         mix.save()
                         mix.update_pulses()
                     initial['result'] = parse_mix_result(result)
                     initial['name'] = mix.name
                     form = RCMixConfigurationForm(initial=initial, confs=rc_confs)
                 kwargs = {
                           'title': 'Experiment',
                           'suptitle': 'Mix Configurations',
                           'form' : form,
                           'extra_button': 'Delete',
                           'button': 'Add',
                           'cancel': 'Back',
                           'previous': experiment.get_absolute_url(),
                           'id_exp':id_exp,
                           }
                 return render(request, 'experiment_mix.html', kwargs)
             def experiment_mix_delete(request, id_exp):
                 conf = RCConfiguration.objects.get(experiment=id_exp, mix=True)
                 values = conf.parameters.split('-')
                 conf.parameters = '-'.join(values[:-1])
                 conf.save()
                 return redirect('url_mix_experiment', id_exp=id_exp)
             def parse_mix_result(s):
                 values = s.split('-')
-                html = ''
+                html = 'EXP                MOD OPE DELAY         MASK\r\n'
+                if not values or values[0] in ('', ' '):
+                    return mark_safe(html)
                 for i, value in enumerate(values):
                     if not value:
                         continue
-                    pk, mode, delay, mask = value.split('|')
+                    pk, mode, operation, delay, mask = value.split('|')
                     conf = RCConfiguration.objects.get(pk=pk)
                     if i==0:
-                        html += '{:20.18}{:4}{:9}km{:>6}\r\n'.format(
+                        html += '{:20.18}{:3}{:4}{:9}km{:>6}\r\n'.format(
-                                            conf.name[:18],
+                                            conf.name,
+                                            mode,
                                             '---',
                                             delay,
                                             mask)
                     else:
-                        html += '{:20.18}{:4}{:9}km{:>6}\r\n'.format(
+                        html += '{:20.18}{:3}{:4}{:9}km{:>6}\r\n'.format(
-                                            conf.name[:18],
+                                            conf.name,
                                             mode,
+                                            operation,
                                             delay,
                                             mask)
                 return mark_safe(html)
             def parse_mask(l):
                 values = []
                 for x in range(8):
                     if '{}'.format(x) in l:
                         values.append(1)
                     else:
                         values.append(0)
                 values.reverse()
                 return int(''.join([str(x) for x in values]), 2)
             def dev_confs(request):
                 configurations = Configuration.objects.all().order_by('type', 'device__device_type', 'experiment')
                 kwargs = {}
                 kwargs['configuration_keys'] = ['device', 'name', 'experiment', 'type', 'programmed_date']
                 kwargs['configurations'] = configurations
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'List'
                 return render(request, 'dev_confs.html', kwargs)
             def dev_conf(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 return redirect(conf.get_absolute_url())
             def dev_conf_new(request, id_exp=0, id_dev=0):
                 initial = {}
                 kwargs = {}
                 if id_exp<>0:
                     initial['experiment'] = id_exp
                 if id_dev<>0:
                     initial['device'] = id_dev
                 if request.method == 'GET':
                     if id_dev:
                         kwargs['button'] = 'Create'
                         device = Device.objects.get(pk=id_dev)
                         DevConfForm = CONF_FORMS[device.device_type.name]
                         initial['name'] = request.GET['name']
                         form = DevConfForm(initial=initial)
                     else:
                         if 'template' in request.GET:
                             if request.GET['template']=='0':
                                 form = NewForm(initial={'create_from':2},
                                                template_choices=Configuration.objects.filter(template=True).values_list('id', 'name'))
                             else:
                                 kwargs['button'] = 'Create'
                                 conf = Configuration.objects.get(pk=request.GET['template'])
                                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                                 form = DevConfForm(instance=conf,
                                                    initial={'name': '{} [{:%Y/%m/%d}]'.format(conf.name, datetime.now()),
                                                             'template': False})
                         elif 'blank' in request.GET:
                             kwargs['button'] = 'Create'
                             form = ConfigurationForm(initial=initial)
                         else:
                             form = NewForm()
                 if request.method == 'POST':
                     device = Device.objects.get(pk=request.POST['device'])
                     DevConfForm = CONF_FORMS[device.device_type.name]
                     form = DevConfForm(request.POST)
                     if form.is_valid():
                         conf = form.save()
                         if 'template' in request.GET and conf.device.device_type.name=='rc':
                             lines = RCLine.objects.filter(rc_configuration=request.GET['template'])
                             for line in lines:
                                 line.clone(rc_configuration=conf)
                         return redirect('url_dev_conf', id_conf=conf.pk)
                 kwargs['id_exp'] = id_exp
                 kwargs['form'] = form
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'New'
                 if id_dev != 0:
                     device = Device.objects.get(pk=id_dev)
                     if 'dds' in device.device_type.name:
                         kwargs['dds_device'] = True
                 return render(request, 'dev_conf_edit.html', kwargs)
             def dev_conf_edit(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                 dev_conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method=='GET':
                     form = DevConfForm(instance=dev_conf)
                 if request.method=='POST':
                     form = DevConfForm(request.POST, instance=dev_conf)
                     if form.is_valid():
                         form.save()
                         return redirect('url_dev_conf', id_conf=id_conf)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
             def dev_conf_start(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if conf.start_device():
                     messages.success(request, conf.message)
                 else:
                     messages.error(request, conf.message)
                 conf.status_device()
                 return redirect(conf.get_absolute_url())
             def dev_conf_stop(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if conf.stop_device():
                     messages.success(request, conf.message)
                 else:
                     messages.error(request, conf.message)
                 conf.status_device()
                 return redirect(conf.get_absolute_url())
             def dev_conf_status(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if conf.status_device():
                     messages.success(request, conf.message)
                 else:
                     messages.error(request, conf.message)
                 return redirect(conf.get_absolute_url())
             def dev_conf_write(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 answer = conf.write_device()
                 conf.status_device()
                 if answer:
                     messages.success(request, conf.message)
                     #Creating a historical configuration
                     conf.clone(type=0, template=False)
                     #Original configuration
                     conf = DevConfModel.objects.get(pk=id_conf)
                 else:
                     messages.error(request, conf.message)
                 return redirect(conf.get_absolute_url())
             def dev_conf_read(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method=='GET':
                     parms = conf.read_device()
                     conf.status_device()
                     if not parms:
                         messages.error(request, conf.message)
                         return redirect(conf.get_absolute_url())
                     form = DevConfForm(initial=parms, instance=conf)
                 if request.method=='POST':
                     form = DevConfForm(request.POST, instance=conf)
                     if form.is_valid():
                         form.save()
                         return redirect(conf.get_absolute_url())
                     messages.error(request, "Parameters could not be saved")
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['form'] = form
                 kwargs['title'] = 'Device Configuration'
                 kwargs['suptitle'] = 'Parameters read from device'
                 kwargs['button'] = 'Save'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, '%s_conf_edit.html' %conf.device.device_type.name, kwargs)
             def dev_conf_import(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method == 'GET':
                     file_form = UploadFileForm()
                 if request.method == 'POST':
                     file_form = UploadFileForm(request.POST, request.FILES)
                     if file_form.is_valid():
                         parms = conf.import_from_file(request.FILES['file'])
                         if parms:
                             messages.success(request, "Parameters imported from: '%s'." %request.FILES['file'].name)
                             form = DevConfForm(initial=parms, instance=conf)
                             kwargs = {}
                             kwargs['id_dev'] = conf.id
                             kwargs['form'] = form
                             kwargs['title'] = 'Device Configuration'
                             kwargs['suptitle'] = 'Parameters imported'
                             kwargs['button'] = 'Save'
                             kwargs['action'] = conf.get_absolute_url_edit()
                             kwargs['previous'] = conf.get_absolute_url()
                             ###### SIDEBAR ######
                             kwargs.update(sidebar(conf=conf))
                             return render(request, '%s_conf_edit.html' % conf.device.device_type.name, kwargs)
                     messages.error(request, "Could not import parameters from file")
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['title'] = 'Device Configuration'
                 kwargs['form'] = file_form
                 kwargs['suptitle'] = 'Importing file'
                 kwargs['button'] = 'Import'
                 kwargs.update(sidebar(conf=conf))
                 return render(request, 'dev_conf_import.html', kwargs)
             def dev_conf_export(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 DevConfModel = CONF_MODELS[conf.device.device_type.name]
                 conf = DevConfModel.objects.get(pk=id_conf)
                 if request.method == 'GET':
                     file_form = DownloadFileForm(conf.device.device_type.name)
                 if request.method == 'POST':
                     file_form = DownloadFileForm(conf.device.device_type.name, request.POST)
                     if file_form.is_valid():
                         fields = conf.export_to_file(format = file_form.cleaned_data['format'])
                         response = HttpResponse(content_type=fields['content_type'])
                         response['Content-Disposition'] = 'attachment; filename="%s"' %fields['filename']
                         response.write(fields['content'])
                         return response
                     messages.error(request, "Could not export parameters")
                 kwargs = {}
                 kwargs['id_dev'] = conf.id
                 kwargs['title'] = 'Device Configuration'
                 kwargs['form'] = file_form
                 kwargs['suptitle'] = 'Exporting file'
                 kwargs['button'] = 'Export'
                 return render(request, 'dev_conf_export.html', kwargs)
             def dev_conf_delete(request, id_conf):
                 conf = get_object_or_404(Configuration, pk=id_conf)
                 if request.method=='POST':
                     if request.user.is_staff:
                         conf.delete()
                         return redirect('url_dev_confs')
                     messages.error(request, 'Not enough permission to delete this object')
                     return redirect(conf.get_absolute_url())
                 kwargs = {
                           'title': 'Delete',
                           'suptitle': 'Experiment',
                           'object': conf,
                           'previous': conf.get_absolute_url(),
                           'delete': True
                           }
                 return render(request, 'confirm.html', kwargs)
             def sidebar(**kwargs):
                 side_data = {}
                 conf = kwargs.get('conf', None)
                 experiment = kwargs.get('experiment', None)
                 if not experiment:
                     experiment = conf.experiment
                 if experiment:
                     side_data['experiment'] = experiment
                     campaign = experiment.campaign_set.all()
                     if campaign:
                         side_data['campaign'] = campaign[0]
                         experiments = campaign[0].experiments.all()
                     else:
                         experiments = [experiment]
                     configurations = experiment.configuration_set.filter(type=0)
                     side_data['side_experiments'] = experiments
                     side_data['side_configurations'] = configurations
                 return side_data
             def operation(request, id_camp=None):
                 if not id_camp:
                     campaigns = Campaign.objects.all().order_by('-start_date')
                     if not campaigns:
                         kwargs = {}
                         kwargs['title'] = 'No Campaigns'
                         kwargs['suptitle'] = 'Empty'
                         return render(request, 'operation.html', kwargs)
                     id_camp = campaigns[0].id
                 campaign = get_object_or_404(Campaign, pk = id_camp)
                 if request.method=='GET':
                     form = OperationForm(initial={'campaign': campaign.id}, length = 5)
                 if request.method=='POST':
                     form = OperationForm(request.POST, initial={'campaign':campaign.id}, length = 5)
                     if form.is_valid():
                         return redirect('url_operation', id_camp=campaign.id)
                 #locations = Location.objects.filter(experiment__campaign__pk = campaign.id).distinct()
                 experiments = Experiment.objects.filter(campaign__pk=campaign.id)
                 #for exs in experiments:
                 #    exs.get_status()
                 locations= Location.objects.filter(experiment=experiments).distinct()
                 #experiments = [Experiment.objects.filter(location__pk=location.id).filter(campaign__pk=campaign.id) for location in locations]
                 kwargs = {}
                 #---Campaign
                 kwargs['campaign'] = campaign
                 kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
                 #---Experiment
                 keys = ['id', 'name', 'start_time', 'end_time', 'status']
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiments
                 #---Radar
                 kwargs['locations'] = locations
                 #---Else
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = campaign.name
                 kwargs['form'] = form
                 kwargs['button'] = 'Search'
                 kwargs['details'] = True
                 kwargs['search_button'] = True
                 return render(request, 'operation.html', kwargs)
             def operation_search(request, id_camp=None):
                 if not id_camp:
                     campaigns = Campaign.objects.all().order_by('-start_date')
                     if not campaigns:
                         return render(request, 'operation.html', {})
                     id_camp = campaigns[0].id
                 campaign = get_object_or_404(Campaign, pk = id_camp)
                 if request.method=='GET':
                     form = OperationSearchForm(initial={'campaign': campaign.id})
                 if request.method=='POST':
                     form = OperationSearchForm(request.POST, initial={'campaign':campaign.id})
                     if form.is_valid():
                         return redirect('url_operation', id_camp=campaign.id)
                 #locations = Location.objects.filter(experiment__campaign__pk = campaign.id).distinct()
                 experiments = Experiment.objects.filter(campaign__pk=campaign.id)
                 #for exs in experiments:
                 #    exs.get_status()
                 locations= Location.objects.filter(experiment=experiments).distinct()
                 form = OperationSearchForm(initial={'campaign': campaign.id})
                 kwargs = {}
                 #---Campaign
                 kwargs['campaign'] = campaign
                 kwargs['campaign_keys'] = ['name', 'start_date', 'end_date', 'tags', 'description']
                 #---Experiment
                 keys = ['id', 'name', 'start_time', 'end_time', 'status']
                 kwargs['experiment_keys'] = keys[1:]
                 kwargs['experiments'] = experiments
                 #---Radar
                 kwargs['locations'] = locations
                 #---Else
                 kwargs['title'] = 'Campaign'
                 kwargs['suptitle'] = campaign.name
                 kwargs['form'] = form
                 kwargs['button'] = 'Select'
                 kwargs['details'] = True
                 kwargs['search_button'] = False
                 return render(request, 'operation.html', kwargs)
             def radar_play(request, id_camp, id_radar):
                 campaign = get_object_or_404(Campaign, pk = id_camp)
                 radar = get_object_or_404(Location, pk = id_radar)
                 today = datetime.today()
                 now = today.time()
                 #--Clear Old Experiments From RunningExperiment Object
                 running_experiment = RunningExperiment.objects.filter(radar=radar)
                 if running_experiment:
                     running_experiment = running_experiment[0]
                     running_experiment.running_experiment.clear()
                     running_experiment.save()
                 #--If campaign datetime is ok:
                 if today >= campaign.start_date and today <= campaign.end_date:
                     experiments = Experiment.objects.filter(campaign=campaign).filter(location=radar)
                     for exp in experiments:
                         #--If experiment time is ok:
                         if now >= exp.start_time and now <= exp.end_time:
                             configurations =  Configuration.objects.filter(experiment = exp)
                             for conf in configurations:
                                 if 'cgs' in conf.device.device_type.name:
                                     conf.status_device()
                                 else:
                                     answer = conf.start_device()
                                     conf.status_device()
                                     #--Running Experiment
                                     old_running_experiment = RunningExperiment.objects.filter(radar=radar)
                                     #--If RunningExperiment element exists
                                     if old_running_experiment:
                                         old_running_experiment = old_running_experiment[0]
                                         old_running_experiment.running_experiment.add(exp)
                                         old_running_experiment.status = 3
                                         old_running_experiment.save()
                                     #--Create a new Running_Experiment Object
                                     else:
                                         new_running_experiment = RunningExperiment(
                                                                                radar = radar,
                                                                                status = 3,
                                                                                )
                                         new_running_experiment.save()
                                         new_running_experiment.running_experiment.add(exp)
                                         new_running_experiment.save()
                                     if answer:
                                         messages.success(request, conf.message)
                                         exp.status=2
                                         exp.save()
                                     else:
                                         messages.error(request, conf.message)
                         else:
                             if exp.status == 1 or exp.status == 3:
                                 exp.status=3
                                 exp.save()
                 route = request.META['HTTP_REFERER']
                 route = str(route)
                 if 'search' in route:
                     return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
                 else:
                     return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
             def radar_stop(request, id_camp, id_radar):
                 campaign = get_object_or_404(Campaign, pk = id_camp)
                 radar = get_object_or_404(Location, pk = id_radar)
                 experiments = Experiment.objects.filter(campaign=campaign).filter(location=radar)
                 for exp in experiments:
                     configurations =  Configuration.objects.filter(experiment = exp)
                     for conf in configurations:
                         if 'cgs' in conf.device.device_type.name:
                             conf.status_device()
                         else:
                             answer = conf.stop_device()
                             conf.status_device()
                             if answer:
                                 messages.success(request, conf.message)
                                 exp.status=1
                                 exp.save()
                             else:
                                 messages.error(request, conf.message)
                 route = request.META['HTTP_REFERER']
                 route = str(route)
                 if 'search' in route:
                     return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
                 else:
                     return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))
             def radar_refresh(request, id_camp, id_radar):
                 campaign = get_object_or_404(Campaign, pk = id_camp)
                 radar = get_object_or_404(Location, pk = id_radar)
                 experiments = Experiment.objects.filter(campaign=campaign).filter(location=radar)
                 for exs in experiments:
                     exs.get_status()
                 route = request.META['HTTP_REFERER']
                 route = str(route)
                 if 'search' in route:
                     return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
                 else:
                     return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

apps/rc/forms.py +5 -3

             import os
             import ast
             import json
             from django import forms
             from django.utils.safestring import mark_safe
             from apps.main.models import Device
             from apps.main.forms import add_empty_choice
             from .models import RCConfiguration, RCLine, RCLineType, RCLineCode
             from .widgets import KmUnitWidget, KmUnitHzWidget, KmUnitDcWidget, UnitKmWidget, DefaultWidget, CodesWidget, HiddenWidget, HCheckboxSelectMultiple
             def create_choices_from_model(model, conf_id, all=False):
                 if model=='RCLine':
                     instance = RCConfiguration.objects.get(pk=conf_id)
                     choices =  [(line.pk, line.get_name()) for line in instance.get_lines(line_type__name='tx')]
                     choices = add_empty_choice(choices, label='All')
                 else:
                     instance = globals()[model]
                     choices = instance.objects.all().values_list('pk', 'name')
                 return choices
             class ExtFileField(forms.FileField):
                 """
                 Same as forms.FileField, but you can specify a file extension whitelist.
                 >>> from django.core.files.uploadedfile import SimpleUploadedFile
                 >>>
                 >>> t = ExtFileField(ext_whitelist=(".pdf", ".txt"))
                 >>>
                 >>> t.clean(SimpleUploadedFile('filename.pdf', 'Some File Content'))
                 >>> t.clean(SimpleUploadedFile('filename.txt', 'Some File Content'))
                 >>>
                 >>> t.clean(SimpleUploadedFile('filename.exe', 'Some File Content'))
                 Traceback (most recent call last):
                 ...
                 ValidationError: [u'Not allowed filetype!']
                 """
                 def __init__(self, *args, **kwargs):
                     extensions = kwargs.pop("extensions")
                     self.extensions = [i.lower() for i in extensions]
                     super(ExtFileField, self).__init__(*args, **kwargs)
                 def clean(self, *args, **kwargs):
                     data = super(ExtFileField, self).clean(*args, **kwargs)
                     filename = data.name
                     ext = os.path.splitext(filename)[1]
                     ext = ext.lower()
                     if ext not in self.extensions:
                         raise forms.ValidationError('Not allowed file type: %s' % ext)
             class RCConfigurationForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(RCConfigurationForm, self).__init__(*args, **kwargs)
                     instance = getattr(self, 'instance', None)
                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='rc')
                         if instance.experiment:
                             self.fields['experiment'].widget.attrs['read_only'] = True
                             #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
                         self.fields['device'].widget.choices = [(device.id, device) for device in devices]
                         self.fields['ipp'].widget = KmUnitHzWidget(attrs={'km2unit':instance.km2unit})
                         self.fields['clock'].widget.attrs['readonly'] = True
                     self.fields['time_before'].label = mark_safe(self.fields['time_before'].label)
                     self.fields['time_after'].label = mark_safe(self.fields['time_after'].label)
                     if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
                         self.fields['experiment'].widget.attrs['disabled'] = 'disabled'
                 class Meta:
                     model = RCConfiguration
-                    exclude = ('type', 'parameters', 'status', 'mix')
+                    exclude = ('type', 'parameters', 'status', 'total_units', 'mix')
                 def clean(self):
                     form_data = super(RCConfigurationForm, self).clean()
                     if 'clock_divider' in form_data:
                         if form_data['clock_divider']<1:
                             self.add_error('clock_divider', 'Invalid Value')
                         else:
                             if form_data['ipp']*(20./3*(form_data['clock_in']/form_data['clock_divider']))%10<>0:
                                 self.add_error('ipp', 'Invalid IPP units={}'.format(form_data['ipp']*(20./3*(form_data['clock_in']/form_data['clock_divider']))))
                     return form_data
             class RCMixConfigurationForm(forms.Form):
                 clock_in = forms.CharField(widget=forms.HiddenInput())
                 clock_divider = forms.CharField(widget=forms.HiddenInput())
                 name = forms.CharField()
                 experiment = forms.ChoiceField()
+                mode = forms.ChoiceField(widget=forms.RadioSelect(),
+                                         choices=[(0, 'Parallel'), (1, 'Sequence')],
+                                         initial=0)
                 operation = forms.ChoiceField(widget=forms.RadioSelect(),
                                               choices=[(0, 'OR'), (1, 'XOR'), (2, 'AND'), (3, 'NAND')],
                                               initial=1)
                 delay = forms.CharField()
                 mask = forms.MultipleChoiceField(choices=[(0, 'L1'),(1, 'L2'),(2, 'L3'),(3, 'L4'),(4, 'L5'),(5, 'L6'),(6, 'L7'),(7, 'L8')],
                                                  widget=HCheckboxSelectMultiple())
                 result = forms.CharField(required=False,
                                          widget=forms.Textarea(attrs={'readonly':True, 'rows':5, 'class':'tabuled'}))
                 def __init__(self, *args, **kwargs):
                     confs = kwargs.pop('confs', [])
                     if confs:
                         km2unit = confs[0].km2unit
                         clock_in = confs[0].clock_in
                         clock_divider = confs[0].clock_divider
                     else:
                         km2unit = clock_in = clock_divider = 0
                     super(RCMixConfigurationForm, self).__init__(*args, **kwargs)
                     self.fields['experiment'].choices = [(conf.pk, '{} | {}'.format(conf.pk, conf.name)) for conf in confs]
                     self.fields['delay'].widget = KmUnitWidget(attrs = {'km2unit':km2unit})
                     self.fields['clock_in'].initial = clock_in
                     self.fields['clock_divider'].initial = clock_divider
             class RCLineForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     self.extra_fields = kwargs.pop('extra_fields', [])
                     super(RCLineForm, self).__init__(*args, **kwargs)
                     if 'initial' in kwargs and 'line_type' in kwargs['initial']:
                         line_type = RCLineType.objects.get(pk=kwargs['initial']['line_type'])
                         if 'code_id' in kwargs['initial']:
                             model_initial = kwargs['initial']['code_id']
                         else:
                             model_initial = 0
                         params = json.loads(line_type.params)
                         for label, value in self.extra_fields.items():
                             if label=='params':
                                 continue
                             if 'model' in params[label]:
                                 self.fields[label] = forms.ChoiceField(choices=create_choices_from_model(params[label]['model'],
                                                                                                          kwargs['initial']['rc_configuration']),
                                                                        initial=model_initial)
                             else:
                                 if label=='codes' and 'code_id' in kwargs['initial']:
                                     self.fields[label] = forms.CharField(initial=RCLineCode.objects.get(pk=kwargs['initial']['code_id']).codes)
                                 else:
                                     self.fields[label] = forms.CharField(initial=value['value'])
                                 if label=='codes':
                                     self.fields[label].widget = CodesWidget()
                     if self.data:
                         line_type = RCLineType.objects.get(pk=self.data['line_type'])
                         if 'code_id' in self.data:
                             model_initial = self.data['code_id']
                         else:
                             model_initial = 0
                         params = json.loads(line_type.params)
                         for label, value in self.extra_fields.items():
                             if label=='params':
                                 continue
                             if 'model' in params[label]:
                                 self.fields[label] = forms.ChoiceField(choices=create_choices_from_model(params[label]['model'],
                                                                                                          self.data['rc_configuration']),
                                                                        initial=model_initial)
                             else:
                                 if label=='codes' and 'code' in self.data:
                                     self.fields[label] = forms.CharField(initial=self.data['codes'])
                                 else:
                                     self.fields[label] = forms.CharField(initial=self.data[label])
                                 if label=='codes':
                                     self.fields[label].widget = CodesWidget()
                 class Meta:
                     model = RCLine
                     fields = ('rc_configuration', 'line_type', 'channel')
                     widgets = {
                         'channel': forms.HiddenInput(),
                     }
                 def clean(self):
                     form_data = self.cleaned_data
                     if 'code' in self.data and self.data['TX_ref']=="0":
                         self.add_error('TX_ref', 'Choose a valid TX reference')
                     return form_data
                 def save(self):
                     line = super(RCLineForm, self).save()
                     #auto add channel
                     line.channel = RCLine.objects.filter(rc_configuration=line.rc_configuration).count()-1
                     #auto add position for TX, TR & CODE
                     if line.line_type.name in ('tx', ):
                         line.position = RCLine.objects.filter(rc_configuration=line.rc_configuration, line_type=line.line_type).count()-1
                     #save extra fields in params
                     params = {}
                     for label, value in self.extra_fields.items():
                         if label=='params':
                             params['params'] = []
                         elif label=='codes':
                             params[label] = [s for s in self.data[label].split('\r\n') if s]
                         else:
                             params[label] = self.data[label]
                     line.params = json.dumps(params)
                     line.save()
                     return
             class RCLineViewForm(forms.Form):
                 def __init__(self, *args, **kwargs):
                     extra_fields = kwargs.pop('extra_fields')
                     line = kwargs.pop('line')
                     subform = kwargs.pop('subform', False)
                     super(RCLineViewForm, self).__init__(*args, **kwargs)
                     if subform:
                         params = json.loads(line.line_type.params)['params']
                     else:
                         params = json.loads(line.line_type.params)
                     for label, value in extra_fields.items():
                         if label=='params':
                             continue
                         if 'ref' in label:
                             if value in (0, '0'):
                                 value = 'All'
                             else:
                                 value = RCLine.objects.get(pk=value).get_name()
                         elif label=='code':
                             value = RCLineCode.objects.get(pk=value).name
                         self.fields[label] = forms.CharField(initial=value)
                         if 'widget' in params[label]:
                             km2unit = line.rc_configuration.km2unit
                             if params[label]['widget']=='km':
                                 self.fields[label].widget = KmUnitWidget(attrs={'line':line, 'km2unit':km2unit, 'disabled':True})
                             elif params[label]['widget']=='unit':
                                 self.fields[label].widget = UnitKmWidget(attrs={'line':line, 'km2unit':km2unit, 'disabled':True})
                             elif params[label]['widget']=='dc':
                                 self.fields[label].widget = KmUnitDcWidget(attrs={'line':line, 'km2unit':km2unit, 'disabled':True})
                             elif params[label]['widget']=='codes':
                                 self.fields[label].widget = CodesWidget(attrs={'line':line, 'km2unit':km2unit, 'disabled':True})
                         else:
                             self.fields[label].widget = DefaultWidget(attrs={'disabled':True})
             class RCLineEditForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     extra_fields = kwargs.pop('extra_fields', [])
                     conf = kwargs.pop('conf', False)
                     line = kwargs.pop('line')
                     subform = kwargs.pop('subform', False)
                     super(RCLineEditForm, self).__init__(*args, **kwargs)
                     if subform is not False:
                         params = json.loads(line.line_type.params)['params']
                         count = subform
                     else:
                         params = json.loads(line.line_type.params)
                         count = -1
                     for label, value in extra_fields.items():
                         if label in ('params',):
                             continue
                         if 'help' in params[label]:
                             help_text = params[label]['help']
                         else:
                             help_text = ''
                         if 'model' in params[label]:
                             self.fields[label] = forms.ChoiceField(choices=create_choices_from_model(params[label]['model'], conf.id),
                                                         initial=value,
                                                         widget=forms.Select(attrs={'name':'%s|%s|%s' % (count, line.id, label)}),
                                                         help_text=help_text)
                         else:
                             self.fields[label] = forms.CharField(initial=value, help_text=help_text)
                             if label in ('code', ):
                                 self.fields[label].widget = HiddenWidget(attrs={'name':'%s|%s|%s' % (count, line.id, label)})
                             elif 'widget' in params[label]:
                                 km2unit = line.rc_configuration.km2unit
                                 if params[label]['widget']=='km':
                                     self.fields[label].widget = KmUnitWidget(attrs={'line':line, 'km2unit':km2unit, 'name':'%s|%s|%s' % (count, line.id, label)})
                                 elif params[label]['widget']=='unit':
                                     self.fields[label].widget = UnitKmWidget(attrs={'line':line, 'km2unit':km2unit, 'name':'%s|%s|%s' % (count, line.id, label)})
                                 elif params[label]['widget']=='dc':
                                     self.fields[label].widget = KmUnitDcWidget(attrs={'line':line, 'km2unit':km2unit, 'name':'%s|%s|%s' % (count, line.id, label)})
                                 elif params[label]['widget']=='codes':
                                     self.fields[label].widget = CodesWidget(attrs={'line':line, 'km2unit':km2unit, 'name':'%s|%s|%s' % (count, line.id, label)})
                             else:
                                 self.fields[label].widget = DefaultWidget(attrs={'name':'%s|%s|%s' % (count, line.id, label)})
                 class Meta:
                     model = RCLine
                     exclude = ('rc_configuration', 'line_type', 'channel', 'position', 'params', 'pulses')
             class RCSubLineEditForm(forms.Form):
                 def __init__(self, *args, **kwargs):
                     extra_fields = kwargs.pop('extra_fields')
                     count = kwargs.pop('count')
                     line = kwargs.pop('line')
                     super(RCSubLineEditForm, self).__init__(*args, **kwargs)
                     for label, value in extra_fields.items():
                         self.fields[label] = forms.CharField(initial=value,
                                                              widget=forms.TextInput(attrs={'name':'%s|%s|%s' % (count, line, label)}))
             class RCImportForm(forms.Form):
                 file_name = ExtFileField(extensions=['.racp', '.json', '.dat'])
             class RCLineCodesForm(forms.ModelForm):
                 def __init__(self, *args, **kwargs):
                     super(RCLineCodesForm, self).__init__(*args, **kwargs)
                     if 'initial' in kwargs:
                         self.fields['code'] = forms.ChoiceField(choices=RCLineCode.objects.all().values_list('pk', 'name'),
                                                                 initial=kwargs['initial']['code'])
                     if 'instance' in kwargs:
                         self.fields['code'] = forms.ChoiceField(choices=RCLineCode.objects.all().values_list('pk', 'name'),
                                                                 initial=kwargs['instance'].pk)
                     self.fields['codes'].widget = CodesWidget()
                 class Meta:
                     model = RCLineCode
                     exclude = ('name',)
   No newline at end of file

apps/rc/models.py +52 -28

             import ast
             import json
             import numpy as np
             from polymorphic import PolymorphicModel
             from django.db import models
             from django.core.urlresolvers import reverse
             from django.core.validators import MinValueValidator, MaxValueValidator
             from apps.main.models import Configuration
             from devices.rc import api
             from .utils import RCFile
             # Create your models here.
             LINE_TYPES = (
                 ('none', 'Not used'),
                 ('tr', 'Transmission/reception selector signal'),
                 ('tx', 'A modulating signal (Transmission pulse)'),
                 ('codes', 'BPSK modulating signal'),
                 ('windows', 'Sample window signal'),
                 ('sync', 'Synchronizing signal'),
                 ('flip', 'IPP related periodic signal'),
                 ('prog_pulses', 'Programmable pulse'),
                 ('mix', 'Mixed line'),
                 )
             SAMPLING_REFS = (
                 ('none', 'No Reference'),
                 ('first_baud', 'Middle of the first baud'),
                 ('sub_baud', 'Middle of the sub-baud')
                              )
             DAT_CMDS = {
                     # Pulse Design commands
                     'DISABLE' : 0, # Disables pulse generation
                     'ENABLE' : 24, # Enables pulse generation
                     'DELAY_START' : 40, # Write delay status to memory
                     'FLIP_START' : 48, # Write flip status to memory
                     'SAMPLING_PERIOD' : 64, # Establish Sampling Period
                     'TX_ONE' : 72, # Output '0' in line TX
                     'TX_ZERO' : 88, # Output '0' in line TX
                     'SW_ONE' : 104, # Output '0' in line SW
                     'SW_ZERO' : 112, # Output '1' in line SW
                     'RESTART': 120, # Restarts CR8 Firmware
                     'CONTINUE' : 253, # Function Unknown
                     # Commands available to new controllers
                     # In Pulse Design Executable, the clock divisor code is written as 12 at the start, but it should be written as code 22(below) just before the final enable.
                     'CLOCK_DIVISOR_INIT' : 12, # Specifies Clock Divisor. Legacy command, ignored in the actual .dat conversion
                     'CLOCK_DIVISOR_LAST' : 22, # Specifies Clock Divisor (default 60 if not included) syntax: 255,22 254,N-1.
                     'CLOCK_DIVIDER' : 8,
                         }
             class RCConfiguration(Configuration):
-                ipp = models.FloatField(verbose_name='Inter pulse period (Km)', validators=[MinValueValidator(1), MaxValueValidator(9000)], default=300)
+                ipp = models.FloatField(verbose_name='Inter pulse period [Km]', validators=[MinValueValidator(1), MaxValueValidator(9000)], default=300)
                 ntx = models.PositiveIntegerField(verbose_name='Number of TX', validators=[MinValueValidator(1), MaxValueValidator(300)], default=1)
-                clock_in = models.FloatField(verbose_name='Clock in (MHz)', validators=[MinValueValidator(1), MaxValueValidator(80)], default=1)
+                clock_in = models.FloatField(verbose_name='Clock in [MHz]', validators=[MinValueValidator(1), MaxValueValidator(80)], default=1)
                 clock_divider = models.PositiveIntegerField(verbose_name='Clock divider', validators=[MinValueValidator(1), MaxValueValidator(256)], default=1)
-                clock = models.FloatField(verbose_name='Clock Master (MHz)', blank=True, default=1)
+                clock = models.FloatField(verbose_name='Clock Master [MHz]', blank=True, default=1)
-                time_before = models.PositiveIntegerField(verbose_name='Time before (&mu;S)', default=12)
+                time_before = models.PositiveIntegerField(verbose_name='Time before [&mu;S]', default=12)
-                time_after = models.PositiveIntegerField(verbose_name='Time after (&mu;S)', default=1)
+                time_after = models.PositiveIntegerField(verbose_name='Time after [&mu;S]', default=1)
                 sync = models.PositiveIntegerField(verbose_name='Synchro delay', default=0)
                 sampling_reference = models.CharField(verbose_name='Sampling Reference', choices=SAMPLING_REFS, default='none', max_length=40)
                 control_tx = models.BooleanField(verbose_name='Control Switch TX', default=False)
                 control_sw = models.BooleanField(verbose_name='Control Switch SW', default=False)
+                total_units = models.PositiveIntegerField(default=0)
                 mix = models.BooleanField(default=False)
                 class Meta:
                     db_table = 'rc_configurations'
                 def __unicode__(self):
                     if self.mix:
                         return u'[MIXED]: %s' % self.name
                     else:
                         return u'[%s]: %s' % (self.device.name, self.name)
                 def get_absolute_url_plot(self):
                     return reverse('url_plot_rc_pulses', args=[str(self.id)])
                 def get_absolute_url_import(self):
                     return reverse('url_import_rc_conf', args=[str(self.id)])
                 @property
+                def ipp_unit(self):
+                    return '{} ({})'.format(self.ipp, int(self.ipp*self.km2unit))
+                @property
                 def us2unit(self):
                     return self.clock_in/self.clock_divider
                 @property
                 def km2unit(self):
                     return 20./3*(self.clock_in/self.clock_divider)
                 def clone(self, **kwargs):
                     lines = self.get_lines()
                     self.pk = None
                     self.id = None
                     for attr, value in kwargs.items():
                         setattr(self, attr, value)
                     self.save()
                     for line in lines:
                         line.clone(rc_configuration=self)
                     return self
                 def get_lines(self, **kwargs):
                     '''
                     Retrieve configuration lines
                     '''
                     return RCLine.objects.filter(rc_configuration=self.pk, **kwargs)
                 def clean_lines(self):
                     '''
                     '''
                     empty_line = RCLineType.objects.get(name='none')
                     for line in self.get_lines():
                         line.line_type = empty_line
                         line.params = '{}'
                         line.save()
                 def parms_to_dict(self):
                     '''
                     '''
                     ignored = ('parameters', 'type', 'polymorphic_ctype', 'configuration_ptr',
                                'created_date', 'programmed_date')
                     data = {}
                     for field in self._meta.fields:
                         if field.name in ignored:
                             continue
                         data[field.name] = '{}'.format(field.value_from_object(self))
                     data['lines'] = []
                     for line in self.get_lines():
                         line_data = json.loads(line.params)
                         if 'TX_ref' in line_data and line_data['TX_ref'] not in (0, '0'):
                             line_data['TX_ref'] = RCLine.objects.get(pk=line_data['TX_ref']).get_name()
                         if 'code' in line_data:
                             line_data['code'] = RCLineCode.objects.get(pk=line_data['code']).name
                         line_data['type'] = line.line_type.name
                         data['lines'].append(line_data)
                     data['delays'] = self.get_delays()
                     data['pulses'] = self.get_pulses()
                     return data
                 def dict_to_parms(self, data):
                     '''
                     '''
                     self.name = data['name']
                     self.ipp = data['ipp']
                     self.ntx = data['ntx']
                     self.clock_in = data['clock_in']
                     self.clock_divider = data['clock_divider']
                     self.clock = data['clock']
                     self.time_before = data['time_before']
                     self.time_after = data['time_after']
                     self.sync = data['sync']
                     self.sampling_reference = data['sampling_reference']
                     self.clean_lines()
                     lines = []
                     positions = {'tx':0, 'tr':0}
                     for i, line_data in enumerate(data['lines']):
                         line_type = RCLineType.objects.get(name=line_data.pop('type'))
                         if line_type.name=='codes':
                             code = RCLineCode.objects.get(name=line_data['code'])
                             line_data['code'] = code.pk
                         line = RCLine.objects.filter(rc_configuration=self, channel=i)
                         if line:
                             line = line[0]
                             line.line_type = line_type
                             line.params = json.dumps(line_data)
                         else:
                             line = RCLine(rc_configuration=self, line_type=line_type,
                                           params=json.dumps(line_data),
                                           channel=i)
                         if line_type.name=='tx':
                             line.position = positions['tx']
                             positions['tx'] += 1
                         if line_type.name=='tr':
                             line.position = positions['tr']
                             positions['tr'] += 1
                         line.save()
                         lines.append(line)
                     for line, line_data in zip(lines, data['lines']):
                         if 'TX_ref' in line_data:
                             params = json.loads(line.params)
                             if line_data['TX_ref'] in (0, '0'):
                                 params['TX_ref'] = '0'
                             else:
                                 params['TX_ref'] = [l.pk for l in lines if l.line_type.name=='tx' and l.get_name()==line_data['TX_ref']][0]
                             line.params = json.dumps(params)
                             line.save()
                 def get_delays(self):
                     pulses = [line.pulses_as_points() for line in self.get_lines()]
                     points = [tup for tups in pulses for tup in tups]
                     points = set([x for tup in points for x in tup])
                     points = list(points)
                     points.sort()
                     if points[0]<>0:
                         points.insert(0, 0)
                     return [points[i+1]-points[i] for i in range(len(points)-1)]
                 def get_pulses(self, binary=True):
                     pulses = [line.pulses_as_points() for line in self.get_lines()]
                     points = [tup for tups in pulses for tup in tups]
                     points = set([x for tup in points for x in tup])
                     points = list(points)
                     points.sort()
                     line_points = [line.pulses_as_points() for line in self.get_lines()]
                     line_points = [[(x, x+y) for x,y in tups] for tups in line_points]
                     line_points = [[t for x in tups for t in x] for tups in line_points]
                     states = [[1 if x in tups else 0 for tups in line_points] for x in points]
                     if binary:
                         states.reverse()
                         states = [int(''.join([str(x) for x in flips]), 2) for flips in states]
                     return states[:-1]
                 def add_cmd(self, cmd):
                     if cmd in DAT_CMDS:
                         return (255, DAT_CMDS[cmd])
                 def add_data(self, value):
                     return (254, value-1)
                 def parms_to_binary(self):
                     '''
                     Create "dat" stream to be send to CR
                     '''
                     data = []
                     # create header
                     data.append(self.add_cmd('DISABLE'))
                     data.append(self.add_cmd('CONTINUE'))
                     data.append(self.add_cmd('RESTART'))
                     if self.control_sw:
                         data.append(self.add_cmd('SW_ONE'))
                     else:
                         data.append(self.add_cmd('SW_ZERO'))
                     if self.control_tx:
                         data.append(self.add_cmd('TX_ONE'))
                     else:
                         data.append(self.add_cmd('TX_ZERO'))
                     # write divider
                     data.append(self.add_cmd('CLOCK_DIVIDER'))
                     data.append(self.add_data(self.clock_divider))
                     # write delays
                     data.append(self.add_cmd('DELAY_START'))
                     # first delay is always zero
                     data.append(self.add_data(1))
                     delays = self.get_delays()
                     for delay in delays:
                         while delay>252:
                             data.append(self.add_data(253))
                             delay -= 253
                         data.append(self.add_data(delay))
                     # write flips
                     data.append(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))
                         while delay>252:
                             data.append(self.add_data(1))
                             delay -= 253
                     # write sampling period
                     data.append(self.add_cmd('SAMPLING_PERIOD'))
                     wins = self.get_lines(line_type__name='windows')
                     if wins:
                         win_params = json.loads(wins[0].params)['params']
                         if win_params:
                             dh = int(win_params[0]['resolution']*self.km2unit)
                         else:
                             dh = 1
                     else:
                         dh = 1
                     data.append(self.add_data(dh))
                     # write enable
                     data.append(self.add_cmd('ENABLE'))
                     return '\n'.join(['{}'.format(x) for tup in data for x in tup])
                 def update_from_file(self, filename):
                     '''
                     Update instance from file
                     '''
                     f = RCFile(filename)
                     self.dict_to_parms(f.data)
                     self.update_pulses()
-                    self.save()
                 def update_pulses(self):
                     for line in self.get_lines():
                         line.update_pulses()
                 def plot_pulses(self):
                     import matplotlib.pyplot as plt
                     from bokeh.resources import CDN
                     from bokeh.embed import components
                     from bokeh.mpl import to_bokeh
                     from bokeh.models.tools import WheelZoomTool, ResetTool, PanTool, PreviewSaveTool
                     lines = self.get_lines()
-                    max_value = self.ipp*self.km2unit*self.ntx
                     N = len(lines)
                     fig = plt.figure(figsize=(10, 2+N*0.5))
                     ax = fig.add_subplot(111)
                     labels = []
                     for i, line in enumerate(lines):
                         labels.append(line.get_name())
-                        l = ax.plot((0, max_value),(N-i-1, N-i-1))
+                        l = ax.plot((0, self.total_units),(N-i-1, N-i-1))
                         points = [(tup[0], tup[1]-tup[0]) for tup in line.pulses_as_points() if tup<>(0,0)]
                         ax.broken_barh(points, (N-i-1, 0.5),
                                        edgecolor=l[0].get_color(), facecolor='none')
                     labels.reverse()
                     ax.set_yticklabels(labels)
                     plot = to_bokeh(fig, use_pandas=False)
                     plot.tools = [PanTool(dimensions=['width']), WheelZoomTool(dimensions=['width']), ResetTool(), PreviewSaveTool()]
                     return components(plot, CDN)
                 def status_device(self):
                     return 0
                 def stop_device(self):
                     answer = api.disable(ip = self.device.ip_address,
                                          port = self.device.port_address)
                     if answer[0] != "1":
                         self.message = answer[0:]
                         return 0
                     self.message = answer[2:]
                     return 1
                 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:]
                         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:]
                         return 0
                     self.message = answer[2:]
                     return 1
             class RCLineCode(models.Model):
                 name = models.CharField(max_length=40)
                 bits_per_code = models.PositiveIntegerField(default=0)
                 number_of_codes = models.PositiveIntegerField(default=0)
                 codes = models.TextField(blank=True, null=True)
                 class Meta:
                     db_table = 'rc_line_codes'
                     ordering = ('name',)
                 def __unicode__(self):
                     return u'%s' % self.name
             class RCLineType(models.Model):
                 name = models.CharField(choices=LINE_TYPES, max_length=40)
                 description = models.TextField(blank=True, null=True)
                 params = models.TextField(default='[]')
                 class Meta:
                     db_table = 'rc_line_types'
                 def __unicode__(self):
                     return u'%s - %s' % (self.name.upper(), self.get_name_display())
             class RCLine(models.Model):
                 rc_configuration = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE)
                 line_type = models.ForeignKey(RCLineType)
                 channel = models.PositiveIntegerField(default=0)
                 position = models.PositiveIntegerField(default=0)
                 params = models.TextField(default='{}')
                 pulses = models.TextField(default='')
                 class Meta:
                     db_table = 'rc_lines'
                     ordering = ['channel']
                 def __unicode__(self):
                     if self.rc_configuration:
                         return u'%s - %s' % (self.rc_configuration, self.get_name())
                 def clone(self, **kwargs):
                     self.pk = None
                     for attr, value in kwargs.items():
                         setattr(self, attr, value)
                     self.save()
                     return self
                 def get_name(self):
                     chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
                     s = ''
                     if self.line_type.name in ('tx',):
                         s = chars[self.position]
                     elif self.line_type.name in ('codes', 'windows', 'tr'):
                         if 'TX_ref' in json.loads(self.params):
                             pk = json.loads(self.params)['TX_ref']
                             if pk in (0, '0'):
                                 s = ','.join(chars[l.position] for l in self.rc_configuration.get_lines(line_type__name='tx'))
                             else:
                                 ref = RCLine.objects.get(pk=pk)
                                 s = chars[ref.position]
                     if s:
                         return '{}({}) {}'.format(self.line_type.name.upper(), s, self.channel)
                     else:
                         return '{} {}'.format(self.line_type.name.upper(), self.channel)
                 def get_lines(self, **kwargs):
                     return RCLine.objects.filter(rc_configuration=self.rc_configuration, **kwargs)
                 def pulses_as_array(self):
-                    y = np.zeros(self.rc_configuration.ntx*self.rc_configuration.ipp*self.rc_configuration.km2unit)
+                    y = np.zeros(self.rc_configuration.total_units)
                     for tup in ast.literal_eval(self.pulses):
                         y[tup[0]:tup[1]] = 1
                     return y.astype(np.int8)
                 def pulses_as_points(self):
                     return ast.literal_eval(self.pulses)
                 def get_win_ref(self, params, tx_id, km2unit):
                     ref = self.rc_configuration.sampling_reference
                     codes = [line for line in self.get_lines(line_type__name='codes') if int(json.loads(line.params)['TX_ref'])==int(tx_id)]
                     if codes:
                         tx_width = float(json.loads(RCLine.objects.get(pk=tx_id).params)['pulse_width'])*km2unit/len(json.loads(codes[0].params)['codes'][0])
                     else:
                         tx_width = float(json.loads(RCLine.objects.get(pk=tx_id).params)['pulse_width'])*km2unit
                     if ref=='first_baud':
                         return int(1 + (tx_width + 1)/2 + params['first_height']*km2unit - params['resolution']*km2unit)
                     elif ref=='sub_baud':
                         return int(1 + params['first_height']*km2unit - params['resolution']*km2unit/2)
                     else:
                         return 0
                 def update_pulses(self):
                     '''
                     Update pulses field
                     '''
                     km2unit = self.rc_configuration.km2unit
                     us2unit = self.rc_configuration.us2unit
                     ipp = self.rc_configuration.ipp
                     ntx = self.rc_configuration.ntx
                     ipp_u = int(ipp*km2unit)
+                    total = ipp_u*ntx
                     y = []
                     if self.line_type.name=='tr':
                         tr_params = json.loads(self.params)
                         if tr_params['TX_ref'] in ('0', 0):
                             txs = self.get_lines(line_type__name='tx')
                         else:
                             txs = [RCLine.objects.filter(pk=tr_params['TX_ref'])]
                         for tx in txs:
                             params = json.loads(tx.params)
                             if float(params['pulse_width'])==0:
                                 continue
                             delays = [float(d)*km2unit for d in params['delays'].split(',') if d]
                             width = float(params['pulse_width'])*km2unit+int(self.rc_configuration.time_before*us2unit)
                             before = 0
                             after = int(self.rc_configuration.time_after*us2unit)
                             y_tx = self.points(ntx, ipp_u, width,
                                                delay=delays,
                                                before=before,
                                                after=after,
                                                sync=self.rc_configuration.sync)
                             ranges = params['range'].split(',')
                             if len(ranges)>0 and ranges[0]<>'0':
                                 y_tx = self.mask_ranges(y_tx, ranges)
                             tr_ranges = tr_params['range'].split(',')
                             if len(tr_ranges)>0 and tr_ranges[0]<>'0':
                                 y_tx = self.mask_ranges(y_tx, tr_ranges)
                             y.extend(y_tx)
                     elif self.line_type.name=='tx':
                         params = json.loads(self.params)
                         delays = [float(d)*km2unit for d in params['delays'].split(',') if d]
                         width = float(params['pulse_width'])*km2unit
                         if width>0:
                             before = int(self.rc_configuration.time_before*us2unit)
                             after = 0
                             y = self.points(ntx, ipp_u, width,
                                             delay=delays,
                                             before=before,
                                             after=after,
                                             sync=self.rc_configuration.sync)
                             ranges = params['range'].split(',')
                             if len(ranges)>0 and ranges[0]<>'0':
                                 y = self.mask_ranges(y, ranges)
                     elif self.line_type.name=='flip':
                         n = float(json.loads(self.params)['number_of_flips'])
                         width = n*ipp*km2unit
                         y = self.points(int((ntx+1)/(2*n)), ipp_u*n*2, width)
                     elif self.line_type.name=='codes':
                         params = json.loads(self.params)
                         tx = RCLine.objects.get(pk=params['TX_ref'])
                         tx_params = json.loads(tx.params)
                         delays = [float(d)*km2unit for d in tx_params['delays'].split(',') if d]
                         f = int(float(tx_params['pulse_width'])*km2unit)/len(params['codes'][0])
                         codes = [(np.fromstring(''.join([s*f for s in code]), dtype=np.uint8)-48).astype(np.int8) for code in params['codes']]
                         codes = [self.array_to_points(code) for code in codes]
                         n = len(codes)
                         for i, tup in enumerate(tx.pulses_as_points()):
                             code = codes[i%n]
                             y.extend([(c[0]+tup[0], c[1]+tup[0]) for c in code])
                         ranges = tx_params['range'].split(',')
                         if len(ranges)>0 and ranges[0]<>'0':
                             y = self.mask_ranges(y, ranges)
                     elif self.line_type.name=='sync':
                         params = json.loads(self.params)
                         n = ipp_u*ntx
                         if params['invert'] in ('1', 1):
                             y = [(n-1, n)]
                         else:
                             y = [(0, 1)]
                     elif self.line_type.name=='prog_pulses':
                         params = json.loads(self.params)
                         if int(params['periodic'])==0:
                             nntx = 1
                             nipp = ipp_u*ntx
                         else:
                             nntx = ntx
                             nipp = ipp_u
                         if 'params' in params and len(params['params'])>0:
                             for p in params['params']:
                                 y_pp = self.points(nntx, nipp,
                                                    p['end']-p['begin'],
                                                    before=p['begin'])
                                 y.extend(y_pp)
                     elif self.line_type.name=='windows':
                         params = json.loads(self.params)
                         if 'params' in params and len(params['params'])>0:
                             tr_params = json.loads(self.get_lines(line_type__name='tr')[0].params)
                             tr_ranges = tr_params['range'].split(',')
                             for p in params['params']:
                                 y_win = self.points(ntx, ipp_u,
                                                     p['resolution']*p['number_of_samples']*km2unit,
                                                     before=int(self.rc_configuration.time_before*us2unit)+self.get_win_ref(p, params['TX_ref'], km2unit),
                                                     sync=self.rc_configuration.sync)
                                 if len(tr_ranges)>0 and tr_ranges[0]<>'0':
                                     y_win = self.mask_ranges(y_win, tr_ranges)
                                 y.extend(y_win)
                     elif self.line_type.name=='mix':
                         values = self.rc_configuration.parameters.split('-')
                         confs = RCConfiguration.objects.filter(pk__in=[value.split('|')[0] for value in values])
                         modes = [value.split('|')[1] for value in values]
-                        delays = [value.split('|')[2] for value in values]
+                        ops = [value.split('|')[2] for value in values]
-                        masks = [value.split('|')[3] for value in values]
+                        delays = [value.split('|')[3] for value in values]
+                        masks = [value.split('|')[4] for value in values]
+                        mask = list('{:8b}'.format(int(masks[0])))
+                        mask.reverse()
+                        if mask[self.channel] in ('0', '', ' '):
+                            y = np.zeros(total, dtype=np.int8)
+                        else:
+                            y = confs[0].get_lines(channel=self.channel)[0].pulses_as_array()
-                        y = confs[0].get_lines(channel=self.channel)[0].pulses_as_array()
-                        ysize = len(y)
                         for i in range(1, len(values)):
                             mask = list('{:8b}'.format(int(masks[i])))
                             mask.reverse()
                             if mask[self.channel] in ('0', '', ' '):
                                 continue
                             Y = confs[i].get_lines(channel=self.channel)[0].pulses_as_array()
                             delay = float(delays[i])*km2unit
-                            if delay>0:
-                                y_temp = np.empty_like(Y)
+                            if delay>0:
-                                y_temp[:delay] = 0
+                                if delay<self.rc_configuration.ipp*km2unit and len(Y)==len(y):
-                                y_temp[delay:] = Y[:-delay]
+                                    y_temp = np.empty_like(Y)
-                            y_tempsize = len(y_temp)
+                                    y_temp[:delay] = 0
-                            if modes[i]=='OR':
+                                    y_temp[delay:] = Y[:-delay]
+                                elif delay+len(Y)>len(y):
+                                    y_new = np.zeros(delay+len(Y), dtype=np.int8)
+                                    y_new[:len(y)] = y
+                                    y = y_new
+                                    y_temp = np.zeros(delay+len(Y), dtype=np.int8)
+                                    y_temp[-len(Y):] = Y
+                                elif delay+len(Y)==len(y):
+                                    y_temp = np.zeros(delay+len(Y))
+                                    y_temp[-len(Y):] = Y
+                            if ops[i]=='OR':
                                 y = y | y_temp
-                            elif modes[i]=='XOR':
+                            elif ops[i]=='XOR':
                                 y = y ^ y_temp
-                            elif modes[i]=='AND':
+                            elif ops[i]=='AND':
                                 y = y & y_temp
-                            elif modes[i]=='NAND':
+                            elif ops[i]=='NAND':
                                 y = y & ~y_temp
+                        total = len(y)
                         y = self.array_to_points(y)
                     else:
                         y = []
+                    if self.rc_configuration.total_units <> total:
+                        self.rc_configuration.total_units = total
+                        self.rc_configuration.save()
                     self.pulses = y
                     self.save()
                 @staticmethod
                 def array_to_points(X):
                     d = X[1:]-X[:-1]
                     up = np.where(d==1)[0]
                     if X[0]==1:
                         up = np.concatenate((np.array([-1]), up))
                     up += 1
                     dw = np.where(d==-1)[0]
                     if X[-1]==1:
                         dw = np.concatenate((dw, np.array([len(X)-1])))
                     dw += 1
                     return [(tup[0], tup[1]) for tup in zip(up, dw)]
                 @staticmethod
                 def mask_ranges(Y, ranges):
                     y = [(0, 0) for __ in Y]
                     for index in ranges:
                         if '-' in index:
                             args = [int(a) for a in index.split('-')]
                             y[args[0]-1:args[1]] = Y[args[0]-1:args[1]]
                         else:
                             y[int(index-1)] = Y[int(index-1)]
                     return y
                 @staticmethod
                 def points(ntx, ipp, width, delay=[0], before=0, after=0, sync=0):
                     delays = len(delay)
                     Y = [(ipp*x+before+delay[x%delays], ipp*x+width+before+delay[x%delays]+after) for x in range(ntx)]
                     return Y

apps/rc/views.py +2 -2

             import json
             from django.contrib import messages
             from django.utils.safestring import mark_safe
             from django.shortcuts import render, redirect, get_object_or_404, HttpResponse
             from apps.main.models import Configuration, Experiment, Device
             from apps.main.views import sidebar
             from .models import RCConfiguration, RCLine, RCLineType, RCLineCode
             from .forms import RCConfigurationForm, RCLineForm, RCLineViewForm, RCLineEditForm, RCImportForm, RCLineCodesForm
             def conf(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
                 for line in lines:
                     params = json.loads(line.params)
                     line.form = RCLineViewForm(extra_fields=params, line=line)
                     if 'params' in params:
                         line.subforms = [RCLineViewForm(extra_fields=fields, line=line, subform=True) for fields in params['params']]
                 kwargs = {}
                 kwargs['dev_conf'] = conf
                 kwargs['rc_lines'] = lines
-                kwargs['dev_conf_keys'] = ['name', 'ipp', 'ntx', 'clock_in', 'clock_divider', 'clock',
+                kwargs['dev_conf_keys'] = ['name', 'ipp_unit', 'ntx', 'clock_in', 'clock_divider', 'clock',
                                            'time_before', 'time_after', 'sync', 'sampling_reference', 'control_tx', 'control_sw']
                 kwargs['title'] = 'RC Configuration'
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Edit Configuration'
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(conf=conf))
                 return render(request, 'rc_conf.html', kwargs)
             def conf_edit(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
                 for line in lines:
                     params = json.loads(line.params)
                     line.form = RCLineEditForm(conf=conf, line=line, extra_fields=params)
                     line.subform = False
                     if 'params' in params:
                         line.subforms = [RCLineEditForm(extra_fields=fields, line=line, subform=i) for i, fields in enumerate(params['params'])]
                         line.subform = True
                 if request.method=='GET':
                     form = RCConfigurationForm(instance=conf)
                 elif request.method=='POST':
                     line_data = {}
                     conf_data = {}
                     extras = []
                     #classified post fields
                     for label,value in request.POST.items():
                         if label=='csrfmiddlewaretoken':
                             continue
                         if label.count('|')==0:
                             conf_data[label] = value
                             continue
                         elif label.split('|')[0]<>'-1':
                             extras.append(label)
                             continue
                         x, pk, name = label.split('|')
                         if name=='codes':
                             value = [s for s in value.split('\r\n') if s]
                         if pk in line_data:
                             line_data[pk][name] = value
                         else:
                             line_data[pk] = {name:value}
                     #update conf
                     form = RCConfigurationForm(conf_data, instance=conf)
                     if form.is_valid():
                         form.save()
                         #update lines fields
                         extras.sort()
                         for label in extras:
                             x, pk, name = label.split('|')
                             if pk not in line_data:
                                 line_data[pk] = {}
                             if 'params' not in line_data[pk]:
                                 line_data[pk]['params'] = []
                             if len(line_data[pk]['params'])<int(x)+1:
                                 line_data[pk]['params'].append({})
                             line_data[pk]['params'][int(x)][name] = float(request.POST[label])
                         for pk, params in line_data.items():
                             line = RCLine.objects.get(pk=pk)
                             if line.line_type.name in ('windows', 'prog_pulses'):
                                 if 'params' not in params:
                                     params['params'] = []
                             line.params = json.dumps(params)
                             line.save()
                         #update pulses field
                         conf.update_pulses()
                         messages.success(request, 'RC Configuration successfully updated')
                         return redirect(conf.get_absolute_url())
                 kwargs = {}
                 kwargs['dev_conf'] = conf
                 kwargs['form'] = form
                 kwargs['rc_lines'] = lines
                 kwargs['edit'] = True
                 kwargs['title'] = 'RC Configuration'
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 kwargs['previous'] = conf.get_absolute_url()
                 return render(request, 'rc_conf_edit.html', kwargs)
             def add_line(request, conf_id, line_type_id=None, code_id=None):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 if request.method=='GET':
                     if line_type_id:
                         line_type = get_object_or_404(RCLineType, pk=line_type_id)
                         if code_id:
                             form = RCLineForm(initial={'rc_configuration':conf_id, 'line_type': line_type_id, 'code_id': code_id},
                                               extra_fields=json.loads(line_type.params))
                         else:
                             form = RCLineForm(initial={'rc_configuration':conf_id, 'line_type': line_type_id},
                                               extra_fields=json.loads(line_type.params))
                     else:
                         line_type = {'id':0}
                         form = RCLineForm(initial={'rc_configuration':conf_id})
                 if request.method=='POST':
                     line_type = get_object_or_404(RCLineType, pk=line_type_id)
                     form = RCLineForm(request.POST,
                                       extra_fields=json.loads(line_type.params))
                     if form.is_valid():
                         form.save()
                         form.instance.update_pulses()
                         return redirect('url_edit_rc_conf', conf.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'RC Configuration'
                 kwargs['suptitle'] = 'Add Line'
                 kwargs['button'] = 'Add'
                 kwargs['previous'] = conf.get_absolute_url_edit()
                 kwargs['dev_conf'] = conf
                 kwargs['line_type'] = line_type
                 return render(request, 'rc_add_line.html', kwargs)
             def edit_codes(request, conf_id, line_id, code_id=None):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 line = get_object_or_404(RCLine, pk=line_id)
                 params = json.loads(line.params)
                 if request.method=='GET':
                     if code_id:
                         code = get_object_or_404(RCLineCode, pk=code_id)
                         form = RCLineCodesForm(instance=code)
                     else:
                         initial = {'code': params['code'],
                                    'codes': params['codes'] if 'codes' in params else [],
                                    'number_of_codes': len(params['codes']) if 'codes' in params else 0,
                                    'bits_per_code': len(params['codes'][0]) if 'codes' in params else 0,
                                    }
                         form = RCLineCodesForm(initial=initial)
                 if request.method=='POST':
                     form = RCLineCodesForm(request.POST)
                     if form.is_valid():
                         params['code'] = request.POST['code']
                         params['codes'] = [s for s in request.POST['codes'].split('\r\n') if s]
                         line.params = json.dumps(params)
                         line.save()
                         messages.success(request, 'Line: "%s" has been updated.'  % line)
                         return redirect('url_edit_rc_conf', conf.id)
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = line
                 kwargs['suptitle'] = 'Edit'
                 kwargs['button'] = 'Update'
                 kwargs['dev_conf'] = conf
                 kwargs['previous'] = conf.get_absolute_url_edit()
                 kwargs['line'] = line
                 return render(request, 'rc_edit_codes.html', kwargs)
             def add_subline(request, conf_id, line_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 line = get_object_or_404(RCLine, pk=line_id)
                 if request.method == 'POST':
                     if line:
                         params = json.loads(line.params)
                         subparams = json.loads(line.line_type.params)
                         if 'params' in subparams:
                             dum = {}
                             for key, value in subparams['params'].items():
                                 dum[key] = value['value']
                             params['params'].append(dum)
                             line.params = json.dumps(params)
                             line.save()
                         return redirect('url_edit_rc_conf', conf.id)
                 kwargs = {}
                 kwargs['title'] = 'Add new'
                 kwargs['suptitle'] = '%s to %s' % (line.line_type.name, line)
                 return render(request, 'confirm.html', kwargs)
             def remove_line(request, conf_id, line_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 line = get_object_or_404(RCLine, pk=line_id)
                 if request.method == 'POST':
                     if line:
                         try:
                             channel = line.channel
                             line.delete()
                             for ch in range(channel+1, RCLine.objects.filter(rc_configuration=conf).count()+1):
                                 l = RCLine.objects.get(rc_configuration=conf, channel=ch)
                                 l.channel = l.channel-1
                                 l.save()
                             messages.success(request, 'Line: "%s" has been deleted.'  % line)
                         except:
                             messages.error(request, 'Unable to delete line: "%s".' % line)
                     return redirect('url_edit_rc_conf', conf.id)
                 kwargs = {}
                 kwargs['object'] = line
                 kwargs['delete_view'] = True
                 kwargs['title'] = 'Confirm delete'
                 kwargs['previous'] = conf.get_absolute_url_edit()
                 return render(request, 'confirm.html', kwargs)
             def remove_subline(request, conf_id, line_id, subline_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 line = get_object_or_404(RCLine, pk=line_id)
                 if request.method == 'POST':
                     if line:
                         params = json.loads(line.params)
                         params['params'].remove(params['params'][int(subline_id)-1])
                         line.params = json.dumps(params)
                         line.save()
                         return redirect('url_edit_rc_conf', conf.id)
                 kwargs = {}
                 kwargs['object'] = line
                 kwargs['object_name'] = line.line_type.name
                 kwargs['delete_view'] = True
                 kwargs['title'] = 'Confirm delete'
                 return render(request, 'confirm.html', kwargs)
             def update_lines_position(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 if request.method=='POST':
                     ch = 0
                     for item in request.POST['items'].split('&'):
                         line = RCLine.objects.get(pk=item.split('=')[-1])
                         line.channel = ch
                         line.save()
                         ch += 1
                     lines = RCLine.objects.filter(rc_configuration=conf).order_by('channel')
                     for line in lines:
                         params = json.loads(line.params)
                         line.form = RCLineEditForm(conf=conf, line=line, extra_fields=params)
                         if 'params' in params:
                             line.subform = True
                             line.subforms = [RCLineEditForm(extra_fields=fields, line=line, subform=i) for i, fields in enumerate(params['params'])]
                     html = render(request, 'rc_lines.html', {'dev_conf':conf, 'rc_lines':lines, 'edit':True})
                     data = {'html': html.content}
                     return HttpResponse(json.dumps(data), content_type="application/json")
                 return redirect('url_edit_rc_conf', conf.id)
             def import_file(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 if request.method=='POST':
                     form = RCImportForm(request.POST, request.FILES)
                     if form.is_valid():
                         try:
                             conf.update_from_file(request.FILES['file_name'])
                             messages.success(request, 'Configuration "%s" loaded succesfully' % request.FILES['file_name'])
                             return redirect(conf.get_absolute_url_edit())
                         except Exception as e:
                             messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], e))
                 else:
                     messages.warning(request, 'Your current configuration will be replaced')
                     form = RCImportForm()
                 kwargs = {}
                 kwargs['form'] = form
                 kwargs['title'] = 'RC Configuration'
                 kwargs['suptitle'] = 'Import file'
                 kwargs['button'] = 'Upload'
                 kwargs['previous'] = conf.get_absolute_url()
                 return render(request, 'rc_import.html', kwargs)
             def plot_pulses(request, conf_id):
                 conf = get_object_or_404(RCConfiguration, pk=conf_id)
                 script, div = conf.plot_pulses()
                 kwargs = {}
                 kwargs['title'] = 'RC Pulses'
                 kwargs['suptitle'] = conf.name
                 kwargs['div'] = mark_safe(div)
                 kwargs['script'] = mark_safe(script)
                 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)

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