##// END OF EJS Templates
radarsys
RSS
git-svn-id: http://jro-dev.igp.gob.pe/svn/jro_hard/radarsys/trunk/webapp@157 aa17d016-51d5-4e8b-934c-7b2bbb1bbe71
Fiorella Quino -
r136:82a57ea8b8e3
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,6 +1,7
1 1 from django.contrib import admin
2 from .models import JARSConfiguration
2 from .models import JARSConfiguration, JARSfilter
3 3
4 4 # Register your models here.
5 5
6 6 admin.site.register(JARSConfiguration)
7 admin.site.register(JARSfilter)
Show file before | Show file after | Hide comments
@@ -28,7 +28,7 class JARSConfigurationForm(forms.ModelForm):
28 28
29 29 class Meta:
30 30 model = JARSConfiguration
31 exclude = ('type', 'parameters', 'status')
31 exclude = ('type', 'parameters', 'status', 'filter_parms')
32 32
33 33
34 34 class JARSfilterForm(forms.ModelForm):
Show file before | Show file after | Hide comments
@@ -28,7 +28,35 class JARSfilter(models.Model):
28 28
29 29 class Meta:
30 30 db_table = 'jars_filters'
31 #ordering = ['channel']
31
32 def __unicode__(self):
33 return u'%s' % (self.name)
34
35 def parms_to_dict(self):
36
37 parameters = {}
38
39 parameters['name'] = self.name
40 parameters['clock'] = float(self.clock)
41 parameters['mult'] = int(self.mult)
42 parameters['fch'] = float(self.fch)
43 parameters['filter_fir'] = int(self.filter_fir)
44 parameters['filter_2'] = int(self.filter_2)
45 parameters['filter_5'] = int(self.filter_5)
46 parameters['speed'] = int(self.speed)
47
48 return parameters
49
50 def dict_to_parms(self, parameters):
51
52 self.name = parameters['name']
53 self.clock = parameters['clock']
54 self.mult = parameters['mult']
55 self.fch = parameters['fch']
56 self.filter_fir = parameters['filter_fir']
57 self.filter_2 = parameters['filter_2']
58 self.filter_5 = parameters['filter_5']
59 self.speed = parameters['speed']
32 60
33 61
34 62 class JARSConfiguration(Configuration):
@@ -59,6 +87,7 class JARSConfiguration(Configuration):
59 87 acq_link = models.BooleanField(verbose_name='Acquisition Link', default=True)
60 88 view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True)
61 89 save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True)
90 filter_parms = models.CharField(max_length=10000, default='{}')
62 91
63 92 class Meta:
64 93 db_table = 'jars_configurations'
@@ -86,6 +115,10 class JARSConfiguration(Configuration):
86 115
87 116 return parameters
88 117
118 def add_parms_to_filter(self):
119 self.filter_parms = self.filter.parms_to_dict()
120 self.save()
121
89 122 def dict_to_parms(self, parameters):
90 123 return
91 124
Show file before | Show file after | Hide comments
@@ -23,10 +23,12 def jars_conf(request, id_conf):
23 23
24 24 kwargs['dev_conf'] = conf
25 25 kwargs['dev_conf_keys'] = ['experiment', 'device',
26 'cards_number', 'channels_number',
27 'rd_directory', 'create_directory',
28 'include_expname', 'raw_data_blocks',
29 'acq_profiles', 'profiles_block', 'filter']
26 'cards_number', 'channels_number', 'channels',
27 'rd_directory', 'raw_data_blocks', 'data_type',
28 'acq_profiles', 'profiles_block', 'fftpoints',
29 'incohe_integr', 'filter', 'spectral_number',
30 'spectral', 'create_directory', 'include_expname',
31 'acq_link', 'view_raw_data', 'save_ch_dc']
30 32
31 33 kwargs['title'] = 'JARS Configuration'
32 34 kwargs['suptitle'] = 'Details'
@@ -73,6 +75,16 def view_filter(request, conf_id, filter_id):
73 75 conf = get_object_or_404(JARSConfiguration, pk=conf_id)
74 76 filter = get_object_or_404(JARSfilter, pk=filter_id)
75 77
78 filter_parms = eval(conf.filter_parms)
79 filter.name = filter_parms['name']
80 filter.clock = filter_parms['clock']
81 filter.mult = filter_parms['mult']
82 filter.fch = filter_parms['fch']
83 filter.filter_fir = filter_parms['filter_fir']
84 filter.filter_2 = filter_parms['filter_2']
85 filter.filter_5 = filter_parms['filter_5']
86 filter.speed = filter_parms['speed']
87
76 88 kwargs = {}
77 89 kwargs['conf'] = conf
78 90 kwargs['filter'] = filter
@@ -93,20 +105,35 def view_filter(request, conf_id, filter_id):
93 105 def edit_filter(request, conf_id, filter_id):
94 106
95 107 conf = get_object_or_404(JARSConfiguration, pk=conf_id)
108 filter_parms = eval(conf.filter_parms)
96 109
97 110 if filter_id:
98 111 filter = get_object_or_404(JARSfilter, pk=filter_id)
99 112
100 113 if request.method=='GET':
101 form = JARSfilterForm(instance=filter)
114 form = JARSfilterForm(initial=filter_parms)
102 115
103 116 if request.method=='POST':
117 parms = {}
118 parms['name'] = request.POST['name']
119 parms['clock'] = request.POST['clock']
120 parms['mult'] = request.POST['mult']
121 parms['fch'] = request.POST['fch']
122 parms['filter_fir'] = request.POST['filter_fir']
123 parms['filter_2'] = request.POST['filter_2']
124 parms['filter_5'] = request.POST['filter_5']
125 parms['speed'] = request.POST['speed']
126
127 conf.filter_parms = parms
128 conf.save()
129
104 130 #form = JARSfilterForm(request.POST)
105 form = JARSfilterForm(request.POST, instance=filter)
106 if form.is_valid():
107 form.save()
108 messages.success(request, 'JARS Filter successfully updated')
109 return redirect('url_jars_filter', conf.id, filter.id)
131 #form = JARSfilterForm(request.POST, instance=filter)
132 #if form.is_valid():
133 #form.save()
134 # messages.success(request, 'JARS Filter successfully updated')
135 # return redirect('url_jars_filter', conf.id, filter.id)
136 return redirect('url_jars_filter', conf.id, filter.id)
110 137
111 138 kwargs = {}
112 139 kwargs['form'] = form
General Comments 0
You need to be logged in to leave comments. Login now