diff --git a/examples/highlife.py b/examples/highlife.py index e92e988..a3d1bc2 100644 --- a/examples/highlife.py +++ b/examples/highlife.py @@ -16,4 +16,4 @@ if __name__ == '__main__': p = cam_parser.CAMParser('B368/S23', c) c.randomize() - c.start_plot(50, p.ruleset) + c.start(cam.CAM.Show.WINDOW, clock=50, rules=p.ruleset) diff --git a/examples/life.py b/examples/life.py index ced4206..b8aacba 100644 --- a/examples/life.py +++ b/examples/life.py @@ -33,4 +33,4 @@ if __name__ == '__main__': for i in range(9): c.master.grid[35+i][12:48] = bitarray(bin(row[i])[2:].zfill(36)) - c.start_console(50, p.ruleset) + c.start(cam.CAM.Show.CONSOLE, clock=50, rules=p.ruleset) diff --git a/examples/life_without_death.py b/examples/life_without_death.py index e8498ef..acb5c1d 100644 --- a/examples/life_without_death.py +++ b/examples/life_without_death.py @@ -16,4 +16,4 @@ if __name__ == '__main__': p = cam_parser.CAMParser('B3/S012345678', c) c.randomize() - c.start_plot(50, p.ruleset) + c.start(cam.CAM.Show.WINDOW, clock=50, rules=p.ruleset) diff --git a/examples/morley.py b/examples/morley.py index 19a4749..09deb3c 100644 --- a/examples/morley.py +++ b/examples/morley.py @@ -16,4 +16,4 @@ if __name__ == '__main__': p = cam_parser.CAMParser('B368/S245', c) c.randomize() - c.start_plot(50, p.ruleset) + c.start(cam.CAM.Show.WINDOW, clock=50, rules=p.ruleset) diff --git a/examples/replicator.py b/examples/replicator.py index 1f0a9dd..aef013d 100644 --- a/examples/replicator.py +++ b/examples/replicator.py @@ -18,4 +18,4 @@ if __name__ == '__main__': for i in range(49, 52): c.master.grid[i][49:51] = 1 - c.start_console(50, p.ruleset) + c.start(cam.CAM.Show.WINDOW, clock=50, rules=p.ruleset) diff --git a/examples/seeds.py b/examples/seeds.py index a3f17b8..d57e0a4 100644 --- a/examples/seeds.py +++ b/examples/seeds.py @@ -16,4 +16,4 @@ if __name__ == '__main__': p = cam_parser.CAMParser('B2/S', c) c.randomize() - c.start_plot(50, p.ruleset) + c.start(cam.CAM.Show.WINDOW, clock=50, rules=p.ruleset) diff --git a/src/display.py b/src/display.py index 1e494af..a044462 100644 --- a/src/display.py +++ b/src/display.py @@ -87,9 +87,11 @@ class ConsoleDisplay(_Display): # Construct the necessary planes self.overlays = [] - for pl in self.cam.planes: + for i, pl in enumerate(self.cam.planes): pad = curses.newpad(self.width+1, self.height+1) self.overlays.append(pad) + if i > 0: + self.overlays[i-1].overlay(pad) def _valid(self): """ @@ -201,7 +203,7 @@ class WindowDisplay(_Display): # for proper superimposition self.matrices = [] for plane in self.cam.planes: - mshown = plt.matshow(plane.bits(), fig.number, cmap='Greys') + mshown = plt.matshow(plane.bits(), self.fig.number, cmap='Greys') self.matrices.append(mshown) def _valid(self): @@ -221,8 +223,8 @@ class WindowDisplay(_Display): """ self.cam.tick(self.rules, *self.tick_args) if len(self.cam.master.shape) == 2: - self.mshown.set_array(self.cam.master.bits()) - return [self.mshown] + self.matrices[0].set_array(self.cam.master.bits()) + return [self.matrices[0]] else: pass @@ -241,7 +243,7 @@ class WindowDisplay(_Display): else: pass - ani.FuncAnimation(self.fig, self.animate, interval=self.clock) + ani.FuncAnimation(self.fig, self._animate, interval=self.clock) plt.axis('off') plt.show()