From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 22 Dec 2014 17:33:07 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:Parisson/TimeSide into dev
X-Git-Tag: 0.7^2~36
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0447fcc6e4d3e4c30c0a0c994effd5f52e3a7a1e;p=timeside.git

Merge branch 'dev' of github.com:Parisson/TimeSide into dev
---

0447fcc6e4d3e4c30c0a0c994effd5f52e3a7a1e
diff --cc timeside/grapher/render_analyzers.py
index 25c9e1d,125cb10..92b6833
--- a/timeside/grapher/render_analyzers.py
+++ b/timeside/grapher/render_analyzers.py
@@@ -108,10 -107,7 +108,8 @@@ class DisplayAnalyzer(Grapher)
  
                  parent_analyzer = analyzer(**analyzer_parameters)
                  self.parents['analyzer'] = parent_analyzer
-                 # TODO : make it generic when analyzer will be "atomize"
-                 self._parent_uuid =  parent_analyzer.uuid()
                  self._result_id = result_id
 +                self.staging = _staging
  
              @staticmethod
              @interfacedoc