| @@ -283,7 +283,7 class ABSConfiguration(Configuration): | |||
|
|
283 | 283 | module_port = self.device.port_address |
|
|
284 | 284 | read_route = 'http://'+module_ip+':'+str(module_port)+'/read' |
|
|
285 | 285 | |
|
|
286 |
print |
|
|
|
286 | print(read_route) | |
|
|
287 | 287 | |
|
|
288 | 288 | answer = '' |
|
|
289 | 289 | module_bits = '' |
| @@ -410,10 +410,10 class ABSConfiguration(Configuration): | |||
|
|
410 | 410 | sock.connect(module_address) |
|
|
411 | 411 | sock.send(message_tx) |
|
|
412 | 412 | sock.close() |
|
|
413 |
print |
|
|
|
413 | print("Writing abs module:"+module_address[0]+"...") | |
|
|
414 | 414 | except: |
|
|
415 | 415 | sock = None |
|
|
416 |
print |
|
|
|
416 | print("Problem writing abs module:"+module_address[0]) | |
|
|
417 | 417 | return 0 |
|
|
418 | 418 | |
|
|
419 | 419 | return 1 |
| @@ -427,7 +427,7 class ABSConfiguration(Configuration): | |||
|
|
427 | 427 | try: |
|
|
428 | 428 | self.beam_selector(i,beam_pos) |
|
|
429 | 429 | except: |
|
|
430 |
print |
|
|
|
430 | print("Problem with module: 192.168.1."+str(i)) | |
|
|
431 | 431 | self.message = "Problem with module: 192.168.1."+str(i) |
|
|
432 | 432 | #return 0 |
|
|
433 | 433 | return 1 |
| @@ -554,7 +554,7 class ABSConfiguration(Configuration): | |||
|
|
554 | 554 | for j in jobs: |
|
|
555 | 555 | j.join() |
|
|
556 | 556 | |
|
|
557 |
print |
|
|
|
557 | print("List processing complete.") | |
|
|
558 | 558 | return 1 |
|
|
559 | 559 | |
|
|
560 | 560 | |
| @@ -1,6 +1,6 | |||
|
|
1 | 1 | from django.conf.urls import url |
|
|
2 | 2 | |
|
|
3 | import views | |
|
|
3 | from apps.abs import views | |
|
|
4 | 4 | |
|
|
5 | 5 | urlpatterns = ( |
|
|
6 | 6 | url(r'^(?P<id_conf>-?\d+)/$', views.abs_conf, name='url_abs_conf'), |
| @@ -4,7 +4,6 from itertools import chain | |||
|
|
4 | 4 | |
|
|
5 | 5 | from django import forms |
|
|
6 | 6 | from django.utils.safestring import mark_safe |
|
|
7 | from django.utils.encoding import force_unicode | |
|
|
8 | 7 | from django.utils.html import conditional_escape |
|
|
9 | 8 | |
|
|
10 | 9 | style = """<style> |
| @@ -1401,8 +1401,8 def operation(request, id_camp=None): | |||
|
|
1401 | 1401 | kwargs = {} |
|
|
1402 | 1402 | campaigns = Campaign.objects.filter(start_date__lte=datetime.now(), |
|
|
1403 | 1403 | end_date__gte=datetime.now()).order_by('-start_date') |
|
|
1404 | ||
|
|
1405 | ||
|
|
1404 | ||
|
|
1405 | ||
|
|
1406 | 1406 | if id_camp: |
|
|
1407 | 1407 | campaign = get_object_or_404(Campaign, pk = id_camp) |
|
|
1408 | 1408 | form = OperationForm(initial={'campaign': campaign.id}, campaigns=campaigns) |
| @@ -1412,19 +1412,18 def operation(request, id_camp=None): | |||
|
|
1412 | 1412 | kwargs['form'] = form |
|
|
1413 | 1413 | return render(request, 'operation.html', kwargs) |
|
|
1414 | 1414 | |
|
|
1415 | ||
|
|
1416 | ||
|
|
1415 | ||
|
|
1416 | ||
|
|
1417 | 1417 | #---Experiment |
|
|
1418 | 1418 | keys = ['id', 'name', 'start_time', 'end_time', 'status'] |
|
|
1419 | 1419 | kwargs['experiment_keys'] = keys[1:] |
|
|
1420 | 1420 | kwargs['experiments'] = experiments |
|
|
1421 | 1421 | #---Radar |
|
|
1422 | 1422 | kwargs['locations'] = campaign.get_experiments_by_location() |
|
|
1423 | print kwargs['locations'] | |
|
|
1424 | 1423 | #---Else |
|
|
1425 | 1424 | kwargs['title'] = 'Campaign' |
|
|
1426 | 1425 | kwargs['suptitle'] = campaign.name |
|
|
1427 |
kwargs['form'] = form |
|
|
|
1426 | kwargs['form'] = form | |
|
|
1428 | 1427 | |
|
|
1429 | 1428 | return render(request, 'operation.html', kwargs) |
|
|
1430 | 1429 | |
| @@ -1586,4 +1585,3 def radar_refresh(request, id_camp, id_radar): | |||
|
|
1586 | 1585 | return HttpResponseRedirect(reverse('url_operation_search', args=[id_camp])) |
|
|
1587 | 1586 | else: |
|
|
1588 | 1587 | return HttpResponseRedirect(reverse('url_operation', args=[id_camp])) |
|
|
1589 | ||
General Comments 0
You need to be logged in to leave comments.
Login now