Changeset c2803e5

Timestamp:

12/24/08 19:54:06 (4 years ago)

Author:

olivier <>

Branches:

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

Children:

583df3f

Parents:

40f3d09

git-author:

olivier <> (12/24/08 19:54:06)

git-committer:

olivier <> (12/24/08 19:54:06)

Message:

allow visualization colors customization

Location:

telemeta/visualization

Files:

• api.py (modified) (1 diff)
• spectrogram.py (modified) (1 diff)
• spectrogram2.py (modified) (1 diff)
• spectrogram3.py (modified) (3 diffs)
• spectrogram4.py (modified) (3 diffs)
• wav2png.py (modified) (9 diffs)
• waveform.py (modified) (1 diff)
• waveform2.py (modified) (1 diff)
• waveform3.py (modified) (3 diffs)
• waveform4.py (modified) (3 diffs)

telemeta/visualization/api.py

@@ -21 +21 @@
         """
 
+    def set_colors(self, background=None, scheme=None):
+        """Set the colors used for image generation. background is a RGB tuple, 
+        and scheme a a predefined color theme name"""
+        pass
+
     def render(media_item, width=None, height=None, options=None):
         """Generator that streams the visualization output as a PNG image"""

telemeta/visualization/spectrogram.py

@@ -26 +26 @@
         return "Spectrogram 1"
     
+    def set_colors(self, background=None, scheme=None):
+        pass
+
     def render(self, media_item, options=None):
         """Generator that streams the spectral view as a PNG image"""

telemeta/visualization/spectrogram2.py

@@ -26 +26 @@
     def get_name(self):
         return "Spectrogram (octave)"
+
+    def set_colors(self, background=None, scheme=None):
+        pass
     
-    def render(self, media_item, options=None):
+    def render(self, media_item, width=None, height=None, options=None):
         """Generator that streams the spectral view as a PNG image"""
 

telemeta/visualization/spectrogram3.py

@@ -19 +19 @@
     implements(IMediaItemVisualizer)
 
+    bg_color = None
+    color_scheme = None
+
     def get_id(self):
         return "spectrogram3"
@@ -25 +28 @@
         return "Spectrogram (audiolab)"
     
+    def set_colors(self, background=None, scheme=None):
+        self.bg_color = background
+        self.color_scheme = scheme
+
     def render(self, media_item, width=None, height=None, options=None):
         """Generator that streams the spectrogram as a PNG image with a python method"""
@@ -41 +48 @@
             
         fft_size = 2048
-        args = (wav_file, pngFile.name, image_width, image_height, fft_size)
+        args = (wav_file, pngFile.name, image_width, image_height, fft_size, 
+                self.bg_color, self.color_scheme)
         create_spectrogram_png(*args)
 

telemeta/visualization/spectrogram4.py

@@ -19 +19 @@
     implements(IMediaItemVisualizer)
 
+    bg_color = None
+    color_scheme = None
+
     def get_id(self):
         return "spectrogram4"
@@ -25 +28 @@
         return "Spectrogram (audiolab large)"
     
+    def set_colors(self, background=None, scheme=None):
+        self.bg_color = background
+        self.color_scheme = scheme
+
     def render(self, media_item, width=None, height=None, options=None):
         """Generator that streams the spectrogram as a PNG image with a python method"""
@@ -41 +48 @@
             
         fft_size = 2048
-        args = (wav_file, pngFile.name, image_width, image_height, fft_size)
+        args = (wav_file, pngFile.name, image_width, image_height, fft_size, 
+                self.bg_color, self.color_scheme)
         create_spectrogram_png(*args)
 

telemeta/visualization/wav2png.py

@@ -29 +29 @@
 import scikits.audiolab as audiolab
 
+color_schemes = {
+    'default': {
+        'waveform': [(50,0,200), (0,220,80), (255,224,0), (255,0,0)],
+        'spectrogram': [(0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100),
+                      (224,224,44), (255,60,30), (255,255,255)]
+    },
+    'purple': {
+        'waveform': [(173,173,173), (147,149,196), (77,80,138), (108,66,0)],
+        'spectrogram': [(0, 0, 0), (58/4,68/4,65/4), (80/2,100/2,153/2), (90,180,100),
+                      (224,224,44), (255,60,30), (255,255,255)]
+    }
+}
+
 class TestAudioFile(object):
     """A class that mimics audiolab.sndfile but generates noise instead of reading
@@ -245 +258 @@
 
 class WaveformImage(object):
-    def __init__(self, image_width, image_height):
-        self.image = Image.new("RGB", (image_width, image_height))
+    def __init__(self, image_width, image_height, bg_color = None, color_scheme = None):
+        if not bg_color:
+            bg_color = (0,0,0)
+        if not color_scheme: 
+            color_scheme = 'default'
+
+        self.image = Image.new("RGB", (image_width, image_height), bg_color)
         
         self.image_width = image_width
@@ -254 +272 @@
         self.previous_x, self.previous_y = None, None
         
-        colors = [
-                    (50,0,200),
-                    (0,220,80),
-                    (255,224,0),
-                    (255,0,0),
-                 ]
+        colors = color_schemes[color_scheme]['waveform']
         
         # this line gets the old "screaming" colors back...
@@ -328 +341 @@
         
 class SpectrogramImage(object):
-    def __init__(self, image_width, image_height, fft_size):
+    def __init__(self, image_width, image_height, fft_size, bg_color = None, color_scheme = None):
+
+        #FIXME: bg_color is ignored
+
+        if not color_scheme: 
+            color_scheme = 'default'
+
         self.image = Image.new("P", (image_height, image_width))
         
@@ -335 +354 @@
         self.fft_size = fft_size
         
-        colors = [
-                    (0, 0, 0),
-                    (58/4,68/4,65/4),
-                    (80/2,100/2,153/2),
-                    (90,180,100),
-                    (224,224,44),
-                    (255,60,30),
-                    (255,255,255)
-                 ]
+        colors = color_schemes[color_scheme]['spectrogram']
         
         self.image.putpalette(interpolate_colors(colors, True))
@@ -379 +390 @@
 
 
-def create_wavform_png(input_filename, output_filename_w, image_width, image_height, fft_size):
+def create_wavform_png(input_filename, output_filename_w, image_width, image_height, fft_size,
+                       bg_color = None, color_scheme = None):
     audio_file = audiolab.sndfile(input_filename, 'read')
 
@@ -385 +397 @@
     processor = AudioProcessor(audio_file, fft_size, numpy.hanning)
     
-    waveform = WaveformImage(image_width, image_height)
+    waveform = WaveformImage(image_width, image_height, bg_color, color_scheme)
     
     for x in range(image_width):
@@ -405 +417 @@
     print " done"
 
-def create_spectrogram_png(input_filename, output_filename_s, image_width, image_height, fft_size):
+def create_spectrogram_png(input_filename, output_filename_s, image_width, image_height, fft_size,
+                           bg_color = None, color_scheme = None):
     audio_file = audiolab.sndfile(input_filename, 'read')
 
@@ -411 +424 @@
     processor = AudioProcessor(audio_file, fft_size, numpy.hanning)
     
-    spectrogram = SpectrogramImage(image_width, image_height, fft_size)
+    spectrogram = SpectrogramImage(image_width, image_height, fft_size, bg_color, color_scheme)
     
     for x in range(image_width):

telemeta/visualization/waveform.py

@@ -29 +29 @@
         return "Waveform"
     
+    def set_colors(self, background=None, scheme=None):
+        pass
+
     def render(self, media_item, options=None):
         """Generator that streams the waveform as a PNG image"""

telemeta/visualization/waveform2.py

@@ -29 +29 @@
         return "Waveform (octave)"
     
+    def set_colors(self, background=None, scheme=None):
+        pass
+
     def render(self, media_item, options=None):
         """Generator that streams the temporal view as a PNG image"""

telemeta/visualization/waveform3.py

@@ -19 +19 @@
     implements(IMediaItemVisualizer)
 
+    bg_color = None
+    color_scheme = None
+
     def get_id(self):
         return "waveform3"
@@ -24 +27 @@
     def get_name(self):
         return "Waveform (audiolab)"
+
+    def set_colors(self, background=None, scheme=None):
+        self.bg_color = background
+        self.color_scheme = scheme
 
     def render(self, media_item, width=None, height=None, options=None):
@@ -41 +48 @@
 
         fft_size = 2048
-        args = (wav_file, pngFile.name, image_width, image_height, fft_size)
+        args = (wav_file, pngFile.name, image_width, image_height, fft_size, 
+                self.bg_color, self.color_scheme)
         create_wavform_png(*args)
 

telemeta/visualization/waveform4.py

@@ -19 +19 @@
     implements(IMediaItemVisualizer)
 
+    bg_color = None
+    color_scheme = None
+
     def get_id(self):
         return "waveform4"
@@ -25 +28 @@
         return "Waveform (audiolab large)"
 
-    def render(self, media_item,  width=None, height=None, options=None):
+    def set_colors(self, background=None, scheme=None):
+        self.bg_color = background
+        self.color_scheme = scheme
+
+    def render(self, media_item, width=None, height=None, options=None):
         """Generator that streams the waveform as a PNG image with a python method"""
 
@@ -41 +48 @@
 
         fft_size = 2048
-        args = (wav_file, pngFile.name, image_width, image_height, fft_size)
+        args = (wav_file, pngFile.name, image_width, image_height, fft_size, self.bg_color, self.color_scheme)
         create_wavform_png(*args)