From ccb6ea18285a26b8cc8d99ae7d6540f8ca792398 Mon Sep 17 00:00:00 2001 From: rcoh Date: Sat, 29 Jan 2011 19:28:11 -0500 Subject: couple changes. Merge of friday demo. --- Profile.py | 2 +- util/ColorOps.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Profile.py b/Profile.py index 2f180c9..daabb6b 100644 --- a/Profile.py +++ b/Profile.py @@ -1,4 +1,4 @@ import cProfile from LightInstallation import main -command = """main(['', 'config/6thFloor.xml'])""" +command = """main(['', 'config/Kuan.xml'])""" cProfile.runctx(command, globals(), locals(), filename="smootlight.profile") diff --git a/util/ColorOps.py b/util/ColorOps.py index 037957a..e384605 100644 --- a/util/ColorOps.py +++ b/util/ColorOps.py @@ -11,6 +11,8 @@ def safeColor(c): c[0] = c[0] if c[0] < 255 else 255 c[1] = c[1] if c[1] < 255 else 255 c[2] = c[2] if c[2] < 255 else 255 + + return c def combineColors(colors): -- cgit v1.2.3