From 2cb97688f0d5c250185c085e17954deae7443557 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 25 Apr 2014 20:31:32 +0200
Subject: [PATCH] Rename Parameters to Preset, add preset to Experience

---
 tests/server/diagram/timeside.dot             |   6 +-
 tests/server/diagram/timeside.pdf             | Bin 37478 -> 37436 bytes
 timeside/admin.py                             |   2 +-
 ...t__del_field_result_parameters__add_fie.py | 220 ++++++++++++++++++
 timeside/models.py                            |  76 +++---
 timeside/serializers.py                       |  12 +-
 timeside/urls.py                              |   2 +-
 timeside/views.py                             |  14 +-
 8 files changed, 277 insertions(+), 55 deletions(-)
 create mode 100644 timeside/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py

diff --git a/tests/server/diagram/timeside.dot b/tests/server/diagram/timeside.dot
index 5ec8a86..98bda6f 100644
--- a/tests/server/diagram/timeside.dot
+++ b/tests/server/diagram/timeside.dot
@@ -349,19 +349,19 @@ digraph model_graph {
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">hdf5</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">file</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">FileField</FONT>
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">output</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">hdf5</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">FileField</FONT>
     </TD></TR>
   
     <TR><TD ALIGN="LEFT" BORDER="0">
-    <FONT COLOR="#7B7B7B" FACE="Helvetica ">output_mime_type</FONT>
+    <FONT COLOR="#7B7B7B" FACE="Helvetica ">mime_type</FONT>
     </TD><TD ALIGN="LEFT">
     <FONT COLOR="#7B7B7B" FACE="Helvetica ">CharField</FONT>
     </TD></TR>
diff --git a/tests/server/diagram/timeside.pdf b/tests/server/diagram/timeside.pdf
index 5c5ec6dc2fe7d69a7df9842344603fdcdf9cdd9b..69293f228f3eed570842e0e6ecb81fae08e4782c 100644
GIT binary patch
delta 5042
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
ZGDvX=32`iKitaU0G$l8;ik>Rv{{Z8iCA$Cs

delta 5034
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

diff --git a/timeside/admin.py b/timeside/admin.py
index a6f882b..9ad18c1 100644
--- a/timeside/admin.py
+++ b/timeside/admin.py
@@ -6,7 +6,7 @@ admin.site.register(Selection)
 admin.site.register(Item)
 admin.site.register(Experience)
 admin.site.register(Processor)
-admin.site.register(Parameters)
+admin.site.register(Preset)
 admin.site.register(Result)
 admin.site.register(Task)
 
diff --git a/timeside/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py b/timeside/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py
new file mode 100644
index 0000000..5f9d3fe
--- /dev/null
+++ b/timeside/migrations/0006_auto__del_parameters__add_preset__del_field_result_parameters__add_fie.py
@@ -0,0 +1,220 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting model 'Parameters'
+        db.delete_table('timeside_parameters')
+
+        # Adding model 'Preset'
+        db.create_table('timeside_presets', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('processor', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='preset', null=True, to=orm['timeside.Processor'])),
+            ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('is_public', self.gf('django.db.models.fields.BooleanField')(default=False)),
+        ))
+        db.send_create_signal('timeside', ['Preset'])
+
+        # Deleting field 'Result.parameters'
+        db.delete_column('timeside_results', 'parameters_id')
+
+        # Adding field 'Result.preset'
+        db.add_column('timeside_results', 'preset',
+                      self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['timeside.Preset']),
+                      keep_default=False)
+
+
+        # Changing field 'Result.hdf5'
+        db.alter_column('timeside_results', 'hdf5', self.gf('django.db.models.fields.files.FileField')(default=0, max_length=1024))
+
+        # Changing field 'Result.file'
+        db.alter_column('timeside_results', 'file', self.gf('django.db.models.fields.files.FileField')(default=0, max_length=1024))
+        # Deleting field 'Experience.is_preset'
+        db.delete_column('timeside_experiences', 'is_preset')
+
+        # Adding field 'Experience.is_public'
+        db.add_column('timeside_experiences', 'is_public',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Removing M2M table for field processors on 'Experience'
+        db.delete_table(db.shorten_name('timeside_experiences_processors'))
+
+        # Adding M2M table for field presets on 'Experience'
+        m2m_table_name = db.shorten_name('timeside_experiences_presets')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('experience', models.ForeignKey(orm['timeside.experience'], null=False)),
+            ('preset', models.ForeignKey(orm['timeside.preset'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['experience_id', 'preset_id'])
+
+
+    def backwards(self, orm):
+        # Adding model 'Parameters'
+        db.create_table('timeside_parameters', (
+            ('parameters', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('is_preset', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('processor', self.gf('django.db.models.fields.related.ForeignKey')(related_name='parameters', null=True, to=orm['timeside.Processor'], blank=True)),
+        ))
+        db.send_create_signal('timeside', ['Parameters'])
+
+        # Deleting model 'Preset'
+        db.delete_table('timeside_presets')
+
+        # Adding field 'Result.parameters'
+        db.add_column('timeside_results', 'parameters',
+                      self.gf('django.db.models.fields.related.ForeignKey')(related_name='results', null=True, to=orm['timeside.Parameters'], on_delete=models.SET_NULL, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'Result.preset'
+        db.delete_column('timeside_results', 'preset_id')
+
+
+        # Changing field 'Result.hdf5'
+        db.alter_column('timeside_results', 'hdf5', self.gf('django.db.models.fields.files.FileField')(max_length=1024, null=True))
+
+        # Changing field 'Result.file'
+        db.alter_column('timeside_results', 'file', self.gf('django.db.models.fields.files.FileField')(max_length=1024, null=True))
+        # Adding field 'Experience.is_preset'
+        db.add_column('timeside_experiences', 'is_preset',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+        # Deleting field 'Experience.is_public'
+        db.delete_column('timeside_experiences', 'is_public')
+
+        # Adding M2M table for field processors on 'Experience'
+        m2m_table_name = db.shorten_name('timeside_experiences_processors')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('experience', models.ForeignKey(orm['timeside.experience'], null=False)),
+            ('processor', models.ForeignKey(orm['timeside.processor'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['experience_id', 'processor_id'])
+
+        # Removing M2M table for field presets on 'Experience'
+        db.delete_table(db.shorten_name('timeside_experiences_presets'))
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        'auth.permission': {
+            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'auth.user': {
+            'Meta': {'object_name': 'User'},
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'timeside.experience': {
+            'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'presets': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Preset']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'})
+        },
+        'timeside.item': {
+            'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}),
+            'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'})
+        },
+        'timeside.preset': {
+            'Meta': {'object_name': 'Preset', 'db_table': "'timeside_presets'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_public': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'preset'", 'null': 'True', 'to': "orm['timeside.Processor']"})
+        },
+        'timeside.processor': {
+            'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
+            'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'})
+        },
+        'timeside.result': {
+            'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"},
+            'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}),
+            'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}),
+            'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}),
+            'preset': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Preset']"}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'})
+        },
+        'timeside.selection': {
+            'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}),
+            'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}),
+            'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'})
+        },
+        'timeside.task': {
+            'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"},
+            'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}),
+            'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}),
+            'status': ('django.db.models.fields.IntegerField', [], {'default': '1'})
+        }
+    }
+
+    complete_apps = ['timeside']
\ No newline at end of file
diff --git a/timeside/models.py b/timeside/models.py
index 0210ddf..67052b4 100644
--- a/timeside/models.py
+++ b/timeside/models.py
@@ -109,15 +109,16 @@ class Item(DocBaseResource):
 
 class Experience(DocBaseResource):
 
-    processors = models.ManyToManyField('Processor', related_name="experiences", verbose_name=_('processors'), blank=True, null=True)
+    presets = models.ManyToManyField('Preset', related_name="experiences", verbose_name=_('presets'), blank=True, null=True)
     author = models.ForeignKey(User, related_name="experiences", verbose_name=_('author'), blank=True, null=True, on_delete=models.SET_NULL)
     experiences = models.ManyToManyField('Experience', related_name="other_experiences", verbose_name=_('other experiences'), blank=True, null=True)
-    is_preset = models.BooleanField(default=False)
+    is_public = models.BooleanField(default=False)
 
     class Meta(MetaCore):
         db_table = app + '_experiences'
         verbose_name = _('Experience')
 
+    
 
 class Processor(models.Model):
     
@@ -137,10 +138,25 @@ class Processor(models.Model):
         super(Processor, self).save(**kwargs)
         
 
+class Preset(models.Model):
+
+    processor = models.ForeignKey('Processor', related_name="preset", verbose_name=_('processor'), blank=True, null=True)
+    parameters = models.TextField(_('Parameters'), blank=True)
+    is_public = models.BooleanField(default=False)
+
+    class Meta:
+        db_table = app + '_presets'
+        verbose_name = _('Preset')
+        verbose_name_plural = _('Presets')
+
+    def __unicode__(self):
+        return '_'.join([unicode(self.processor), str(self.id)])
+
+    
 class Result(BaseResource):
 
     item = models.ForeignKey('Item', related_name="results", verbose_name=_('item'), blank=True, null=True, on_delete=models.SET_NULL)
-    parameters = models.ForeignKey('Parameters', related_name="results", verbose_name=_('parameters'), blank=True, null=True, on_delete=models.SET_NULL)
+    preset = models.ForeignKey('Preset', related_name="results", verbose_name=_('preset'), blank=True, null=True, on_delete=models.SET_NULL)
     hdf5 = models.FileField(_('HDF5 result file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024)
     file = models.FileField(_('Output file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024)
     mime_type = models.CharField(_('Output file MIME type'), blank=True, max_length=256)
@@ -159,21 +175,6 @@ class Result(BaseResource):
         return '_'.join([self.item.title, unicode(self.parameters.processor)])
 
 
-class Parameters(models.Model):
-
-    processor = models.ForeignKey('Processor', related_name="parameters", verbose_name=_('processor'), blank=True, null=True)
-    parameters = models.TextField(_('Parameters'), blank=True)
-    is_preset = models.BooleanField(default=False)
-
-    class Meta:
-        db_table = app + '_parameters'
-        verbose_name = _('Parameters')
-        verbose_name_plural = _('Parameters')
-
-    def __unicode__(self):
-        return '_'.join([unicode(self.processor), str(self.id)])
-
-    
 class Task(models.Model):
 
     experience = models.ForeignKey('Experience', related_name="task", verbose_name=_('experience'), blank=True, null=True)
@@ -204,13 +205,16 @@ class Task(models.Model):
             path = results_root + os.sep + item.uuid + os.sep
             if not os.path.exists(settings.MEDIA_ROOT + os.sep + path):
                 os.makedirs(settings.MEDIA_ROOT + os.sep + path)
+            
+            # pipe = timeside.decoder.FileDecoder(item.file.path, sha1=item.sha1)
             pipe = timeside.decoder.FileDecoder(item.file.path)
+            
             proc_dict = {}
 
-            for processor in self.experience.processors.all():
-                proc = get_processor(processor.pid)
-                #TODO: add parameters
-                proc_dict[processor] = proc
+            for preset in self.experience.presets.all():
+                proc = get_processor(preset.processor.pid)
+                proc_dict[preset.processor] = proc
+                #proc.set_parameters(preset.parameters)
                 pipe = pipe | proc
 
             # while item.lock:
@@ -220,30 +224,29 @@ class Task(models.Model):
                 item.hdf5 =  path + item.uuid + '.hdf5'
                 item.save()
 
-            item.lock_setter(True)
             pipe.run()
+            item.lock_setter(True)
             pipe.results.to_hdf5(item.hdf5.path)
             item.lock_setter(False)
             
             for processor in proc_dict.keys():
                 proc = proc_dict[processor]
 
-                if proc.type == 'analyzer':
-                    for analyzer_id in proc.results.keys():
-                        parameters = proc.results[analyzer_id].parameters
-                        parameters, c = Parameters.objects.get_or_create(processor=processor, parameters=unicode(parameters))
-                        result, c = Result.objects.get_or_create(parameters=parameters, item=item)
+                for processor_id in proc.results.keys():
+                    parameters = proc.results[processor_id].parameters
+                    preset, c = Preset.objects.get_or_create(processor=processor, parameters=unicode(parameters))
+                    result, c = Result.objects.get_or_create(preset=preset, item=item)
+                
+                    if proc.type == 'analyzer':
                         result.hdf5 = path + item.uuid + '_' + str(proc.UUID) + '.hdf5'
                         proc.results.to_hdf5(result.hdf5.path)
-                        result.save()
-        
-                if proc.type == 'grapher':
-                    parameters, c = Parameters.objects.get_or_create(processor=processor, parameters=unicode(parameters))
-                    result, c = Result.objects.get_or_create(parameters=parameters, item=item)
-                    result.output= path + item.uuid + '_' + str(proc.UUID) + '.png'
-                    proc.render(output=result.output)
+                        
+                    if proc.type == 'grapher':
+                        result.file = path + item.uuid + '_' + str(proc.UUID) + '.png'
+                        proc.render(output=result.file)
+                    
                     result.save()
-        
+            
             # except:
             #     self.status_setter(0)
             #     item.lock_setter(False)
@@ -254,7 +257,6 @@ class Task(models.Model):
         del pipe
 
 
-
 post_save.connect(set_mimetype, sender=Item)
 post_save.connect(set_hash, sender=Item)
 post_save.connect(set_mimetype, sender=Result)
diff --git a/timeside/serializers.py b/timeside/serializers.py
index 94e451b..a1447d1 100644
--- a/timeside/serializers.py
+++ b/timeside/serializers.py
@@ -8,7 +8,7 @@ class SelectionSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Selection
-        fields = ('id', 'items', 'author')
+        fields = ('id', 'items', 'selections', 'author')
 
 
 class ItemSerializer(serializers.ModelSerializer):
@@ -22,7 +22,7 @@ class ExperienceSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Experience
-        fields = ('id', 'processors', 'is_preset', 'author')
+        fields = ('id', 'presets', 'experiences', 'is_public', 'author')
 
 
 class ProcessorSerializer(serializers.ModelSerializer):
@@ -36,14 +36,14 @@ class ResultSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Result
-        fields = ('id', 'item', 'parameters', 'status')
+        fields = ('id', 'item', 'preset', 'status', 'hdf5', 'file')
 
 
-class ParametersSerializer(serializers.ModelSerializer):
+class PresetSerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = Parameters
-        fields = ('id', 'processor', 'parameters', 'is_preset')
+        model = Preset
+        fields = ('id', 'processor', 'parameters', 'is_public')
 
 
 class TaskSerializer(serializers.ModelSerializer):
diff --git a/timeside/urls.py b/timeside/urls.py
index ee508e4..6fde09f 100644
--- a/timeside/urls.py
+++ b/timeside/urls.py
@@ -13,7 +13,7 @@ api_router.register(r'items', views.ItemViewSet)
 api_router.register(r'experiences', views.ExperienceViewSet)
 api_router.register(r'processors', views.ProcessorViewSet)
 api_router.register(r'results', views.ResultViewSet)
-api_router.register(r'parameters', views.ParametersViewSet)
+api_router.register(r'presets', views.PresetViewSet)
 api_router.register(r'tasks', views.TaskViewSet)
 api_router.register(r'users', views.UserViewSet)
 
diff --git a/timeside/views.py b/timeside/views.py
index 7acafe0..8dd8019 100644
--- a/timeside/views.py
+++ b/timeside/views.py
@@ -38,10 +38,10 @@ class ResultViewSet(viewsets.ModelViewSet):
     serializer_class = ResultSerializer
 
 
-class ParametersViewSet(viewsets.ModelViewSet):
+class PresetViewSet(viewsets.ModelViewSet):
     
-    model = Parameters
-    serializer_class = ParametersSerializer
+    model = Preset
+    serializer_class = PresetSerializer
 
 
 class TaskViewSet(viewsets.ModelViewSet):
@@ -81,14 +81,14 @@ class IndexView(ListView):
         return super(IndexView, self).dispatch(*args, **kwargs)
 
 
-class ItemAnalyzerView(DetailView):
+class ResultAnalyzerView(DetailView):
     
-    model = Item
+    model = Result
 
     def results(self):
-        item = self.get_object()
+        result = self.get_object()
         results = AnalyzerResult()
-        return results.from_hdf5(self.hdf5).to_json()
+        return results.from_hdf5(result.hdf5).to_json()
     
     def get_context_data(self, **kwargs):
         context = super(ItemJsonAnalyzerView, self).get_context_data(**kwargs)
-- 
2.39.5