diff --git a/apps/cgs/models.py b/apps/cgs/models.py index 76f547e..a615c60 100644 --- a/apps/cgs/models.py +++ b/apps/cgs/models.py @@ -11,13 +11,11 @@ class CGSConfiguration(models.Model): device = models.ForeignKey(Device) exp = models.ForeignKey(Experiment, default = None) - freq0 = models.FloatField(verbose_name='Frequency 0',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) - freq1 = models.FloatField(verbose_name='Frequency 1',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) + freq0 = models.FloatField(verbose_name='Frequency 0',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) + freq1 = models.FloatField(verbose_name='Frequency 1',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) freq2 = models.FloatField(verbose_name='Frequency 2',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) - freq3 = models.PositiveIntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) + freq3 = models.PositiveIntegerField(verbose_name='Frequency 3',validators=[MinValueValidator(62.5e6), MaxValueValidator(450e6)]) freqs = JSONField(default={"frequencies":[{"f0":freq0,"f1":freq1,"f2":freq2,"f3":freq3}]}, blank=True) #clk_in = models.PositiveIntegerField(default=10e6) #mult = models.PositiveIntegerField(default=40) #div = models.PositiveIntegerField(default=1) - - diff --git a/radarsys/settings.py b/radarsys/settings.py index deff707..5b0949e 100644 --- a/radarsys/settings.py +++ b/radarsys/settings.py @@ -44,6 +44,7 @@ INSTALLED_APPS = ( 'apps.cgs', 'apps.acq', 'apps.abs', + 'json_field' ) MIDDLEWARE_CLASSES = ( @@ -112,10 +113,10 @@ STATIC_ROOT = '/var/www/html/static/' STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'apps', 'main', 'static'), - + ) -STATICFILES_FINDERS = ( +STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', ) diff --git a/requirements.txt b/requirements.txt index 9790f1b..2ffec5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ Django==1.8.6 django-bootstrap3==6.2.2 MySQL-python==1.2.5 +django-json-field==0.5.7