radarsys Commit - r172:a641bec15a9b · Jicamarca Repository

Update code for django 1.10, python 3 and latest third party packages, review operation view ...

Juan C. Espinoza -

r172:a641bec15a9b

parent child

Context file:

r172:a641bec15a9b

Expand all files

The requested changes are too big and content was truncated. Show full diff

apps/rc/static/js/bokeh-0.12.1.min.js created 644 0 0

	1	NO CONTENT: new file 100644			NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

apps/abs/urls.py +11 -9

@@ -1,13 +1,15
1	from django.conf.urls import url	1	from django.conf.urls import url
2		2
		3	import views
		4
3	urlpatterns = (	5	urlpatterns = (
4	url(r'^(?P<id_conf>-?\d+)/$', ~~'apps.abs.~~views.abs_conf', name='url_abs_conf'),	6	url(r'^(?P<id_conf>-?\d+)/$', views.abs_conf, name='url_abs_conf'),
5	url(r'^(?P<id_conf>-?\d+)/edit/$', ~~'apps.abs.~~views.abs_conf_edit', name='url_edit_abs_conf'),	7	url(r'^(?P<id_conf>-?\d+)/edit/$', views.abs_conf_edit, name='url_edit_abs_conf'),
6	url(r'^(?P<id_conf>-?\d+)/read/$', ~~'apps.main.~~views.dev_conf_read', name='url_read_abs_conf'),	8	url(r'^(?P<id_conf>-?\d+)/read/$', views.dev_conf_read, name='url_read_abs_conf'),
7	url(r'^(?P<id_conf>-?\d+)/import/$', ~~'apps.main.~~views.dev_conf_import', name='url_import_abs_conf'),	9	url(r'^(?P<id_conf>-?\d+)/import/$', views.dev_conf_import, name='url_import_abs_conf'),
8	url(r'^(?P<id_conf>-?\d+)/export/$', ~~'apps.main.~~views.dev_conf_export', name='url_export_abs_conf'),	10	url(r'^(?P<id_conf>-?\d+)/export/$', views.dev_conf_export, name='url_export_abs_conf'),
9	url(r'^(?P<id_conf>-?\d+)/plot/$', ~~'apps.abs.~~views.plot_patterns', name='url_plot_abs_patterns'),	11	url(r'^(?P<id_conf>-?\d+)/plot/$', views.plot_patterns, name='url_plot_abs_patterns'),
10	url(r'^(?P<id_conf>-?\d+)/add_beam/$', ~~'apps.abs.~~views.add_beam', name='url_add_abs_beam'),	12	url(r'^(?P<id_conf>-?\d+)/add_beam/$', views.add_beam, name='url_add_abs_beam'),
11	url(r'^(?P<id_conf>-?\d+)/beam/(?P<id_beam>-?\d+)/delete/$', ~~'apps.abs.~~views.remove_beam', name='url_remove_abs_beam'),	13	url(r'^(?P<id_conf>-?\d+)/beam/(?P<id_beam>-?\d+)/delete/$', views.remove_beam, name='url_remove_abs_beam'),
12	url(r'^(?P<id_conf>-?\d+)/beam/(?P<id_beam>-?\d+)/edit/$', ~~'apps.abs.~~views.edit_beam', name='url_edit_abs_beam'),	14	url(r'^(?P<id_conf>-?\d+)/beam/(?P<id_beam>-?\d+)/edit/$', views.edit_beam, name='url_edit_abs_beam'),
13	)	15	)

apps/accounts/templates/login.html +1 -1

             {% block content %}
             <div class='col-md-8'>
-              <form class="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
+              <form class="form" method="post" action="{% url 'url_login' %}">
               {% csrf_token %}
               {% bootstrap_form form %}
               <input type="hidden" name="next" value="{{ next }}" />

apps/accounts/urls.py +4 -4

@@ -1,7 +1,7
1	from django.conf.urls import ~~patterns~~, url	1	from django.conf.urls import url
2	from django.contrib.auth import views as auth_views	2	from django.contrib.auth import views as auth_views
3		3
4	urlpatterns = ~~patterns~~('',	4	urlpatterns = (
5	url(r'^logout/$', ~~'django.contrib.auth.~~views.logout', {'next_page': '/'}),	5	url(r'^logout/$', auth_views.logout, {'next_page': '/'}, name='url_logout'),
6	url(r'^login/$', auth_views.login, {'template_name': 'login.html'}),	6	url(r'^login/$', auth_views.login, {'template_name': 'login.html'}, name='url_login'),
7	)	7	)

apps/cgs/models.py +2 -5

             from apps.main.models import Configuration
             from django.core.validators import MinValueValidator, MaxValueValidator
+            from .files import read_json_file
-            from apps.main.models import Device, Experiment
-            from files import read_json_file
             # Create your models here. validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]
             class CGSConfiguration(Configuration):
                     icon = response[0]
                     status = response[-1]
-                    print icon, status
+                    #print(icon, status)
                     #"icon" could be: "alert" or "okay"
                     if "alert" in icon:
                         if "Starting Up" in status: #No Esta conectado

apps/cgs/urls.py +4 -10

@@ -1,14 +1,8
1	from django.conf.urls import url	1	from django.conf.urls import url
2		2
		3	from apps.cgs import views
		4
3	urlpatterns = (	5	urlpatterns = (
4	url(r'^(?P<id_conf>-?\d+)/$', ~~'apps.cgs.~~views.cgs_conf', name='url_cgs_conf'),	6	url(r'^(?P<id_conf>-?\d+)/$', views.cgs_conf, name='url_cgs_conf'),
5	url(r'^(?P<id_conf>-?\d+)/edit/$', ~~'apps.cgs.~~views.cgs_conf_edit', name='url_edit_cgs_conf'),	7	url(r'^(?P<id_conf>-?\d+)/edit/$', views.cgs_conf_edit, name='url_edit_cgs_conf'),
6	#url(r'^(?P<id_conf>-?\d+)/(?P<message>-?\d+)/$', 'apps.cgs.views.cgs_conf', name='url_cgs_conf'),
7	# url(r'^(?P<id_conf>-?\d+)/edit/$', 'apps.cgs.views.cgs_conf_edit', name='url_edit_cgs_conf'),
8	# url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.cgs.views.cgs_conf_write', name='url_write_cgs_conf'),
9	# url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.cgs.views.cgs_conf_read', name='url_read_cgs_conf'),
10	# url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.cgs.views.cgs_conf_import', name='url_import_cgs_conf'),
11	# url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.cgs.views.cgs_conf_export', name='url_export_cgs_conf'),
12	#url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_cgs_conf'),
13	)	8	)
14

apps/cgs/views.py +1 -1

             from django.contrib import messages
             from django.http import HttpResponse
-            from apps.main.models import Experiment, Configuration
+            from apps.main.models import Experiment
             from .models import CGSConfiguration
             from .forms import CGSConfigurationForm, UploadFileForm

apps/dds/models.py 0 -1

                 class Meta:
                     db_table = 'dds_configurations'
-  No newline at end of file

apps/dds/urls.py +5 -10

@@ -1,14 +1,9
1	from django.conf.urls import url	1	from django.conf.urls import url
2		2
		3	from apps.dds import views
		4
3	urlpatterns = (	5	urlpatterns = (
4	url(r'^(?P<id_conf>-?\d+)/$', ~~'apps.dds.~~views.dds_conf', name='url_dds_conf'),	6	url(r'^(?P<id_conf>-?\d+)/$', views.dds_conf, name='url_dds_conf'),
5	url(r'^(?P<id_conf>-?\d+)/(?P<message>-?\d+)/$', ~~'apps.dds.~~views.dds_conf', name='url_dds_conf'),	7	url(r'^(?P<id_conf>-?\d+)/(?P<message>-?\d+)/$', views.dds_conf, name='url_dds_conf'),
6	url(r'^(?P<id_conf>-?\d+)/edit/$', ~~'apps.dds.~~views.dds_conf_edit', name='url_edit_dds_conf'),	8	url(r'^(?P<id_conf>-?\d+)/edit/$', views.dds_conf_edit, name='url_edit_dds_conf'),
7	# url(r'^(?P<id_conf>-?\d+)/write/$', 'apps.dds.views.dds_conf_write', name='url_write_dds_conf'),
8	# url(r'^(?P<id_conf>-?\d+)/read/$', 'apps.dds.views.dds_conf_read', name='url_read_dds_conf'),
9	# url(r'^(?P<id_conf>-?\d+)/import/$', 'apps.dds.views.dds_conf_import', name='url_import_dds_conf'),
10	# url(r'^(?P<id_conf>-?\d+)/export/$', 'apps.dds.views.dds_conf_export', name='url_export_dds_conf'),
11	# url(r'^(?P<id_conf>-?\d+)/start/$', 'apps.dds.views.dds_conf_start', name='url_start_dds_conf'),
12	# url(r'^(?P<id_conf>-?\d+)/stop/$', 'apps.dds.views.dds_conf_stop', name='url_stop_dds_conf'),
13	# url(r'^(?P<id_conf>-?\d+)/status/$', 'apps.dds.views.dds_conf_status', name='url_status_dds_conf'),
14	)	9	)

apps/jars/fixtures/initial_filters_data.json +1 -1

@@ -1,2 +1,2
1	[{"fields": {"name": "49_920MHz_clock60MHz_F0MHz_12_25_2", "clock": "60", "mult": 5, "fch": 49.92, "fch_decimal": 721554505, "filter_fir": 6, "filter_2": 10, "filter_5": 1, "speed": 0}, "model": "jars.jarsfilter", "pk": 1},	1	[{"fields": {"name": "49_920MHz_clock60MHz_F0MHz_12_25_2", "clock": "60", "mult": 5, "fch": 49.92, "fch_decimal": 721554505, "filter_fir": 6, "filter_2": 10, "filter_5": 1, "speed": 0}, "model": "jars.jarsfilter", "pk": 1}
2	]	2	]

apps/jars/models.py 0 0

NO CONTENT: modified file

apps/jars/urls.py +9 -7

@@ -1,11 +1,13
1	from django.conf.urls import url	1	from django.conf.urls import url
2		2
		3	from apps.jars import views
		4
3	urlpatterns = (	5	urlpatterns = (
4	url(r'^(?P<id_conf>-?\d+)/$', ~~'apps.jars.~~views.jars_conf', name='url_jars_conf'),	6	url(r'^(?P<id_conf>-?\d+)/$', views.jars_conf, name='url_jars_conf'),
5	url(r'^(?P<id_conf>-?\d+)/edit/$', ~~'apps.jars.~~views.jars_conf_edit', name='url_edit_jars_conf'),	7	url(r'^(?P<id_conf>-?\d+)/edit/$', views.jars_conf_edit, name='url_edit_jars_conf'),
6	url(r'^(?P<conf_id>-?\d+)/new_filter/$', ~~'apps.jars.~~views.new_filter', name='url_new_jars_filter'),	8	url(r'^(?P<conf_id>-?\d+)/new_filter/$', views.new_filter, name='url_new_jars_filter'),
7	url(r'^(?P<conf_id>-?\d+)/view_filter/(?P<filter_id>-?\d+)/$', ~~'apps.jars.~~views.view_filter', name='url_jars_filter'),	9	url(r'^(?P<conf_id>-?\d+)/view_filter/(?P<filter_id>-?\d+)/$', views.view_filter, name='url_jars_filter'),
8	url(r'^(?P<conf_id>-?\d+)/view_filter/(?P<filter_id>-?\d+)/edit$', ~~'apps.jars.~~views.edit_filter', name='url_edit_jars_filter'),	10	url(r'^(?P<conf_id>-?\d+)/view_filter/(?P<filter_id>-?\d+)/edit$', views.edit_filter, name='url_edit_jars_filter'),
9	url(r'^(?P<conf_id>-?\d+)/import/$', ~~'apps.jars.~~views.import_file', name='url_import_jars_conf'),	11	url(r'^(?P<conf_id>-?\d+)/import/$', views.import_file, name='url_import_jars_conf'),
10	url(r'^(?P<conf_id>-?\d+)/read/$', ~~'apps.jars.~~views.read_conf', name='url_read_jars_conf'),	12	url(r'^(?P<conf_id>-?\d+)/read/$', views.read_conf, name='url_read_jars_conf'),
11	)	13	)

apps/jars/widgets.py 0 -1

             from django import forms
             from django.utils.safestring import mark_safe
-            from django.utils.encoding import force_unicode
             from django.utils.html import conditional_escape

apps/main/fixtures/main_initial_data.json +3 -2

             [
-            {"fields": {"name": "JRO Imaging", "description": ""}, "model": "main.location", "pk": 1},
+            {"fields": {"name": "JRO", "description": ""}, "model": "main.location", "pk": 1},
             {"fields": {"name": "JASMET", "description": ""}, "model": "main.location", "pk": 2},
             {"fields": {"name": "SOUSY", "description": ""}, "model": "main.location", "pk": 3},
             {"fields": {"name": "JULIA", "description": ""}, "model": "main.location", "pk": 4},
             {"fields": {"name": "rc", "description": ""}, "model": "main.devicetype", "pk": 1},
             {"fields": {"name": "dds", "description": ""}, "model": "main.devicetype", "pk": 2},
             {"fields": {"name": "cgs", "description": ""}, "model": "main.devicetype", "pk": 3},
-            {"fields": {"name": "jars", "description": ""}, "model": "main.devicetype", "pk": 4}
+            {"fields": {"name": "jars", "description": ""}, "model": "main.devicetype", "pk": 4},
+            {"fields": {"name": "abs", "description": ""}, "model": "main.devicetype", "pk": 5}
             ]

apps/main/forms.py +7 -15

             from django import forms
             from django.utils.safestring import mark_safe
+            from .models import Device, Experiment, Campaign, Location
-            from .models import DeviceType, Device, Experiment, Campaign, Configuration, Location
+            from apps.main.models import Configuration
             FILE_FORMAT = (
                             ('json', 'json'),
                     model = Configuration
                     exclude = ['type', 'created_date', 'programmed_date', 'parameters']
-            class DeviceTypeForm(forms.Form):
+            #class DeviceTypeForm(forms.Form):
-                device_type = forms.ChoiceField(choices=add_empty_choice(DeviceType.objects.all().order_by('name').values_list('id', 'name')))
+            #    device_type = forms.ChoiceField(choices=add_empty_choice(DeviceType.objects.all().order_by('name').values_list('id', 'name')))
             class UploadFileForm(forms.Form):
                         self.fields['format'].choices = RC_FILE_FORMAT
             class OperationForm(forms.Form):
-            #     today = datetime.today()
-                # -----Campaigns from this month------[:5]
                 campaign = forms.ChoiceField(label="Campaign")
                 def __init__(self, *args, **kwargs):
-                    if 'length' not in kwargs.keys():
+                    campaigns = kwargs.pop('campaigns')
-                        length = None
-                    else:
-                        length = kwargs['length']
-                        kwargs.pop('length')
                     super(OperationForm, self).__init__(*args, **kwargs)
-                    self.fields['campaign'].choices=Campaign.objects.all().order_by('-start_date').values_list('id', 'name')[:length]
+                    self.fields['campaign'].choices=add_empty_choice(campaigns.values_list('id', 'name'))
             class OperationSearchForm(forms.Form):
                             self.fields['template'] = forms.BooleanField(required=False)
                         else:
                             self.fields[field] = forms.CharField(required=False)
-  No newline at end of file

apps/main/models.py +31 -27

             from datetime import datetime
             from django.db import models
-            from polymorphic import PolymorphicModel
+            from polymorphic.models import PolymorphicModel
             from django.core.urlresolvers import reverse
                 class Meta:
                     db_table = 'db_location'
-                def __unicode__(self):
+                def __str__(self):
                     return u'%s' % self.name
                 def get_absolute_url(self):
                 class Meta:
                     db_table = 'db_device_types'
-                def __unicode__(self):
+                def __str__(self):
                     return u'%s' % self.get_name_display()
             class Device(models.Model):
                 class Meta:
                     db_table = 'db_devices'
-                def __unicode__(self):
+                def __str__(self):
                     return u'[{}]: {}'.format(self.device_type.name.upper(),
                                                 self.name)
                     db_table = 'db_campaigns'
                     ordering = ('name',)
-                def __unicode__(self):
+                def __str__(self):
                     if self.template:
                         return u'{} (template)'.format(self.name)
                     else:
                         return u'{}'.format(self.name)
                 def parms_to_dict(self):
                     import json
                     parameters['experiments'] = exp_parameters
                     parameters['end_date']    = self.end_date.strftime("%Y-%m-%d")
                     parameters['start_date']  = self.start_date.strftime("%Y-%m-%d")
-                    parameters['campaign']    = self.__unicode__()
+                    parameters['campaign']    = self.__str__()
                     parameters['tags']        =self.tags
                     parameters = json.dumps(parameters, indent=2, sort_keys=False)
                     path, ext = os.path.splitext(fp.name)
                     if ext == '.json':
-                        parms = json.load(fp)
+                        parms = json.loads(fp.read())
                     return parms
                     return self
+                def get_experiments_by_location(self):
+                    ret = []
+                    locations = set([e.location for e in self.experiments.all()])
+                    for loc in locations:
+                        dum = {}
+                        dum['name'] = loc.name
+                        dum['id'] = loc.pk
+                        dum['experiments'] = [e for e in self.experiments.all() if e.location==loc]
+                        ret.append(dum)
+                    return ret
                 def get_absolute_url(self):
                     return reverse('url_campaign', args=[str(self.id)])
                     db_table = 'db_experiments'
                     ordering = ('template', 'name')
-                def __unicode__(self):
+                def __str__(self):
                     if self.template:
                         return u'%s (template)' % (self.name)
                     else:
                     configurations =  Configuration.objects.filter(experiment=self)
                     exp_status=[]
                     for conf in configurations:
-                        print conf.status_device()
                         exp_status.append(conf.status_device())
                     if not exp_status: #No Configuration
                     path, ext = os.path.splitext(fp.name)
                     if ext == '.json':
-                        parms = json.load(fp)
+                        parms = json.loads(fp.read().decode('utf-8'))
                     return parms
                 class Meta:
                     db_table = 'db_configurations'
-                def __unicode__(self):
+                def __str__(self):
                     device = '{}:'.format(self.device.device_type.name.upper())
-                    if 'mix' in self._meta.get_all_field_names():
+                    if 'mix' in [f.name for f in self._meta.get_fields()]:
                         if self.mix:
                             device = '{} MIXED:'.format(self.device.device_type.name.upper())
                 def parms_to_text(self):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return ''
                 def parms_to_binary(self):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return ''
                 def dict_to_parms(self, parameters):
                 def status_device(self):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return None
                 def stop_device(self):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return None
                 def start_device(self):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return None
                 def write_device(self, parms):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return None
                 def read_device(self):
-                    raise NotImplementedError, "This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper()
+                    raise NotImplementedError("This method should be implemented in %s Configuration model" %str(self.device.device_type.name).upper())
-                    return None
                 def get_absolute_url(self):
                     return reverse('url_%s_conf' % self.device.device_type.name, args=[str(self.id)])

apps/main/templates/base.html +2 -2

                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Hi {{ user.username }}<span class="caret"></span></a>
                          <ul class="dropdown-menu" role="menu">
                             <li><a href="#">Control Panel</a></li>
-                            <li><a href="{% url 'django.contrib.auth.views.logout' %}">Logout</a></li>
+                            <li><a href="{% url 'url_logout' %}">Logout</a></li>
                          </ul>
                       </li>
                       {% else %}
-                      <li><a href="{% url 'django.contrib.auth.views.login' %}?next={{request.get_full_path}}">Login</a></li>
+                      <li><a href="{% url 'url_login' %}?next={{request.get_full_path}}">Login</a></li>
                       {% endif %}
                     </ul>
                   </div>

apps/main/templates/operation.html +7 -30

             <link href="{% static 'css/bootstrap-datetimepicker.min.css' %}" media="screen" rel="stylesheet">
             {% endblock %}
-            {% block camp-active %}active{% endblock %}
+            {% block operation-active %}active{% endblock %}
-            {% block content-title %}{{title}}{% endblock %}
-            {% block content-suptitle %}{{suptitle}}{% endblock %}
             {% block content %}
-            <!-- Not Empty-->
-            {% if details %}
-            <form class="form" method="post" action="">
-              {% csrf_token %}
             {% bootstrap_form form layout='horizontal' size='medium' %}
             <div style="clear: both;"></div>
-              <br>
-              <!-- For deep search -->
-              {% if search_button == True %}
-              <button id="button-1" type="button" class="btn btn-primary pull-right">{{button}}</button>
-              {% endif %}
-              <br>
-              <br>
-            </form>
-            <br>
-            <br>
-            {% endif %}
+            {% if campaign %}
             <div class="clearfix"></div>
             <h2>Radar Systems</h2>
             <br>
             	      <h4 class="panel-title">
             	        <a class="collapsed" role="button" data-toggle="collapse"  href="#collapseTwo-{{ location.id }}" aria-expanded="false" aria-controls="collapseTwo">
-            	          {{location.name}}: Experiments
+            	          {{location.name}}
             	          <span>
             	          </span>
             	        </a>
             			  {% endfor%}
             			</tr>
-            			{% for item in experiments %}
+            			{% for item in location.experiments %}
             			    {% if location.name in item.location.name  %}
             					<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}" >
             	  {% endfor %}
             </div>
+            {% endif %}
             {% endblock %}
               {% else %}
               $(document).ready(function() {
             	    $("#id_campaign").change(function() {
-            	    	var id_camp = document.getElementById("id_campaign").value;
+            			document.location = "{% url 'url_operation'%}"+$(this).val();
-            	    	//alert(id_camp);
-            			document.location = "{% url 'url_operation_search'%}"+String(id_camp);
             		});
               });
               {% endif %}
-              $("#button-1").click(function() {
-                  document.location = "{% url 'url_operation_search' %}";
-              });
             </script>
             {% endblock %}

apps/main/templates/sidebar_devices.html 0 0

NO CONTENT: modified file

apps/main/urls.py +57 -55

@@ -1,59 +1,61
1	from django.conf.urls import url	1	from django.conf.urls import url
2		2
3	urlpatterns = (	3	from apps.main import views
4	url(r'^location/new/$', 'apps.main.views.location_new', name='url_add_location'),
5	url(r'^location/$', 'apps.main.views.locations', name='url_locations'),
6	url(r'^location/(?P<id_loc>-?\d+)/$', 'apps.main.views.location', name='url_location'),
7	url(r'^location/(?P<id_loc>-?\d+)/edit/$', 'apps.main.views.location_edit', name='url_edit_location'),
8	url(r'^location/(?P<id_loc>-?\d+)/delete/$', 'apps.main.views.location_delete', name='url_delete_location'),
9
10	url(r'^device/new/$', 'apps.main.views.device_new', name='url_add_device'),
11	url(r'^device/$', 'apps.main.views.devices', name='url_devices'),
12	url(r'^device/(?P<id_dev>-?\d+)/$', 'apps.main.views.device', name='url_device'),
13	url(r'^device/(?P<id_dev>-?\d+)/edit/$', 'apps.main.views.device_edit', name='url_edit_device'),
14	url(r'^device/(?P<id_dev>-?\d+)/delete/$', 'apps.main.views.device_delete', name='url_delete_device'),
15
16	url(r'^campaign/new/$', 'apps.main.views.campaign_new', name='url_add_campaign'),
17	url(r'^campaign/$', 'apps.main.views.campaigns', name='url_campaigns'),
18	url(r'^campaign/(?P<id_camp>-?\d+)/$', 'apps.main.views.campaign', name='url_campaign'),
19	url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', 'apps.main.views.campaign_edit', name='url_edit_campaign'),
20	url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', 'apps.main.views.campaign_delete', name='url_delete_campaign'),
21	url(r'^campaign/(?P<id_camp>-?\d+)/export/$', 'apps.main.views.campaign_export', name='url_export_campaign'),
22	url(r'^campaign/(?P<id_camp>-?\d+)/import/$', 'apps.main.views.campaign_import', name='url_import_campaign'),
23
24	url(r'^experiment/new/$', 'apps.main.views.experiment_new', name='url_add_experiment'),
25	url(r'^experiment/$', 'apps.main.views.experiments', name='url_experiments'),
26	url(r'^experiment/(?P<id_exp>-?\d+)/$', 'apps.main.views.experiment', name='url_experiment'),
27	url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', 'apps.main.views.experiment_edit', name='url_edit_experiment'),
28	url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', 'apps.main.views.experiment_delete', name='url_delete_experiment'),
29	url(r'^experiment/(?P<id_exp>-?\d+)/export/$', 'apps.main.views.experiment_export', name='url_export_experiment'),
30	url(r'^experiment/(?P<id_exp>-?\d+)/import/$', 'apps.main.views.experiment_import', name='url_import_experiment'),
31	url(r'^experiment/(?P<id_exp>-?\d+)/mix/$', 'apps.main.views.experiment_mix', name='url_mix_experiment'),
32	url(r'^experiment/(?P<id_exp>-?\d+)/mix/delete/$', 'apps.main.views.experiment_mix_delete', name='url_delete_mix_experiment'),
33	url(r'^experiment/(?P<id_exp>-?\d+)/summary/$', 'apps.main.views.experiment_summary', name='url_sum_experiment'),
34	url(r'^experiment/(?P<id_exp>-?\d+)/verify/$', 'apps.main.views.experiment_verify', name='url_verify_experiment'),
35
36	url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/$', 'apps.main.views.dev_conf_new', name='url_add_dev_conf'),
37	url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/(?P<id_dev>-?\d+)/$', 'apps.main.views.dev_conf_new', name='url_add_dev_conf'),
38	url(r'^dev_conf/$', 'apps.main.views.dev_confs', name='url_dev_confs'),
39	url(r'^dev_conf/(?P<id_conf>-?\d+)/$', 'apps.main.views.dev_conf', name='url_dev_conf'),
40	url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', 'apps.main.views.dev_conf_edit', name='url_edit_dev_conf'),
41	url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', 'apps.main.views.dev_conf_delete', name='url_delete_dev_conf'),
42
43	url(r'^dev_conf/(?P<id_conf>-?\d+)/write/$', 'apps.main.views.dev_conf_write', name='url_write_dev_conf'),
44	url(r'^dev_conf/(?P<id_conf>-?\d+)/read/$', 'apps.main.views.dev_conf_read', name='url_read_dev_conf'),
45	url(r'^dev_conf/(?P<id_conf>-?\d+)/import/$', 'apps.main.views.dev_conf_import', name='url_import_dev_conf'),
46	url(r'^dev_conf/(?P<id_conf>-?\d+)/export/$', 'apps.main.views.dev_conf_export', name='url_export_dev_conf'),
47	url(r'^dev_conf/(?P<id_conf>-?\d+)/start/$', 'apps.main.views.dev_conf_start', name='url_start_dev_conf'),
48	url(r'^dev_conf/(?P<id_conf>-?\d+)/stop/$', 'apps.main.views.dev_conf_stop', name='url_stop_dev_conf'),
49	url(r'^dev_conf/(?P<id_conf>-?\d+)/status/$', 'apps.main.views.dev_conf_status', name='url_status_dev_conf'),
50
51	url(r'^operation/$', 'apps.main.views.operation', name='url_operation'),
52	url(r'^operation/(?P<id_camp>-?\d+)/$', 'apps.main.views.operation', name='url_operation'),
53	url(r'^operation/search/$', 'apps.main.views.operation_search', name='url_operation_search'),
54	url(r'^operation/search/(?P<id_camp>-?\d+)/$', 'apps.main.views.operation_search', name='url_operation_search'),
55	url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/play/$', 'apps.main.views.radar_play', name='url_radar_play'),
56	url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/stop/$', 'apps.main.views.radar_stop', name='url_radar_stop'),
57	url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/refresh/$', 'apps.main.views.radar_refresh', name='url_radar_refresh'),
58		4
		5	urlpatterns = (
		6	url(r'^$', views.index, name='index'),
		7	url(r'^location/new/$', views.location_new, name='url_add_location'),
		8	url(r'^location/$', views.locations, name='url_locations'),
		9	url(r'^location/(?P<id_loc>-?\d+)/$', views.location, name='url_location'),
		10	url(r'^location/(?P<id_loc>-?\d+)/edit/$', views.location_edit, name='url_edit_location'),
		11	url(r'^location/(?P<id_loc>-?\d+)/delete/$', views.location_delete, name='url_delete_location'),
		12
		13	url(r'^device/new/$', views.device_new, name='url_add_device'),
		14	url(r'^device/$', views.devices, name='url_devices'),
		15	url(r'^device/(?P<id_dev>-?\d+)/$', views.device, name='url_device'),
		16	url(r'^device/(?P<id_dev>-?\d+)/edit/$', views.device_edit, name='url_edit_device'),
		17	url(r'^device/(?P<id_dev>-?\d+)/delete/$', views.device_delete, name='url_delete_device'),
		18
		19	url(r'^campaign/new/$', views.campaign_new, name='url_add_campaign'),
		20	url(r'^campaign/$', views.campaigns, name='url_campaigns'),
		21	url(r'^campaign/(?P<id_camp>-?\d+)/$', views.campaign, name='url_campaign'),
		22	url(r'^campaign/(?P<id_camp>-?\d+)/edit/$', views.campaign_edit, name='url_edit_campaign'),
		23	url(r'^campaign/(?P<id_camp>-?\d+)/delete/$', views.campaign_delete, name='url_delete_campaign'),
		24	url(r'^campaign/(?P<id_camp>-?\d+)/export/$', views.campaign_export, name='url_export_campaign'),
		25	url(r'^campaign/(?P<id_camp>-?\d+)/import/$', views.campaign_import, name='url_import_campaign'),
		26
		27	url(r'^experiment/new/$', views.experiment_new, name='url_add_experiment'),
		28	url(r'^experiment/$', views.experiments, name='url_experiments'),
		29	url(r'^experiment/(?P<id_exp>-?\d+)/$', views.experiment, name='url_experiment'),
		30	url(r'^experiment/(?P<id_exp>-?\d+)/edit/$', views.experiment_edit, name='url_edit_experiment'),
		31	url(r'^experiment/(?P<id_exp>-?\d+)/delete/$', views.experiment_delete, name='url_delete_experiment'),
		32	url(r'^experiment/(?P<id_exp>-?\d+)/export/$', views.experiment_export, name='url_export_experiment'),
		33	url(r'^experiment/(?P<id_exp>-?\d+)/import/$', views.experiment_import, name='url_import_experiment'),
		34	url(r'^experiment/(?P<id_exp>-?\d+)/mix/$', views.experiment_mix, name='url_mix_experiment'),
		35	url(r'^experiment/(?P<id_exp>-?\d+)/mix/delete/$', views.experiment_mix_delete, name='url_delete_mix_experiment'),
		36	url(r'^experiment/(?P<id_exp>-?\d+)/summary/$', views.experiment_summary, name='url_sum_experiment'),
		37	url(r'^experiment/(?P<id_exp>-?\d+)/verify/$', views.experiment_verify, name='url_verify_experiment'),
		38
		39	url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/$', views.dev_conf_new, name='url_add_dev_conf'),
		40	url(r'^experiment/(?P<id_exp>-?\d+)/new_dev_conf/(?P<id_dev>-?\d+)/$', views.dev_conf_new, name='url_add_dev_conf'),
		41	url(r'^dev_conf/$', views.dev_confs, name='url_dev_confs'),
		42	url(r'^dev_conf/(?P<id_conf>-?\d+)/$', views.dev_conf, name='url_dev_conf'),
		43	url(r'^dev_conf/(?P<id_conf>-?\d+)/edit/$', views.dev_conf_edit, name='url_edit_dev_conf'),
		44	url(r'^dev_conf/(?P<id_conf>-?\d+)/delete/$', views.dev_conf_delete, name='url_delete_dev_conf'),
		45
		46	url(r'^dev_conf/(?P<id_conf>-?\d+)/write/$', views.dev_conf_write, name='url_write_dev_conf'),
		47	url(r'^dev_conf/(?P<id_conf>-?\d+)/read/$', views.dev_conf_read, name='url_read_dev_conf'),
		48	url(r'^dev_conf/(?P<id_conf>-?\d+)/import/$', views.dev_conf_import, name='url_import_dev_conf'),
		49	url(r'^dev_conf/(?P<id_conf>-?\d+)/export/$', views.dev_conf_export, name='url_export_dev_conf'),
		50	url(r'^dev_conf/(?P<id_conf>-?\d+)/start/$', views.dev_conf_start, name='url_start_dev_conf'),
		51	url(r'^dev_conf/(?P<id_conf>-?\d+)/stop/$', views.dev_conf_stop, name='url_stop_dev_conf'),
		52	url(r'^dev_conf/(?P<id_conf>-?\d+)/status/$', views.dev_conf_status, name='url_status_dev_conf'),
		53
		54	url(r'^operation/$', views.operation, name='url_operation'),
		55	url(r'^operation/(?P<id_camp>-?\d+)/$', views.operation, name='url_operation'),
		56	url(r'^operation/search/$', views.operation_search, name='url_operation_search'),
		57	url(r'^operation/search/(?P<id_camp>-?\d+)/$', views.operation_search, name='url_operation_search'),
		58	url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/play/$', views.radar_play, name='url_radar_play'),
		59	url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/stop/$', views.radar_stop, name='url_radar_stop'),
		60	url(r'^operation/(?P<id_camp>-?\d+)/radar/(?P<id_radar>-?\d+)/refresh/$', views.radar_refresh, name='url_radar_refresh'),
59	)	61	)

apps/main/views.py +30 -70

             from django.db.models import Q
             from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
             from django.contrib import messages
+            from django.http.request import QueryDict
             from datetime import datetime
-            import urllib
+            try:
+                from urllib.parse import urlencode
+            except ImportError:
+                from urllib import urlencode
             from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
             from .forms import OperationSearchForm, FilterForm
-            from apps.cgs.forms import CGSConfigurationForm
+            from apps.rc.forms import RCConfigurationForm
+            from apps.dds.forms import DDSConfigurationForm
             from apps.jars.forms import JARSConfigurationForm
-            from apps.usrp.forms import USRPConfigurationForm
+            from apps.cgs.forms import CGSConfigurationForm
             from apps.abs.forms import ABSConfigurationForm
-            from apps.rc.forms import RCConfigurationForm, RCMixConfigurationForm
+            from apps.usrp.forms import USRPConfigurationForm
-            from apps.dds.forms import DDSConfigurationForm
             from .models import Campaign, Experiment, Device, Configuration, Location, RunningExperiment
             from apps.cgs.models import CGSConfiguration
                 kwargs['suptitle'] = 'List'
                 kwargs['form'] = form
                 filters.pop('page', None)
-                kwargs['q'] = urllib.urlencode(filters)
+                kwargs['q'] = urlencode(filters)
                 return render(request, 'base_list.html', kwargs)
                 kwargs['suptitle'] = 'List'
                 kwargs['form'] = form
                 filters.pop('page', None)
-                kwargs['q'] = urllib.urlencode(filters)
+                kwargs['q'] = urlencode(filters)
                 return render(request, 'base_list.html', kwargs)
                 if request.method == 'POST':
                     form = ExperimentForm(request.POST)
-                    print form.data
                     if form.is_valid():
                         experiment = form.save()
                 kwargs['suptitle'] = 'List'
                 kwargs['form'] = form
                 filters.pop('page', None)
-                kwargs['q'] = urllib.urlencode(filters)
+                kwargs['q'] = urlencode(filters)
                 return render(request, 'base_list.html', kwargs)
                 initial = {}
                 kwargs = {}
-                if id_exp<>0:
+                if id_exp!=0:
                     initial['experiment'] = id_exp
-                if id_dev<>0:
+                if id_dev!=0:
                     initial['device'] = id_dev
                 if request.method == 'GET':
                 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)
+                    form = DevConfForm(instance=conf)
                 if request.method=='POST':
-                    form = DevConfForm(request.POST, instance=dev_conf)
+                    form = DevConfForm(request.POST, instance=conf)
                     if form.is_valid():
                         form.save()
                 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:
                 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:
                 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:
                 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()
                 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()
             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()
                 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)
             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'
+                campaigns = Campaign.objects.filter(start_date__lte=datetime.now(),
-                        kwargs['suptitle'] = 'Empty'
+                                                    end_date__gte=datetime.now()).order_by('-start_date')
-                        return render(request, 'operation.html', kwargs)
-                    id_camp = campaigns[0].id
+                if id_camp:
                     campaign = get_object_or_404(Campaign, pk = id_camp)
+                    form = OperationForm(initial={'campaign': campaign.id}, campaigns=campaigns)
+                    kwargs['campaign'] = campaign
+                else:
+                    form = OperationForm(campaigns=campaigns)
+                    kwargs['form'] = form
+                    return render(request, 'operation.html', kwargs)
-                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
+                kwargs['locations'] = campaign.get_experiments_by_location()
+                print kwargs['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)
                     return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp]))
                 else:
                     return HttpResponseRedirect(reverse('url_operation', args=[id_camp]))

apps/misc/urls.py +2 -2

-            from django.conf.urls import patterns, url
+            from django.conf.urls import url
-            urlpatterns = patterns('apps.misc.views',
+            urlpatterns = (
             )

apps/rc/forms.py +1 -3

                         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:
+                            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 Meta:
                     model = RCLineCode
                     exclude = ('name',)
-  No newline at end of file

apps/rc/models.py +20 -20

             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
                     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'] = line.get_name()
+                            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
                     positions = {'tx':0, 'tr':0}
                     for i, line_data in enumerate(data['lines']):
+                        name = line_data.pop('name', '')
                         line_type = RCLineType.objects.get(name=line_data.pop('type'))
                         if line_type.name=='codes':
                             code = RCLineCode.objects.get(name=line_data['code'])
                     points = list(points)
                     points.sort()
-                    if points[0]<>0:
+                    if points[0]!=0:
                         points.insert(0, 0)
                     return [points[i+1]-points[i] for i in range(len(points)-1)]
                     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
+                    from bokeh.models.tools import WheelZoomTool, ResetTool, PanTool, HoverTool, SaveTool
                     lines = self.get_lines()
                     for i, line in enumerate(lines):
                         labels.append(line.get_name(channel=True))
                         l = ax.plot((0, npoints),(N-i-1, N-i-1))
-                        points = [(tup[0], tup[1]-tup[0]) for tup in line.pulses_as_points(km=km) if tup<>(0,0)]
+                        points = [(tup[0], tup[1]-tup[0]) for tup in line.pulses_as_points(km=km) if tup!=(0,0)]
                         ax.broken_barh(points, (N-i-1, 0.5),
                                        edgecolor=l[0].get_color(), facecolor='none')
                     labels.reverse()
+                    ax.set_yticks(range(len(labels)))
                     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()]
+                    plot.tools = [PanTool(dimensions=['width']), WheelZoomTool(dimensions=['width']), ResetTool(), SaveTool()]
+                    plot.toolbar_location="above"
                     return components(plot, CDN)
                     db_table = 'rc_line_codes'
                     ordering = ('name',)
-                def __unicode__(self):
+                def __str__(self):
                     return u'%s' % self.name
                 class Meta:
                     db_table = 'rc_line_types'
-                def __unicode__(self):
+                def __str__(self):
                     return u'%s - %s' % (self.name.upper(), self.get_name_display())
                     db_table = 'rc_lines'
                     ordering = ['channel']
-                def __unicode__(self):
+                def __str__(self):
                     if self.rc_configuration:
                         return u'%s - %s' % (self.rc_configuration, self.get_name())
                             ranges = params['range'].split(',')
-                            if len(ranges)>0 and ranges[0]<>'0':
+                            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':
+                            if len(tr_ranges)>0 and tr_ranges[0]!='0':
                                 y_tx = self.mask_ranges(y_tx, tr_ranges)
                             y.extend(y_tx)
-                        self.pulses = unicode(y)
+                        self.pulses = str(y)
                         y = self.array_to_points(self.pulses_as_array())
                     elif self.line_type.name=='tx':
                             ranges = params['range'].split(',')
-                            if len(ranges)>0 and ranges[0]<>'0':
+                            if len(ranges)>0 and ranges[0]!='0':
                                 y = self.mask_ranges(y, ranges)
                     elif self.line_type.name=='flip':
                         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])
+                        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)
                             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':
+                        if len(ranges)>0 and ranges[0]!='0':
                             y = self.mask_ranges(y, ranges)
                     elif self.line_type.name=='sync':
                                                     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':
+                                if len(tr_ranges)>0 and tr_ranges[0]!='0':
                                     y_win = self.mask_ranges(y_win, tr_ranges)
                                 y.extend(y_win)
                     else:
                         y = []
-                    if self.rc_configuration.total_units <> total:
+                    if self.rc_configuration.total_units != total:
                         self.rc_configuration.total_units = total
                         self.rc_configuration.save()
-                    self.pulses = unicode(y)
+                    self.pulses = str(y)
                     self.save()
                 @staticmethod

apps/rc/templates/rc_lines.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/templates/rc_pulses.html 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/urls.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/views.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/rc/widgets.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/usrp/models.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

apps/usrp/urls.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

devices/dds/api.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

devices/jro_device.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

devices/rc/api.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

radarsys/settings.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

radarsys/urls.py 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

requirements.txt 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

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