##// END OF EJS Templates
radarsys
RSS
Task #1119: bugs and jars_new_filter.html has been deleted...
Fiorella Quino -
r272:8a3674516291
parent child
Show More
Show file before | Show file after | Hide comments
@@ -67,7 +67,7 class JARSfilterForm(forms.ModelForm):
67 jars_filter = JARSfilter.objects.get(pk=kwargs['initial']['filter_id'])
67 jars_filter = JARSfilter.objects.get(pk=kwargs['initial']['filter_id'])
68 labels = [f.name for f in jars_filter._meta.get_fields()]
68 labels = [f.name for f in jars_filter._meta.get_fields()]
69
69
70 for label in ['id', 'jarsconfiguration']:
70 for label in ['id']:
71 labels.remove(label)
71 labels.remove(label)
72 for label in labels:
72 for label in labels:
73 self.fields['name'].initial = kwargs['initial']['filter_id']
73 self.fields['name'].initial = kwargs['initial']['filter_id']
Show file before | Show file after | Hide comments
@@ -95,7 +95,6 class JARSConfiguration(Configuration):
95 incohe_integr = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30)
95 incohe_integr = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30)
96 decode_data = models.PositiveIntegerField(verbose_name='Decode Data', choices=DECODE_TYPE, default=0)
96 decode_data = models.PositiveIntegerField(verbose_name='Decode Data', choices=DECODE_TYPE, default=0)
97 post_coh_int = models.BooleanField(verbose_name='Post Coherent Integration', default=False)
97 post_coh_int = models.BooleanField(verbose_name='Post Coherent Integration', default=False)
98 filter = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True)
99 spectral_number = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1)
98 spectral_number = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1)
100 spectral = models.CharField(verbose_name='Combinations', max_length=5000, default = '[0, 0],')
99 spectral = models.CharField(verbose_name='Combinations', max_length=5000, default = '[0, 0],')
101 create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True)
100 create_directory = models.BooleanField(verbose_name='Create Directory Per Day', default=True)
@@ -103,15 +102,11 class JARSConfiguration(Configuration):
103 #view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True)
102 #view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True)
104 save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True)
103 save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True)
105 save_data = models.BooleanField(verbose_name='Save Data', default=True)
104 save_data = models.BooleanField(verbose_name='Save Data', default=True)
106 filter_parms = models.CharField(max_length=10000, default='{"name": "49_92MHz_clock60MHz_F1KHz_12_25_2", "clock": 60, "mult": 5, "fch": 49.92, "fch_decimal": 721554506, "filter_fir": 2, "filter_2": 12, "filter_5": 25}, "model": "jars.jarsfilter", "pk": 1}')
105 filter_parms = models.CharField(max_length=10000, default='{"clock": 60, "mult": 5, "fch": 49.92, "fch_decimal": 721554506, "filter_fir": 2, "filter_2": 12, "filter_5": 25}, "model": "jars.jarsfilter", "pk": 1}')
107
106
108 class Meta:
107 class Meta:
109 db_table = 'jars_configurations'
108 db_table = 'jars_configurations'
110
109
111 def add_parms_to_filter(self):
112 self.filter_parms = self.filter.parms_to_dict()
113 self.save()
114
115 def filter_resolution(self):
110 def filter_resolution(self):
116 filter_parms = eval(self.filter_parms)
111 filter_parms = eval(self.filter_parms)
117 if filter_parms.__class__.__name__=='str':
112 if filter_parms.__class__.__name__=='str':
Show file before | Show file after | Hide comments
@@ -180,9 +180,9 def change_filter(request, conf_id, filter_id=None):
180
180
181 if request.method=='GET':
181 if request.method=='GET':
182 if not filter_id:
182 if not filter_id:
183 form = JARSfilterForm(initial={'jars_configuration':conf_id, 'filter_id': 0})
183 form = JARSfilterForm(initial={'filter_id': 0})
184 else:
184 else:
185 form = JARSfilterForm(initial={'jars_configuration':conf_id, 'filter_id': filter_id})
185 form = JARSfilterForm(initial={'filter_id': filter_id})
186
186
187 if request.method=='POST':
187 if request.method=='POST':
188 form = JARSfilterForm(request.POST)
188 form = JARSfilterForm(request.POST)
General Comments 0
You need to be logged in to leave comments. Login now