decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

migrate color to hue, saturation, lightness, fixes #1301

Browse source
This commit is contained in:
j 2013-02-25 21:33:05 +00:00
commit 027d9eb90d
2 changed files with 162 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pandora/item/models.py
View file

@ -821,12 +821,9 @@ class Item(models.Model):
s.volume = None
s.parts = 0
if 'color' in self.data and len(self.data['color']) == 3:
s.hue, s.saturation, s.lightness = self.data['color']
else:
s.hue = None
s.saturation = None
s.brighness = None
for key in ('hue', 'saturation', 'lightness'):
if key in self.data:
setattr(s, key, self.data.get(key, None))
s.numberofannotations = self.annotations.all().count()
s.numberofcuts = len(self.data.get('cuts', []))
if s.duration:
@ -1066,11 +1063,10 @@ class Item(models.Model):
streams = self.streams()
self.make_timeline()
if streams.count() == 1:
self.data['color'] = streams[0].color
self.data['hue'], self.data['saturation'], self.data['lightness'] = streams[0].color
self.data['cuts'] = streams[0].cuts
self.data['volume'] = streams[0].volume
else:
#self.data['color'] = extract.average_color(self.timeline_prefix)
self.data['cuts'] = extract.cuts(self.timeline_prefix)
self.data['volume'] = 0
offset = 0
@ -1080,7 +1076,7 @@ class Item(models.Model):
self.data['volume'] += s.volume * s.duration
color = map(lambda a,b: (a+b)/n, color,ox.image.getRGB(s.color))
offset += s.duration
self.data['color'] = ox.image.getHSL(color)
self.data['hue'], self.data['saturation'], self.data['lightness'] = ox.image.getHSL(color)
if offset:
self.data['volume'] /= offset
#extract.timeline_strip(self, self.data['cuts'], stream.info, self.timeline_prefix[:-8])