radarsys Commit - r119:a764d9ef7917 · Jicamarca Repository

- Fix input form for delays in RCLine...

Juan C. Espinoza -

r119:a764d9ef7917

parent child

Context file:

r119:a764d9ef7917

Collapse all files

apps/main/templates/dev_conf_edit.html +5 -1

             {% endif %}
-            {% if dds_device %}
+            {% if device == 'dds' %}
             <script src="{% static 'js/dds_conversion.js' %}"></script>
             <script type="text/javascript">
             </script>
             {% endif %}
+            {% if device == 'rc' %}
+            <script src="{% static 'js/cr.js' %}"></script>
+            {% endif %}
             {% endblock %}

apps/main/views.py +2 -2

                             else:
                                 kwargs['button'] = 'Create'
                                 conf = Configuration.objects.get(pk=request.GET['template'])
+                                id_dev = conf.device.pk
                                 DevConfForm = CONF_FORMS[conf.device.device_type.name]
                                 form = DevConfForm(instance=conf,
                                                    initial={'name': '{} [{:%Y/%m/%d}]'.format(conf.name, datetime.now()),
                 if id_dev != 0:
                     device = Device.objects.get(pk=id_dev)
-                    if 'dds' in device.device_type.name:
+                    kwargs['device'] = device.device_type.name
-                        kwargs['dds_device'] = True
                 return render(request, 'dev_conf_edit.html', kwargs)

apps/rc/models.py +10 -9

                     self.time_after = data['time_after']
                     self.sync = data['sync']
                     self.sampling_reference = data['sampling_reference']
+                    self.total_units = self.ipp*self.ntx*self.km2unit
                     self.save()
                     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'])
                 def update_pulses(self):
                     for line in self.get_lines():
                         line.update_pulses()
                 def plot_pulses(self):
                         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.mask_ranges(y_tx, tr_ranges)
                             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]
                         width = float(params['pulse_width'])*km2unit
                                     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)
                     if self.rc_configuration.total_units <> total:
                         self.rc_configuration.total_units = total
                         self.rc_configuration.save()
                     self.pulses = unicode(y)
                     self.save()

apps/rc/static/js/cr.js +1 -1

               var ret = "";
               values = s.split(",");
               for (i=0; i<values.length; i++) {
-                ret += parseFloat(values[i])*km2unit;
+                ret += Math.round(parseFloat(values[i]))*km2unit;
                 ret += ",";
               }
               return ret.substring(0, ret.length-1);

apps/rc/views.py +4 -3

                 if request.method=='POST':
                     form = RCImportForm(request.POST, request.FILES)
                     if form.is_valid():
-                        try:
+                        if True:
+                        #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:
+                        #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'], e))
                 else:
                     messages.warning(request, 'Your current configuration will be replaced')

apps/rc/widgets.py +9 -5

                     disabled = 'disabled' if attrs.get('disabled', False) else ''
                     name = attrs.get('name', label)
+                    if attrs['id'] in ('id_delays',):
+                        input_type = 'text'
+                    else:
+                        input_type = 'number'
                     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="number" step="any" {0} class="form-control" id="id_{1}" name="{2}" value="{3}"></div>
+                    <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="number" {4} class="form-control" id="id_{5}_unit" value="{6}"></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-1 col-no-padding">Units</div></div><br>'''.format(disabled, label, name, value, disabled, label, unit)
+                    <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">
                     $(document).ready(function () {{
                       unit_fields.push("id_{label}_unit");
                       $("#id_{label}").change(function() {{
-                        $("#id_{label}_unit").val(Math.round(str2unit($(this).val())));
+                        $("#id_{label}_unit").val(str2unit($(this).val()));
                         $("#id_{label}").val(str2km($("#id_{label}_unit").val()));
                       }});
                       $("#id_{label}_unit").change(function() {{
-                        $(this).val(Math.round(parseFloat($(this).val())));
+                        $(this).val(parseFloat($(this).val()));
                         $("#id_{label}").val(str2km($(this).val()));
                       }});
                     }});

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