radarsys Commit - r116:a8c158fbcba1 · Jicamarca Repository

- Add sequence mode in mix configurations....

Juan C. Espinoza -

r116:a8c158fbcba1

parent child

Context file:

r116:a8c158fbcba1

Collapse all files

apps/main/views.py +4 -3

                         if 'operation' in request.POST:
                             operation = MIX_OPERATIONS[request.POST['operation']]
                         else:
-                            operation = '---'
+                            operation = '   '
                         mode = MIX_MODES[request.POST['mode']]
                         html += '{:20.18}{:3}{:4}{:9}km{:>6}\r\n'.format(
                                             conf.name,
                                             mode,
-                                            '---',
+                                            '   ',
                                             delay,
                                             mask)
                     else:
                                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                                 form = DevConfForm(instance=conf,
                                                    initial={'name': '{} [{:%Y/%m/%d}]'.format(conf.name, datetime.now()),
-                                                            'template': False})
+                                                            'template': False,
+                                                            'experiment':id_exp})
                         elif 'blank' in request.GET:
                             kwargs['button'] = 'Create'
                             form = ConfigurationForm(initial=initial)

apps/rc/forms.py +7 -1

                     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'
+                        self.fields['experiment'].widget.attrs['readonly'] = True
                 class Meta:
                     model = RCConfiguration
                     return form_data
+                def save(self):
+                    conf = super(RCConfigurationForm, self).save()
+                    conf.total_units = conf.ipp*conf.ntx*conf.km2unit
+                    conf.save()
+                    return conf
             class RCMixConfigurationForm(forms.Form):

apps/rc/models.py +15 -4

                     labels.reverse()
                     ax.set_yticklabels(labels)
+                    ax.set_xlabel = 'Units'
                     plot = to_bokeh(fig, use_pandas=False)
                     plot.tools = [PanTool(dimensions=['width']), WheelZoomTool(dimensions=['width']), ResetTool(), PreviewSaveTool()]
                     ipp = self.rc_configuration.ipp
                     ntx = self.rc_configuration.ntx
                     ipp_u = int(ipp*km2unit)
-                    total = ipp_u*ntx
+                    total = ipp_u*ntx if self.rc_configuration.total_units==0 else self.rc_configuration.total_units
                     y = []
                     if self.line_type.name=='tr':
                             y.extend(y_tx)
+                        self.pulses = unicode(y)
+                        y = self.array_to_points(self.pulses_as_array())
                     elif self.line_type.name=='tx':
                         params = json.loads(self.params)
                         delays = [float(d)*km2unit for d in params['delays'].split(',') if d]
                     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])
+                        confs = [RCConfiguration.objects.get(pk=value.split('|')[0]) for value in values]
                         modes = [value.split('|')[1] for value in values]
                         ops = [value.split('|')[2] for value in values]
                         delays = [value.split('|')[3] 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)
+                            y = np.zeros(confs[0].total_units, dtype=np.int8)
                         else:
                             y = confs[0].get_lines(channel=self.channel)[0].pulses_as_array()
                             Y = confs[i].get_lines(channel=self.channel)[0].pulses_as_array()
                             delay = float(delays[i])*km2unit
+                            if modes[i]=='P':
                                 if delay>0:
                                     if delay<self.rc_configuration.ipp*km2unit and len(Y)==len(y):
                                         y_temp = np.empty_like(Y)
                                     elif delay+len(Y)==len(y):
                                         y_temp = np.zeros(delay+len(Y))
                                         y_temp[-len(Y):] = Y
+                                    elif delay+len(Y)<len(y):
+                                        y_temp = np.zeros(len(y), dtype=np.int8)
+                                        y_temp[delay:delay+len(Y)] = Y
                                 if ops[i]=='OR':
                                     y = y | y_temp
                                     y = y & y_temp
                                 elif ops[i]=='NAND':
                                     y = y & ~y_temp
+                            else:
+                                print len(y), len(Y)
+                                y = np.concatenate([y, Y])
                         total = len(y)
                         y = self.array_to_points(y)
                         self.rc_configuration.total_units = total
                         self.rc_configuration.save()
-                    self.pulses = y
+                    self.pulses = unicode(y)
                     self.save()
                 @staticmethod

apps/rc/templates/rc_pulses.html +4 0

             {% block content %}
             <div id="div_plot">{{div}}</div>
+            <br>
+            <div class="col-md-2">1 Km =</div><div class="col-md-3">{{units}} Units</div>
+            <br>
+            <div class="col-md-2">1 Unit=</div><div class="col-md-3">{{kms}} Km</div>
             {% endblock %}
             {% block extra-js%}

apps/rc/views.py +2 0

                 kwargs['suptitle'] = conf.name
                 kwargs['div'] = mark_safe(div)
                 kwargs['script'] = mark_safe(script)
+                kwargs['units'] = conf.km2unit
+                kwargs['kms'] = 1/conf.km2unit
                 if 'json' in request.GET:
                     return HttpResponse(json.dumps({'div':mark_safe(div), 'script':mark_safe(script)}), content_type="application/json")

apps/rc/widgets.py +10 -6

                     if 'line' in attrs:
                         label += '_{0}'.format(attrs['line'].pk)
-                    html = '<div class="col-md-12 col-no-padding"><div class="col-md-5 col-no-padding"><input type="text" {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-5 col-no-padding"><input type="text" {4} class="form-control" id="id_{5}_unit" value="{6}"></div><div class="col-md-1 col-no-padding">Units</div></div><br>'.format(disabled, label, name, value, disabled, label, unit)
+                    html = '''<div class="col-md-12 col-no-padding">
+                    <div class="col-md-5 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-5 col-no-padding"><input type="number" {4} class="form-control" id="id_{5}_unit" value="{6}"></div>
+                    <div class="col-md-1 col-no-padding">Units</div></div><br>'''.format(disabled, label, name, value, disabled, label, unit)
                     script = '''<script type="text/javascript">
                     $(document).ready(function () {{
                     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-1 col-no-padding">Units</div>
-                    <div class="col-md-5 col-no-padding"><input type="number" {4} class="form-control" id="id_{5}" value="{6}"></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)
                     script = '''<script type="text/javascript">
                         label += '_{0}'.format(attrs['line'].pk)
                     html = '''<div class="col-md-12 col-no-padding">
-                    <div class="col-md-3 col-no-padding"><input type="number" {0} class="form-control" id="id_{1}" name="{2}" value="{3}"></div>
+                    <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-1 col-no-padding">Units</div>
-                    <div class="col-md-3 col-no-padding"><input type="number" {4} class="form-control" id="id_{1}_hz" value="{6}"></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>
                     </div>'''.format(disabled, label, name, value, disabled, unit, hz)
                     dc = float(json.loads(attrs['line'].params)['pulse_width'])*100/attrs['line'].rc_configuration.ipp
                     html = '''<div class="col-md-12 col-no-padding">
-                    <div class="col-md-3 col-no-padding"><input type="number" {0} class="form-control" id="id_{1}" name="{2}" value="{3}"></div>
+                    <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-1 col-no-padding">Units</div>
-                    <div class="col-md-3 col-no-padding"><input type="number" {4} class="form-control" id="id_{1}_dc" value="{6}"></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>
                     </div>'''.format(disabled, label, name, value, disabled, unit, dc)

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