diff options
| author |  rcoh <rcoh@mit.edu> | 2010-12-15 00:18:24 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2010-12-15 00:18:24 -0500 |
| commit | a89c772cd64c6790906734f7128947e0f453c7e3 (patch) | |
| tree | 250e0b0d235e1215fa7b40fcfd24b74028ccf643 /operationscore | |
| parent | 8cecf83f16fcdec5b3ee68cc40c2b360e0f845d0 (diff) | |
About halfway done with the Util cleanup. Some stuff left to do with scoping etc.
Diffstat (limited to 'operationscore')
| -rw-r--r-- | operationscore/PixelEvent.py | 3 | ||||
| -rw-r--r-- | operationscore/SmootCoreObject.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/operationscore/PixelEvent.py b/operationscore/PixelEvent.py index 66b6fdf..27e6e4a 100644 --- a/operationscore/PixelEvent.py +++ b/operationscore/PixelEvent.py @@ -2,6 +2,7 @@ #which should return a color, or None if the response is complete. Consider #requiring a generate event. from operationscore.SmootCoreObject import * +import util.ColorOps as color class PixelEvent(SmootCoreObject): def init(self): self.validateArgs('PixelEvent.params') @@ -11,7 +12,7 @@ class PixelEvent(SmootCoreObject): #Returns a new PixelEvent, but with a response scaled by c. def scale(self,c): newDict = dict(self.argDict) - newDict['Color'] = Util.multiplyColor(newDict['Color'], c) + newDict['Color'] = color.multiplyColor(newDict['Color'], c) return self.__class__(newDict) def state(self,timeDelay): pass diff --git a/operationscore/SmootCoreObject.py b/operationscore/SmootCoreObject.py index 8514b3e..10df299 100644 --- a/operationscore/SmootCoreObject.py +++ b/operationscore/SmootCoreObject.py @@ -2,6 +2,7 @@ import Util import pdb import threading import thread +import util.Config as configGetter class SmootCoreObject(threading.Thread): def __init__(self, argDict, skipValidation = False): self.argDict = argDict @@ -29,7 +30,7 @@ class SmootCoreObject(threading.Thread): def __getiter__(self): return self.argDict.__getiter__() def validateArgs(self, argFileName): - self.validateArgDict(Util.loadParamRequirementDict(argFileName))#util + self.validateArgDict(configGetter.loadParamRequirementDict(argFileName))#util #caches for us, woo! def validateArgDict(self, validationDict): for item in validationDict: |