Merge branch 'diadems' of github.com:DavidDoukhan/TimeSide into DavidDoukhan-diadems

Conflicts:
	setup.py
	timeside/analyzer/core.py

diff --cc setup.py
index 585cf36d85f173b2a9e94acad3fa24ded62516b7,9d6ed1469a06465a270f4ebc0000f07fc1563c11..a04375857a017cc2b1ccc181d8746312baa4e877
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -44,21 -26,18 +44,23 @@@ setup
    long_description = open('README.rst').read(),
    author = "Guillaume Pellerin, Paul Brossier, Thomas Fillon, Riccardo Zaccarelli, Olivier Guilyardi",
    author_email = "yomguy@parisson.com, piem@piem.org, thomas@parisson.com, riccardo.zaccarelli@gmail.com, olivier@samalyse.com",
 -  version = '0.5.3',
 +  version = '0.5.6',
    install_requires = [
 -        'setuptools',
          'numpy',
          'mutagen',
 -        'pil',
 +        'pillow',
          'h5py',
 -        'yaml',
 +        'pyyaml',
          'simplejson',
          'scipy',
 +        'matplotlib',
 +        'django>=1.4',
 +        'django-extensions',
 +        'djangorestframework',
 +        'south',
+         'py_sonicvisualiser',
          ],
++
    platforms=['OS Independent'],
    license='Gnu Public License V2',
    classifiers = CLASSIFIERS,

diff --cc timeside/analyzer/core.py
index 48d617568ad2d5d4776ac26157179ebecf53d5b5,2aed37f78ed6dc95cf62540bef7edde86999a3b4..92a19b0ee7dfa6753bea305d71cfee9022dc28da
--- 1/timeside/analyzer/core.py
--- 2/timeside/analyzer/core.py
+++ b/timeside/analyzer/core.py
@@@ -21,7 -21,7 +21,8 @@@
  #   Guillaume Pellerin <yomguy at parisson.com>
  #   Paul Brossier <piem@piem.org>
  #   Thomas Fillon <thomas  at parisson.com>
+ #   David Doukhan <doukhan at limsi.fr>
 +
  from __future__ import division
  
  from timeside.core import Processor
@@@ -30,16 -30,14 +31,16 @@@ import nump
  from collections import OrderedDict
  import h5py
  import h5tools
- 
+ from py_sonicvisualiser import SVEnv
  import os
  
 -if os.environ.has_key('DISPLAY'):
 -    doctest_option = '+SKIP'
 -else:
 -    doctest_option = '+ELLIPSIS'
 +if 'DISPLAY' not in os.environ:
 +    import matplotlib
 +    matplotlib.use('Agg')
  
 +import matplotlib.pyplot as plt
 +from matplotlib.figure import Figure
 +from matplotlib.backends.backend_agg import FigureCanvasAgg as FigureCanvas
  
  numpy_data_types = [
      #'float128',