Changeset e12b60a

Timestamp:

04/19/12 16:26:20 (13 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test

Children:

57305a5, 14be432

Parents:

8540e78

git-author:

yomguy <yomguy@…> (04/19/12 16:26:20)

git-committer:

yomguy <yomguy@…> (04/19/12 16:26:20)

Message:

add all graphers to first analyses, set new settings parameter for default size values

Files:

• example/sandbox_sqlite/settings.py (modified) (2 diffs)
• telemeta/views/base.py (modified) (3 diffs)

example/sandbox_sqlite/settings.py

@@ -150 +150 @@
 TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm')
 TELEMETA_PUBLIC_ACCESS_PERIOD = 51
+TELEMETA_DEFAULT_WAVEFORM_SIZES = ['360x130', '640x130']
+
 AUTH_PROFILE_MODULE = 'telemeta.userprofile'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
@@ -155 +157 @@
 EMAIL_HOST = 'localhost'
 DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
+

telemeta/views/base.py

@@ -631 +631 @@
             grapher_id = request.REQUEST['grapher_id']
         else:
-            grapher_id = 'waveform'
+            try:
+                grapher_id = settings.TELEMETA_DEFAULT_GRAPHER_ID
+            except:
+                grapher_id = 'waveform'
 
         previous, next = self.item_previous_next(item)
@@ -682 +685 @@
             grapher_id = request.REQUEST['grapher_id']
         else:
-            grapher_id = 'waveform'
+            try:
+                grapher_id = settings.TELEMETA_DEFAULT_GRAPHER_ID
+            except:
+                grapher_id = 'waveform'
 
         previous, next = self.item_previous_next(item)
@@ -831 +837 @@
             analyzers = []
             analyzers_sub = []
+            graphers_sub = []
+
             if item.file:
                 decoder  = timeside.decoder.FileDecoder(item.file.path)
                 pipe = decoder
+
                 for analyzer in self.analyzers:
                     subpipe = analyzer()
                     analyzers_sub.append(subpipe)
                     pipe = pipe | subpipe
+
+                try:
+                    sizes = settings.TELEMETA_DEFAULT_GRAPHER_SIZES
+                except:
+                    sizes = ['360x130', ]
+
+                for grapher in self.graphers:
+                    for size in sizes:
+                        width = size.split('x')[0]
+                        height = size.split('x')[1]
+                        image_file = '.'.join([item.public_id, grapher.id(), size.replace('x', '_'), 'png'])
+                        path = self.cache_data.dir + os.sep + image_file
+                        graph = grapher(width = int(width), height = int(height))
+                        graphers_sub.append({'graph' : graph, 'path': path})
+                        pipe = pipe | graph
+
                 pipe.run()
+
+                for grapher in graphers_sub:
+                    grapher['graph'].watermark('timeside', opacity=.6, margin=(5,5))
+                    f = open(grapher['path'], 'w')
+                    grapher['graph'].render(grapher['path'])
+                    f.close()
 
                 mime_type = decoder.format()