aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar rcoh <rcoh@mit.edu>2011-01-29 19:28:11 -0500
committerGravatar rcoh <rcoh@mit.edu>2011-01-29 19:28:11 -0500
commitccb6ea18285a26b8cc8d99ae7d6540f8ca792398 (patch)
tree2df10fa2b6669717e599a6b090ec200a49397d47
parentd43f5ef8a771fbfd3a3f38f0eb018d3f84589bf7 (diff)
couple changes. Merge of friday demo.
-rw-r--r--Profile.py2
-rw-r--r--util/ColorOps.py2
2 files changed, 3 insertions, 1 deletions
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):