##// END OF EJS Templates
radarsys_met
RSS
Task #99: Filters (jars_conf_edit.html, models, views)...
Fiorella Quino -
r134:0c3664709fe5
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,95 +1,99
1 from django.db import models
1 from django.db import models
2 from apps.main.models import Configuration
2 from apps.main.models import Configuration
3 from django.core.validators import MinValueValidator, MaxValueValidator
3 from django.core.validators import MinValueValidator, MaxValueValidator
4
4
5 from apps.rc.models import RCConfiguration
5 from apps.rc.models import RCConfiguration
6 # Create your models here.
6 # Create your models here.
7
7
8 EXPERIMENT_TYPE = (
8 EXPERIMENT_TYPE = (
9 (0, 'RAW_DATA'),
9 (0, 'RAW_DATA'),
10 (1, 'PDATA'),
10 (1, 'PDATA'),
11 )
11 )
12
12
13 DATA_TYPE = (
13 DATA_TYPE = (
14 (0, 'SHORT'),
14 (0, 'SHORT'),
15 (1, 'FLOAT'),
15 (1, 'FLOAT'),
16 )
16 )
17
17
18 class JARSfilter(models.Model):
18 class JARSfilter(models.Model):
19
19
20 name = models.CharField(max_length=60, unique=True, default='')
20 name = models.CharField(max_length=60, unique=True, default='')
21 filter_fir = models.PositiveIntegerField(verbose_name='FIR Filter',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1)
21 clock = models.FloatField(verbose_name='Clock Input (MHz)',validators=[MinValueValidator(5), MaxValueValidator(75)], null=True, default=60)
22 filter_2 = models.PositiveIntegerField(verbose_name='Filter 2',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1)
22 mult = models.PositiveIntegerField(verbose_name='Multiplier',validators=[MinValueValidator(1), MaxValueValidator(20)], default=5)
23 fch = models.DecimalField(verbose_name='Frequency (MHz)', validators=[MinValueValidator(0), MaxValueValidator(150)], max_digits=19, decimal_places=16, null=True, default=49.9200)
24 filter_fir = models.PositiveIntegerField(verbose_name='FIR Filter',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 6)
25 filter_2 = models.PositiveIntegerField(verbose_name='Filter 2',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 10)
23 filter_5 = models.PositiveIntegerField(verbose_name='Filter 5',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1)
26 filter_5 = models.PositiveIntegerField(verbose_name='Filter 5',validators=[MinValueValidator(1), MaxValueValidator(20)], default = 1)
27 speed = models.PositiveIntegerField(verbose_name='Speed',validators=[MinValueValidator(0), MaxValueValidator(100000)], default = 0)
24
28
25 class Meta:
29 class Meta:
26 db_table = 'jars_filters'
30 db_table = 'jars_filters'
27 #ordering = ['channel']
31 #ordering = ['channel']
28
32
29
33
30 class JARSConfiguration(Configuration):
34 class JARSConfiguration(Configuration):
31
35
32 ADC_RESOLUTION = 8
36 ADC_RESOLUTION = 8
33 PCI_DIO_BUSWIDTH = 32
37 PCI_DIO_BUSWIDTH = 32
34 HEADER_VERSION = 1103
38 HEADER_VERSION = 1103
35 BEGIN_ON_START = True
39 BEGIN_ON_START = True
36 REFRESH_RATE = 1
40 REFRESH_RATE = 1
37
41
38 rc = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE, null=True)
42 rc = models.ForeignKey(RCConfiguration, on_delete=models.CASCADE, null=True)
39 exp_type = models.PositiveIntegerField(verbose_name='Experiment Type', choices=EXPERIMENT_TYPE, default=0)
43 exp_type = models.PositiveIntegerField(verbose_name='Experiment Type', choices=EXPERIMENT_TYPE, default=0)
40 cards_number = models.PositiveIntegerField(verbose_name='Number of Cards', validators=[MinValueValidator(1), MaxValueValidator(4)], default = 1)
44 cards_number = models.PositiveIntegerField(verbose_name='Number of Cards', validators=[MinValueValidator(1), MaxValueValidator(4)], default = 1)
41 channels_number = models.PositiveIntegerField(verbose_name='Number of Channels', validators=[MinValueValidator(1), MaxValueValidator(8)], default = 5)
45 channels_number = models.PositiveIntegerField(verbose_name='Number of Channels', validators=[MinValueValidator(1), MaxValueValidator(8)], default = 5)
42 channels = models.CharField(verbose_name='Channels', max_length=15, default = '1,2,3,4,5')
46 channels = models.CharField(verbose_name='Channels', max_length=15, default = '1,2,3,4,5')
43 rd_directory = models.CharField(verbose_name='Raw Data Directory', max_length=40, default='', blank=True, null=True)
47 rd_directory = models.CharField(verbose_name='Raw Data Directory', max_length=40, default='', blank=True, null=True)
44 raw_data_blocks = models.PositiveIntegerField(verbose_name='Raw Data Blocks', validators=[MaxValueValidator(5000)], default=120)
48 raw_data_blocks = models.PositiveIntegerField(verbose_name='Raw Data Blocks', validators=[MaxValueValidator(5000)], default=120)
45 data_type = models.PositiveIntegerField(verbose_name='Data Type', choices=DATA_TYPE, default=0)
49 data_type = models.PositiveIntegerField(verbose_name='Data Type', choices=DATA_TYPE, default=0)
46 acq_profiles = models.PositiveIntegerField(verbose_name='Acquired Profiles', validators=[MaxValueValidator(5000)], default=400)
50 acq_profiles = models.PositiveIntegerField(verbose_name='Acquired Profiles', validators=[MaxValueValidator(5000)], default=400)
47 profiles_block = models.PositiveIntegerField(verbose_name='Profiles Per Block', validators=[MaxValueValidator(5000)], default=400)
51 profiles_block = models.PositiveIntegerField(verbose_name='Profiles Per Block', validators=[MaxValueValidator(5000)], default=400)
48 fftpoints = models.PositiveIntegerField(verbose_name='FFT Points',default=16)
52 fftpoints = models.PositiveIntegerField(verbose_name='FFT Points',default=16)
49 incohe_integr = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30)
53 incohe_integr = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30)
50 filter = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True, blank=True)
54 filter = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True, blank=True)
51 spectral_number = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1)
55 spectral_number = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1)
52 spectral = models.CharField(verbose_name='Combinations', max_length=5000, default = '[0, 0],')
56 spectral = models.CharField(verbose_name='Combinations', max_length=5000, default = '[0, 0],')
53 create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True)
57 create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True)
54 include_expname = models.BooleanField(verbose_name='Experiment Name in Directory', default=True)
58 include_expname = models.BooleanField(verbose_name='Experiment Name in Directory', default=True)
55 acq_link = models.BooleanField(verbose_name='Acquisition Link', default=True)
59 acq_link = models.BooleanField(verbose_name='Acquisition Link', default=True)
56 view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True)
60 view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True)
57 save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True)
61 save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True)
58
62
59 class Meta:
63 class Meta:
60 db_table = 'jars_configurations'
64 db_table = 'jars_configurations'
61
65
62 def parms_to_dict(self):
66 def parms_to_dict(self):
63
67
64 parameters = {}
68 parameters = {}
65
69
66 parameters['name'] = self.name
70 parameters['name'] = self.name
67 parameters['rc'] = self.rc.name
71 parameters['rc'] = self.rc.name
68 parameters['exp_type'] = self.exp_type
72 parameters['exp_type'] = self.exp_type
69 parameters['cards_number'] = self.cards_number
73 parameters['cards_number'] = self.cards_number
70 parameters['channels_number'] = self.channels_number
74 parameters['channels_number'] = self.channels_number
71 parameters['channels'] = self.channels
75 parameters['channels'] = self.channels
72 parameters['rd_directory'] = self.rd_directory
76 parameters['rd_directory'] = self.rd_directory
73 parameters['raw_data_blocks'] = self.raw_data_blocks
77 parameters['raw_data_blocks'] = self.raw_data_blocks
74 parameters['data_type'] = self.data_type
78 parameters['data_type'] = self.data_type
75 parameters['acq_profiles'] = self.acq_profiles
79 parameters['acq_profiles'] = self.acq_profiles
76 parameters['profiles_block'] = self.profiles_block
80 parameters['profiles_block'] = self.profiles_block
77 parameters['filter'] = self.filter.name
81 parameters['filter'] = self.filter.name
78 parameters['create_directory'] = bool(self.create_directory)
82 parameters['create_directory'] = bool(self.create_directory)
79 parameters['include_expname'] = bool(self.include_expname)
83 parameters['include_expname'] = bool(self.include_expname)
80 parameters['acq_link'] = bool(self.acq_link)
84 parameters['acq_link'] = bool(self.acq_link)
81 parameters['view_raw_data'] = bool(self.view_raw_data)
85 parameters['view_raw_data'] = bool(self.view_raw_data)
82
86
83 return parameters
87 return parameters
84
88
85 def dict_to_parms(self, parameters):
89 def dict_to_parms(self, parameters):
86 return
90 return
87
91
88 def status_device(self):
92 def status_device(self):
89 return
93 return
90
94
91 def read_device(self):
95 def read_device(self):
92 return
96 return
93
97
94 def write_device(self):
98 def write_device(self):
95 return No newline at end of file
99 return
Show file before | Show file after | Hide comments
@@ -1,8 +1,22
1 {% extends "dev_conf_edit.html" %}
1 {% extends "dev_conf_edit.html" %}
2 {% load bootstrap3 %}
2 {% load bootstrap3 %}
3 {% load static %}
3 {% load static %}
4 {% load main_tags %}
4 {% load main_tags %}
5
5
6 {% block content %}
7 <form class="form" method="post">
8 {% csrf_token %}
9 {% bootstrap_form form layout='horizontal' size='medium' %}
10 <div style="clear: both;"></div>
11 <br>
12 <div class="pull-right">
13 <button type="button" class="btn btn-primary" id="bt_add_line">See Filter</button>
14 <button type="button" class="btn btn-primary" onclick="{% if previous %}window.location.replace('{{ previous }}');{% else %}history.go(-1);{% endif %}">Cancel</button>
15 <button type="submit" class="btn btn-primary">{{button}}</button>
16 </div>
17 </form>
18 {% endblock %}
19
6 {% block extra-js%}
20 {% block extra-js%}
7 <script src="{% static 'js/jars.js' %}"></script>
21 <script src="{% static 'js/jars.js' %}"></script>
8 {% endblock %} No newline at end of file
22 {% endblock %}
Show file before | Show file after | Hide comments
@@ -1,67 +1,67
1 from django.shortcuts import render_to_response
1 from django.shortcuts import render_to_response
2 from django.template import RequestContext
2 from django.template import RequestContext
3 from django.shortcuts import redirect, render, get_object_or_404
3 from django.shortcuts import redirect, render, get_object_or_404
4
4
5 from apps.main.models import Device
5 from apps.main.models import Device
6 from apps.main.views import sidebar
6 from apps.main.views import sidebar
7
7
8 from .models import JARSConfiguration
8 from .models import JARSConfiguration
9 from .forms import JARSConfigurationForm
9 from .forms import JARSConfigurationForm
10 # Create your views here.
10 # Create your views here.
11
11
12 def jars_conf(request, id_conf):
12 def jars_conf(request, id_conf):
13
13
14 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
14 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
15
15
16 ip=conf.device.ip_address
16 ip=conf.device.ip_address
17 port=conf.device.port_address
17 port=conf.device.port_address
18
18
19 kwargs = {}
19 kwargs = {}
20
20
21 kwargs['status'] = conf.device.get_status_display()
21 kwargs['status'] = conf.device.get_status_display()
22
22
23
23
24 kwargs['dev_conf'] = conf
24 kwargs['dev_conf'] = conf
25 kwargs['dev_conf_keys'] = ['experiment', 'device',
25 kwargs['dev_conf_keys'] = ['experiment', 'device',
26 'cards_number', 'channels_number',
26 'cards_number', 'channels_number',
27 'rd_directory', 'create_directory',
27 'rd_directory', 'create_directory',
28 'include_expname', 'raw_data_blocks',
28 'include_expname', 'raw_data_blocks',
29 'acq_profiles', 'profiles_block']
29 'acq_profiles', 'profiles_block', 'filter']
30
30
31 kwargs['title'] = 'JARS Configuration'
31 kwargs['title'] = 'JARS Configuration'
32 kwargs['suptitle'] = 'Details'
32 kwargs['suptitle'] = 'Details'
33
33
34 kwargs['button'] = 'Edit Configuration'
34 kwargs['button'] = 'Edit Configuration'
35
35
36 kwargs['no_play'] = True
36 kwargs['no_play'] = True
37
37
38 ###### SIDEBAR ######
38 ###### SIDEBAR ######
39 kwargs.update(sidebar(conf=conf))
39 kwargs.update(sidebar(conf=conf))
40
40
41 return render(request, 'jars_conf.html', kwargs)
41 return render(request, 'jars_conf.html', kwargs)
42
42
43 def jars_conf_edit(request, id_conf):
43 def jars_conf_edit(request, id_conf):
44
44
45 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
45 conf = get_object_or_404(JARSConfiguration, pk=id_conf)
46
46
47 if request.method=='GET':
47 if request.method=='GET':
48 form = JARSConfigurationForm(instance=conf)
48 form = JARSConfigurationForm(instance=conf)
49
49
50 if request.method=='POST':
50 if request.method=='POST':
51 form = JARSConfigurationForm(request.POST, instance=conf)
51 form = JARSConfigurationForm(request.POST, instance=conf)
52
52
53 if form.is_valid():
53 if form.is_valid():
54 conf = form.save(commit=False)
54 conf = form.save(commit=False)
55 conf.save()
55 conf.save()
56 return redirect('url_jars_conf', id_conf=conf.id)
56 return redirect('url_jars_conf', id_conf=conf.id)
57
57
58 ##ERRORS
58 ##ERRORS
59
59
60 kwargs = {}
60 kwargs = {}
61 kwargs['id_dev'] = conf.id
61 kwargs['id_dev'] = conf.id
62 kwargs['form'] = form
62 kwargs['form'] = form
63 kwargs['title'] = 'Device Configuration'
63 kwargs['title'] = 'Device Configuration'
64 kwargs['suptitle'] = 'Edit'
64 kwargs['suptitle'] = 'Edit'
65 kwargs['button'] = 'Save'
65 kwargs['button'] = 'Save'
66
66
67 return render(request, 'jars_conf_edit.html', kwargs) No newline at end of file
67 return render(request, 'jars_conf_edit.html', kwargs)
General Comments 0
You need to be logged in to leave comments. Login now