Commit 2f4d5f54 authored by Barry Warsaw's avatar Barry Warsaw

fixed the generators

parent 0bd57c04
...@@ -19,20 +19,23 @@ def constant(numchips): ...@@ -19,20 +19,23 @@ def constant(numchips):
numchips = numchips - 1 numchips = numchips - 1
return seq return seq
def constant_red_generator(numchips, rgbtuple): # red variations, green+blue = cyan constant
red = rgbtuple[0] def constant_cyan_generator(numchips, rgbtuple):
red, green, blue = rgbtuple
seq = constant(numchips) seq = constant(numchips)
return map(None, [red] * numchips, seq, seq) return map(None, seq, [green] * numchips, [blue] * numchips)
def constant_green_generator(numchips, rgbtuple): # green variations, red+blue = magenta constant
green = rgbtuple[1] def constant_magenta_generator(numchips, rgbtuple):
red, green, blue = rgbtuple
seq = constant(numchips) seq = constant(numchips)
return map(None, seq, [green] * numchips, seq) return map(None, [red] * numchips, seq, [blue] * numchips)
def constant_blue_generator(numchips, rgbtuple): # blue variations, red+green = yellow constant
blue = rgbtuple[2] def constant_yellow_generator(numchips, rgbtuple):
red, green, blue = rgbtuple
seq = constant(numchips) seq = constant(numchips)
return map(None, seq, seq, [blue] * numchips) return map(None, [red] * numchips, [green] * numchips, seq)
...@@ -53,13 +56,16 @@ class PyncheWidget(Pmw.MegaWidget): ...@@ -53,13 +56,16 @@ class PyncheWidget(Pmw.MegaWidget):
group = Pmw.Group(parent, tag_text='Color Selectors') group = Pmw.Group(parent, tag_text='Color Selectors')
group.pack(side=TOP, expand=YES, fill=BOTH) group.pack(side=TOP, expand=YES, fill=BOTH)
self.__reds = StripWidget(group.interior(), self.__reds = StripWidget(group.interior(),
generator=constant_red_generator) generator=constant_cyan_generator,
axis=0)
self.__reds.pack() self.__reds.pack()
self.__blues = StripWidget(group.interior(), self.__blues = StripWidget(group.interior(),
generator=constant_blue_generator) generator=constant_magenta_generator,
axis=1)
self.__blues.pack() self.__blues.pack()
self.__greens = StripWidget(group.interior(), self.__greens = StripWidget(group.interior(),
generator=constant_green_generator) generator=constant_yellow_generator,
axis=2)
self.__greens.pack() self.__greens.pack()
# create chip window # create chip window
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment