diff --git a/apps/jars/fixtures/initial_filters_data.json b/apps/jars/fixtures/initial_filters_data.json index e913b58..f4c6f32 100644 --- a/apps/jars/fixtures/initial_filters_data.json +++ b/apps/jars/fixtures/initial_filters_data.json @@ -1,2 +1,2 @@ -[{"fields": {"name": "49_920MHz_clock60MHz_F0MHz_12_25_2", "clock": "60", "mult": 5, "fch": 49.92, "filter_fir": 6, "filter_2": 10, "filter_5": 1, "speed": 0}, "model": "jars.jarsfilter", "pk": 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}, ] \ No newline at end of file diff --git a/apps/jars/models.py b/apps/jars/models.py index 4af1927..32981d5 100644 --- a/apps/jars/models.py +++ b/apps/jars/models.py @@ -83,6 +83,7 @@ class JARSConfiguration(Configuration): acq_profiles = models.PositiveIntegerField(verbose_name='Acquired Profiles', validators=[MaxValueValidator(5000)], default=400) profiles_block = models.PositiveIntegerField(verbose_name='Profiles Per Block', validators=[MaxValueValidator(5000)], default=400) fftpoints = models.PositiveIntegerField(verbose_name='FFT Points',default=16) + cohe_integr = models.PositiveIntegerField(verbose_name='Coherent Integrations',validators=[MinValueValidator(1)], default=30) incohe_integr = models.PositiveIntegerField(verbose_name='Incoherent Integrations',validators=[MinValueValidator(1)], default=30) filter = models.ForeignKey(JARSfilter, on_delete=models.CASCADE, null=True) spectral_number = models.PositiveIntegerField(verbose_name='# Spectral Combinations',validators=[MinValueValidator(1)], default=1) diff --git a/apps/jars/static/js/jars.js b/apps/jars/static/js/jars.js index 2aeb75c..9bdb633 100644 --- a/apps/jars/static/js/jars.js +++ b/apps/jars/static/js/jars.js @@ -8,7 +8,7 @@ $("#id_exp_type").change(function() { function RawDataOrPData(){ var type = $("#id_exp_type").val(); - //spectral_number = $("#id_spectral_number") + incohe_integr = $("#id_incohe_integr") spectral = $("#id_spectral") fftpoints = $("#id_fftpoints") save_ch_dc = $("#id_save_ch_dc") @@ -19,7 +19,7 @@ function RawDataOrPData(){ all_spec_button = $("#all_spectral_button") if (type == 0) { - //$(spectral_number).attr('readonly', true); + $(incohe_integr).attr('readonly', true); $(spectral).attr('readonly', true); $(fftpoints).attr('readonly', true); $(save_ch_dc).attr('disabled', true); @@ -31,7 +31,7 @@ function RawDataOrPData(){ $(all_spec_button).attr('disabled', true); } else { - //$(spectral_number).attr('readonly', true); + $(incohe_integr).attr('readonly', false); $(spectral).attr('readonly', false); $(fftpoints).attr('readonly', false); $(save_ch_dc).attr('disabled', false);