radarsys Commit - r264:17ec69be4c00 · Jicamarca Repository

RC files have been updated...

Fiorella Quino -

r264:17ec69be4c00

parent child

Context file:

r264:17ec69be4c00

Collapse all files

apps/rc/forms.py +4 -4

                     if 'clock_divider' in form_data:
                         if form_data['clock_divider']<1:
                             self.add_error('clock_divider', 'Invalid Value')
-                        else:
+                        #else:
-                            if form_data['ipp']*(20./3*(form_data['clock_in']/form_data['clock_divider']))%10!=0:
+                        #    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']))))
+                        #        self.add_error('ipp', 'Invalid IPP units={}'.format(form_data['ipp']*(20./3*(form_data['clock_in']/form_data['clock_divider']))))
                     return form_data
                 def save(self):
                     conf = super(RCConfigurationForm, self).save()
                     conf.total_units = conf.ipp*conf.ntx*conf.km2unit
                     conf.save()

apps/rc/models.py +122 -118

             import ast
             import json
             import requests
             from django.core.validators import MinValueValidator, MaxValueValidator
             from apps.main.models import Configuration
+            from apps.main.utils import Params
             from devices.rc import api
-            from .utils import RCFile
+            from apps.rc.utils import RCFile
-            from django.template.defaultfilters import last
-            # Create your models here.
             LINE_TYPES = (
                 ('none', 'Not used'),
                     'CLOCK_DIVIDER' : 8,
                         }
+            MAX_BITS = 8
+            # Rotate left: 0b1001 --> 0b0011
+            rol = lambda val, r_bits: \
+                (val << r_bits%MAX_BITS) & (2**MAX_BITS-1) | \
+                ((val & (2**MAX_BITS-1)) >> (MAX_BITS-(r_bits%MAX_BITS)))
+            # Rotate right: 0b1001 --> 0b1100
+            ror = lambda val, r_bits: \
+                ((val & (2**MAX_BITS-1)) >> r_bits%MAX_BITS) | \
+                (val << (MAX_BITS-(r_bits%MAX_BITS)) & (2**MAX_BITS-1))
             class RCConfiguration(Configuration):
                 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):
                 def clone(self, **kwargs):
                     lines = self.get_lines()
+                    print 'LINES'
+                    print lines
                     self.pk = None
                     self.id = None
                     for attr, value in kwargs.items():
                     for line in lines:
                         line.clone(rc_configuration=self)
+                    new_lines = self.get_lines()
+                    for line in new_lines:
+                        line_params = json.loads(line.params)
+                        if 'TX_ref' in line_params:
+                            ref_line = RCLine.objects.get(pk=line_params['TX_ref'])
+                            line_params['TX_ref'] = ['{}'.format(l.pk) for l in new_lines if l.get_name()==ref_line.get_name()][0]
+                            line.params = json.dumps(line_params)
+                            line.save()
                     return self
                 def get_lines(self, **kwargs):
                         line.params = '{}'
                         line.save()
-                def parms_to_dict(self):
+                def dict_to_parms(self, params, id=None):
                     '''
                     '''
-                    ignored = ('parameters', 'type','polymorphic_ctype', 'configuration_ptr',
+                    if id:
-                               'created_date', 'programmed_date', 'mix')
+                        data = Params(params).get_conf(id_conf=id)
+                    else:
-                    data = {}
+                        data = Params(params).get_conf(dtype='rc')
-                    for field in self._meta.fields:
-                        if field.name in ignored:
-                            continue
-                        data[field.name] = '{}'.format(field.value_from_object(self))
-                    data['device_id'] = data.pop('device')
-                    data['device_type'] = self.device.device_type.name
-                    data['lines'] = []
-                    data['mix'] = self.mix
-                    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
-                        line_data['name'] = line.get_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 = float(data['ipp'])
+                    self.ipp = data['ipp']
-                    self.ntx = int(data['ntx'])
+                    self.ntx = data['ntx']
-                    self.clock_in = float(data['clock_in'])
+                    self.clock_in = data['clock_in']
-                    self.clock_divider = int(data['clock_divider'])
+                    self.clock_divider = data['clock_divider']
-                    self.clock = float(data['clock'])
+                    self.clock = data['clock']
                     self.time_before = data['time_before']
                     self.time_after = data['time_after']
                     self.sync = data['sync']
                     self.save()
                     self.clean_lines()
-                    lines = []
                     positions = {'tx':0, 'tr':0}
+                    for i, id in enumerate(data['lines']):
-                    for i, line_data in enumerate(data['lines']):
+                        line_data = params['lines']['byId'][id]
-                        name = line_data.pop('name', '')
+                        line_type = RCLineType.objects.get(name=line_data['line_type'])
-                        line_type = RCLineType.objects.get(name=line_data.pop('type'))
+                        if line_type.name == 'codes':
-                        if line_type.name=='codes':
+                            code = RCLineCode.objects.get(name=line_data['params']['code'])
-                            code = RCLineCode.objects.get(name=line_data['code'])
+                            line_data['params']['code'] = code.pk
-                            line_data['code'] = code.pk
+                        if line_type.name == 'tx':
-                        line = RCLine.objects.filter(rc_configuration=self, channel=i)
+                            position = positions['tx']
-                        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
+                        elif line_type.name == 'tr':
-                        if line_type.name=='tr':
+                            position = positions['tr']
-                            line.position = positions['tr']
                             positions['tr'] += 1
+                        else:
-                        line.save()
+                            position = 0
-                        lines.append(line)
+                        line, dum = RCLine.objects.update_or_create(
+                            rc_configuration=self,
-                    for line, line_data in zip(lines, data['lines']):
+                            channel=i,
-                        if 'TX_ref' in line_data:
+                            position=position,
-                            params = json.loads(line.params)
+                            defaults={
-                            if line_data['TX_ref'] in (0, '0'):
+                                'line_type': line_type,
-                                params['TX_ref'] = '0'
+                                'params': json.dumps(line_data['params'])
+                                }
+                            )
+                    for i, line in enumerate(self.get_lines()):
+                        line_params = json.loads(line.params)
+                        if 'TX_ref' in line_params:
+                            if line_params['TX_ref'] in (0, '0'):
+                                line_params['TX_ref'] = '0'
                             else:
-                                params['TX_ref'] = [l.pk for l in lines if l.line_type.name=='tx' and line_data['TX_ref'] in l.get_name()][0]
+                                ref_id = '{}'.format(line_params['TX_ref'])
-                            line.params = json.dumps(params)
+                                ref_line = params['lines']['byId'][ref_id]
+                                line_params['TX_ref'] = RCLine.objects.get(
+                                    rc_configuration=self,
+                                    params=json.dumps(ref_line['params'])
+                                    ).pk
+                            line.params = json.dumps(line_params)
                             line.save()
                 def get_pulses(self, binary=True):
                     pulses = [line.pulses_as_points() for line in self.get_lines()]
                     tuples = [tup for tups in pulses for tup in tups]
                     points = set([x for tup in tuples for x in tup])
                     for x in points:
                         dum = []
-                        for i,tups in enumerate(pulses):
+                        for i, tups in enumerate(pulses):
                             ups = [tup[0] for tup in tups]
                             dws = [tup[1] for tup in tups]
                             if x in ups:
                     return '\n'.join(['{}'.format(x) for x in data])
-                def update_from_file(self, filename):
-                    '''
-                    Update instance from file
-                    '''
-                    f = RCFile(filename)
-                    self.dict_to_parms(f.data)
-                    self.update_pulses()
                 def update_pulses(self):
                     for line in self.get_lines():
                             ax.text(x, N, '%s' % n, size=10)
                         n += 1
                     labels.reverse()
                     ax.set_yticks(range(len(labels)))
                     ax.set_yticklabels(labels)
                     return components(plot, CDN)
+                def request(self, cmd, method='get', **kwargs):
+                    req = getattr(requests, method)(self.device.url(cmd), **kwargs)
+                    payload = req.json()
+                    return payload
                 def status_device(self):
                     try:
                         self.device.status = 0
-                        req = requests.get(self.device.url('status'))
+                        payload = self.request('status')
-                        payload = req.json()
+                        if payload['status']=='enable':
-                        if payload['status']=='enabled':
                             self.device.status = 3
-                        elif payload['status']=='disabled':
+                        elif payload['status']=='disable':
                             self.device.status = 2
                         else:
                             self.device.status = 1
                             self.device.save()
-                            self.message = payload['status']
+                            self.message = 'RC status: {}'.format(payload['status'])
                             return False
                     except Exception as e:
                         if 'No route to host' not in str(e):
                             self.device.status = 4
                         self.device.save()
-                        self.message = str(e)
+                        self.message = 'RC status: {}'.format(str(e))
                         return False
                     self.device.save()
                 def reset_device(self):
                     try:
-                        req = requests.post(self.device.url('reset'))
+                        payload = self.request('reset', 'post')
-                        payload = req.json()
                         if payload['reset']=='ok':
-                            self.message = 'RC restarted'
+                            self.message = 'RC restarted OK'
+                            self.device.status = 2
+                            self.device.save()
                         else:
-                            self.message = 'RC restart not ok'
+                            self.message = 'RC restart fail'
                             self.device.status = 4
                             self.device.save()
                     except Exception as e:
-                        self.message = str(e)
+                        self.message = 'RC reset: {}'.format(str(e))
                         return False
                     return True
                 def stop_device(self):
                     try:
-                        req = requests.post(self.device.url('stop'))
+                        payload = self.request('stop', 'post')
-                        payload = req.json()
+                        self.message = 'RC stop: {}'.format(payload['stop'])
                         if payload['stop']=='ok':
                             self.device.status = 2
                             self.device.save()
-                            self.message = 'RC stopped'
                         else:
-                            self.message = 'RC stop not ok'
                             self.device.status = 4
                             self.device.save()
                             return False
                             self.device.status = 4
                         else:
                             self.device.status = 0
-                        self.message = str(e)
+                        self.message = 'RC stop: {}'.format(str(e))
                         self.device.save()
                         return False
                 def start_device(self):
                     try:
-                        req = requests.post(self.device.url('start'))
+                        payload = self.request('start', 'post')
-                        payload = req.json()
+                        self.message = 'RC start: {}'.format(payload['start'])
                         if payload['start']=='ok':
                             self.device.status = 3
                             self.device.save()
-                            self.message = 'RC running'
                         else:
-                            self.message = 'RC start not ok'
                             return False
                     except Exception as e:
                         if 'No route to host' not in str(e):
                             self.device.status = 4
                         else:
                             self.device.status = 0
-                        self.message = str(e)
+                        self.message = 'RC start: {}'.format(str(e))
                         self.device.save()
                         return False
                     data.extend((129, 1))
                     try:
-                        req = requests.post(self.device.url('write'), data=b64encode(data))
+                        payload = self.request('write', 'post', data=b64encode(data))
-                        payload = req.json()
                         if payload['write']=='ok':
-                            self.device.status = 2
+                            self.device.status = 3
                             self.device.save()
-                            self.message = 'RC configured'
+                            self.message = 'RC configured and started'
                         else:
                             self.device.status = 1
                             self.device.save()
-                            self.message = 'RC write not ok'
+                            self.message = 'RC write: {}'.format(payload['write'])
                             return False
                     except Exception as e:
                             self.device.status = 4
                         else:
                             self.device.status = 0
-                        self.message = str(e)
+                        self.message = 'RC write: {}'.format(str(e))
                         self.device.save()
                         return False
                     return True
+                def get_absolute_url_import(self):
+                    return reverse('url_import_rc_conf', args=[str(self.id)])
             class RCLineCode(models.Model):
                 name = models.CharField(max_length=40)
                     if self.rc_configuration:
                         return u'%s - %s' % (self.rc_configuration, self.get_name())
+                def jsonify(self):
+                    data = {}
+                    data['params'] = json.loads(self.params)
+                    data['id'] = '{}'.format(self.pk)
+                    data['line_type'] = self.line_type.name
+                    data['name'] = self.get_name()
+                    if data['line_type']=='codes':
+                        data['params']['code'] = RCLineCode.objects.get(pk=data['params']['code']).name
+                    return data
                 def clone(self, **kwargs):
                     self.pk = None
+                    self.id = None
                     for attr, value in kwargs.items():
                         setattr(self, attr, value)
                 @staticmethod
                 def array_to_points(X):
+                    if X.size==0:
+                        return []
                     d = X[1:]-X[:-1]
                     up = np.where(d==1)[0]

apps/rc/views.py +4 -4

                     form = RCImportForm(request.POST, request.FILES)
                     if form.is_valid():
                         try:
-                        #if True:
+                            data = conf.import_from_file(request.FILES['file_name'])
-                            conf.update_from_file(request.FILES['file_name'])
+                            conf.dict_to_parms(data)
+                            conf.update_pulses()
                             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))
+                            messages.error(request, 'Error parsing file: "%s" - %s' % (request.FILES['file_name'], repr(e)))
                 else:
                     messages.warning(request, 'Your current configuration will be replaced')
                     form = RCImportForm()

apps/rc/widgets.py +9 -5

                     html = '''<div class="col-md-12 col-no-padding">
                     <div class="col-md-5 col-no-padding"><input type="{0}" step="any" {1} class="form-control" id="id_{2}" name="{3}" value="{4}"></div>
                     <div class="col-md-1 col-no-padding">Km</div>
-                    <div class="col-md-5 col-no-padding"><input type="{0}" {1} class="form-control" id="id_{2}_unit" value="{5}"></div>
+                    <div class="col-md-5 col-no-padding"><input type="{0}" step="any" {1} class="form-control" id="id_{2}_unit" value="{5}"></div>
                     <div class="col-md-1 col-no-padding">Units</div></div><br>'''.format(input_type, disabled, label, name, value, unit)
                     script = '''<script type="text/javascript">
                         label += '_{0}_{1}'.format(attrs['line'].pk, name.split('|')[0])
                     html = '''<div class="col-md-12 col-no-padding">
-                    <div class="col-md-5 col-no-padding"><input type="number" {0} class="form-control" id="id_{1}_unit" name="{2}" value="{3}"></div>
+                    <div class="col-md-5 col-no-padding"><input type="number" step="any" {0} class="form-control" id="id_{1}_unit" name="{2}" value="{3}"></div>
                     <div class="col-md-1 col-no-padding">Units</div>
                     <div class="col-md-5 col-no-padding"><input type="number" step="any" {4} class="form-control" id="id_{5}" value="{6}"></div>
                     <div class="col-md-1 col-no-padding">Km</div></div>'''.format(disabled, label, name, value, disabled, label, km)
                     html = '''<div class="col-md-12 col-no-padding">
                     <div class="col-md-3 col-no-padding"><input type="number" step="any" {0} class="form-control" id="id_{1}" name="{2}" value="{3}"></div>
                     <div class="col-md-1 col-no-padding">Km</div>
-                    <div class="col-md-3 col-no-padding"><input type="number" {4} class="form-control" id="id_{1}_unit" value="{5}"></div>
+                    <div class="col-md-3 col-no-padding"><input type="number" step="any" {4} class="form-control" id="id_{1}_unit" value="{5}"></div>
                     <div class="col-md-1 col-no-padding">Units</div>
                     <div class="col-md-3 col-no-padding"><input type="number" step="any" {4} class="form-control" id="id_{1}_hz" value="{6}"></div>
                     <div class="col-md-1 col-no-padding">Hz</div>
                     html = '''<div class="col-md-12 col-no-padding">
                     <div class="col-md-3 col-no-padding"><input type="number" step="any" {0} class="form-control" id="id_{1}" name="{2}" value="{3}"></div>
                     <div class="col-md-1 col-no-padding">Km</div>
-                    <div class="col-md-3 col-no-padding"><input type="number" {4} class="form-control" id="id_{1}_unit" value="{5}"></div>
+                    <div class="col-md-3 col-no-padding"><input type="number" step="any" {4} class="form-control" id="id_{1}_unit" value="{5}"></div>
                     <div class="col-md-1 col-no-padding">Units</div>
                     <div class="col-md-3 col-no-padding"><input type="number" step="any" {4} class="form-control" id="id_{1}_dc" value="{6}"></div>
                     <div class="col-md-1 col-no-padding">DC[%]</div>
                     name = attrs.get('name', label)
                     if 'line' in attrs:
                         label += '_{0}_{1}'.format(attrs['line'].pk, name.split('|')[0])
-                    html = '<div class="col-md-12 col-no-padding"><div class="col-md-5 col-no-padding"><input {0} type="{1}" class="form-control" id="id_{2}" name="{3}" value="{4}"></div></div>'.format(disabled, itype, label, name, value)
+                    if itype=='number':
+                        html = '<div class="col-md-12 col-no-padding"><div class="col-md-5 col-no-padding"><input {0} type="{1}" step="any" class="form-control" id="id_{2}" name="{3}" value="{4}"></div></div>'.format(disabled, itype, label, name, value)
+                    else:
+                        html = '<div class="col-md-12 col-no-padding"><div class="col-md-5 col-no-padding"><input {0} type="{1}" step="any" class="form-control" id="id_{2}" name="{3}" value="{4}"></div></div>'.format(disabled, itype, label, name, value)
                     if 'last_height' in label or 'number_of_samples' in label:
                         script = '''<script type="text/javascript">

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