From c303f4929ce7c2a289a03f6707ce10c1a2d47a72 Mon Sep 17 00:00:00 2001 From: Henri Bergius Date: Sat, 6 May 2017 19:52:18 +0200 Subject: [PATCH] Get base hue as input instead of being a generator --- farbgeber.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/farbgeber.py b/farbgeber.py index 762b43b..8f755e9 100644 --- a/farbgeber.py +++ b/farbgeber.py @@ -6,7 +6,6 @@ from time import gmtime, strftime from colour import Color import msgflo -import gevent def generate_terminal_output(palette): print palette['time_value'] @@ -51,11 +50,7 @@ def generate_html_output(palette): f.write(outputtxt) f.close() -def generate_palette(base_saturation=1.0, base_luminance=0.4, hue_modifier=0.03, lum_modifier=0.07, sat_modifier=0.2): - time_value = int(strftime("%M", gmtime())) * 60 + int(strftime("%S", gmtime())) - time_value = float(time_value) - - base_hue = time_value / 3600 +def generate_palette(base_hue, base_saturation=1.0, base_luminance=0.4, hue_modifier=0.03, lum_modifier=0.07, sat_modifier=0.2): base_color = Color(hsl=(base_hue, base_saturation, base_luminance)) base_color_variant_1 = Color(hsl=(base_color.hue + hue_modifier, base_saturation - sat_modifier, base_luminance)) base_color_variant_2 = Color(hsl=(base_color.hue - hue_modifier, base_saturation - sat_modifier, base_luminance)) @@ -89,7 +84,7 @@ def __init__(self, role): 'label': 'Produce pleasing color palettes', 'icon': 'tint', 'inports': [ - { 'id': 'in', 'type': 'bang' }, + { 'id': 'in', 'type': 'int' }, ], 'outports': [ { 'id': 'palette', 'type': 'object' }, @@ -98,14 +93,9 @@ def __init__(self, role): msgflo.Participant.__init__(self, d, role) def process(self, inport, msg): + palette = generate_palette(msg.data) self.ack(msg) - gevent.Greenlet.spawn(self.loop) - - def loop (self): - while True: - palette = generate_palette() - self.send_palette(palette) - gevent.sleep(1) + self.send_palette(palette) def send_palette(self, palette): def packedColor(color):