Skip to content

Commit 27a776f

Browse files
4B796C65@gmail.com4B796C65@gmail.com
authored andcommitted
Version 1.1.4 release
1 parent 9134110 commit 27a776f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2859
-2412
lines changed

CHANGELOG.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
1+
1.1.4
22
* Merged the Typewriter and MetaConsole classes,
3-
you now have a virtual cursor with Console and Window objects
4-
* Fixed the clear method on Window class
3+
You now have a virtual cursor with Console and Window objects
4+
* Fixed the clear method on the Window class
55
* Fixed screenshot function
66
* Fixed some drawing operations with unchanging backgrounds
77
* Instances of Console and Noise can be pickled and copied

dev/runRegressionTest.py

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ def compareConsoles(self, consoleA, consoleB, errorMsg='colors should be the sam
102102
"Compare two console assuming they match and failing if they don't"
103103
self.assertEqual(consoleA.getSize(), consoleB.getSize(), 'consoles should be the same size')
104104
for x, y in self.getDrawables(consoleA):
105-
self.assertEqual(self.consoleA.getChar(x, y),
106-
self.consoleB.getChar(x, y), '%s, position: (%i, %i)' % (errorMsg, x, y))
105+
self.assertEqual(consoleA.getChar(x, y),
106+
consoleB.getChar(x, y), '%s, position: (%i, %i)' % (errorMsg, x, y))
107107

108108
class BasicTests(TDLTemplate):
109109

@@ -134,20 +134,21 @@ def test_pickleConsole(self):
134134
pickled = pickle.dumps(self.console)
135135
clone = pickle.loads(pickled)
136136
self.compareConsoles(self.console, clone, 'pickled console should match root console')
137-
138-
def test_changeFonts(self):
139-
"Fonts are changable on the fly... kind of"
140-
FONT_DIR = '../fonts/X11'
141-
for font in os.listdir(FONT_DIR):
142-
if font[-4:] != '.png':
143-
continue # skip all those other files
144-
font = os.path.join(FONT_DIR, font)
145-
tdl.setFont(font)
146-
for x,y in self.getDrawables():
147-
self.console.drawChar(x, y, *self.getRandomCharacter())
148-
tdl.setTitle(font)
149-
self.flush()
150-
time.sleep(.05)
137+
138+
## This isn't really supported.
139+
#def test_changeFonts(self):
140+
# "Fonts are changable on the fly... kind of"
141+
# FONT_DIR = '../fonts/X11'
142+
# for font in os.listdir(FONT_DIR):
143+
# if font[-4:] != '.png':
144+
# continue # skip all those other files
145+
# font = os.path.join(FONT_DIR, font)
146+
# tdl.setFont(font)
147+
# for x,y in self.getDrawables():
148+
# self.console.drawChar(x, y, *self.getRandomCharacter())
149+
# tdl.setTitle(font)
150+
# self.flush()
151+
# time.sleep(.05)
151152

152153

153154
class DrawingTests(TDLTemplate):

docs/api-objects.txt

Lines changed: 61 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tdl._setback tdl-module.html#_setback
88
tdl._setcharEX tdl-module.html#_setcharEX
99
tdl._verify_colors tdl-module.html#_verify_colors
1010
tdl._encodeString tdl-module.html#_encodeString
11-
tdl.setFullscreen tdl-module.html#setFullscreen
11+
tdl.screenshot tdl-module.html#screenshot
1212
tdl._rootinitialized tdl-module.html#_rootinitialized
1313
tdl._IS_PYTHON3 tdl-module.html#_IS_PYTHON3
1414
tdl.getFullscreen tdl-module.html#getFullscreen
@@ -20,12 +20,13 @@ tdl._rootConsoleRef tdl-module.html#_rootConsoleRef
2020
tdl._NUMTYPES tdl-module.html#_NUMTYPES
2121
tdl.getFPS tdl-module.html#getFPS
2222
tdl._formatColor tdl-module.html#_formatColor
23-
tdl.screenshot tdl-module.html#screenshot
2423
tdl._iscolor tdl-module.html#_iscolor
2524
tdl._fontinitialized tdl-module.html#_fontinitialized
2625
tdl.forceResolution tdl-module.html#forceResolution
2726
tdl._getImageSize tdl-module.html#_getImageSize
2827
tdl.setFPS tdl-module.html#setFPS
28+
tdl.setFullscreen tdl-module.html#setFullscreen
29+
tdl.__email__ tdl-module.html#__email__
2930
tdl._setchar tdl-module.html#_setchar
3031
tdl._STRTYPES tdl-module.html#_STRTYPES
3132
tdl.setFont tdl-module.html#setFont
@@ -60,80 +61,109 @@ tdl.noise._MAX_OCTAVES tdl.noise-module.html#_MAX_OCTAVES
6061
tdl.noise._CARRY_WITH_MULTIPLY tdl.noise-module.html#_CARRY_WITH_MULTIPLY
6162
tdl.noise._NOISE_TYPES tdl.noise-module.html#_NOISE_TYPES
6263
tdl.Console tdl.Console-class.html
63-
tdl._MetaConsole._normalizeRect tdl._MetaConsole-class.html#_normalizeRect
64+
tdl._MetaConsole._bgblend tdl._MetaConsole-class.html#_bgblend
6465
tdl.Console._setChar tdl.Console-class.html#_setChar
66+
tdl._MetaConsole.move tdl._MetaConsole-class.html#move
6567
tdl._MetaConsole.height tdl._MetaConsole-class.html#height
6668
tdl._MetaConsole.getSize tdl._MetaConsole-class.html#getSize
6769
tdl._MetaConsole.drawRect tdl._MetaConsole-class.html#drawRect
68-
tdl._MetaConsole.width tdl._MetaConsole-class.html#width
6970
tdl._MetaConsole.blit tdl._MetaConsole-class.html#blit
71+
tdl._MetaConsole._cursor tdl._MetaConsole-class.html#_cursor
7072
tdl.Console.__init__ tdl.Console-class.html#__init__
7173
tdl.Console._newConsole tdl.Console-class.html#_newConsole
7274
tdl._MetaConsole.console tdl._MetaConsole-class.html#console
7375
tdl._MetaConsole.__contains__ tdl._MetaConsole-class.html#__contains__
7476
tdl._MetaConsole.drawChar tdl._MetaConsole-class.html#drawChar
77+
tdl._MetaConsole.write tdl._MetaConsole-class.html#write
7578
tdl.Console.__del__ tdl.Console-class.html#__del__
79+
tdl._MetaConsole.printStr tdl._MetaConsole-class.html#printStr
80+
tdl.Console.__getstate__ tdl.Console-class.html#__getstate__
7681
tdl.Console.__repr__ tdl.Console-class.html#__repr__
82+
tdl._MetaConsole._bgcolor tdl._MetaConsole-class.html#_bgcolor
7783
tdl.Console._translate tdl.Console-class.html#_translate
78-
tdl._MetaConsole.drawFrame tdl._MetaConsole-class.html#drawFrame
84+
tdl.Console.__setstate__ tdl.Console-class.html#__setstate__
85+
tdl._MetaConsole._normalizeRect tdl._MetaConsole-class.html#_normalizeRect
7986
tdl.Console._replace tdl.Console-class.html#_replace
87+
tdl._MetaConsole.getCursor tdl._MetaConsole-class.html#getCursor
88+
tdl._MetaConsole._lockColors tdl._MetaConsole-class.html#_lockColors
89+
tdl._MetaConsole._colorLock tdl._MetaConsole-class.html#_colorLock
8090
tdl.Console._as_parameter_ tdl.Console-class.html#_as_parameter_
8191
tdl.Console._setCharBatch tdl.Console-class.html#_setCharBatch
92+
tdl._MetaConsole._fgcolor tdl._MetaConsole-class.html#_fgcolor
8293
tdl._MetaConsole.drawStr tdl._MetaConsole-class.html#drawStr
8394
tdl._MetaConsole._normalizePoint tdl._MetaConsole-class.html#_normalizePoint
8495
tdl.Console.clear tdl.Console-class.html#clear
85-
tdl.Console._typewriter tdl.Console-class.html#_typewriter
8696
tdl._MetaConsole.scroll tdl._MetaConsole-class.html#scroll
97+
tdl._MetaConsole.setColors tdl._MetaConsole-class.html#setColors
98+
tdl._MetaConsole._normalizeCursor tdl._MetaConsole-class.html#_normalizeCursor
99+
tdl.Console._typewriter tdl.Console-class.html#_typewriter
100+
tdl._MetaConsole.drawFrame tdl._MetaConsole-class.html#drawFrame
101+
tdl.Console.__copy__ tdl.Console-class.html#__copy__
102+
tdl._MetaConsole.width tdl._MetaConsole-class.html#width
87103
tdl.Console.getChar tdl.Console-class.html#getChar
88104
tdl.TDLError tdl.TDLError-class.html
89-
tdl.Typewriter tdl.Typewriter-class.html
90-
tdl.Typewriter.setBG tdl.Typewriter-class.html#setBG
91-
tdl.Typewriter.move tdl.Typewriter-class.html#move
92-
tdl.Typewriter.addChar tdl.Typewriter-class.html#addChar
93-
tdl.Typewriter.setFG tdl.Typewriter-class.html#setFG
94-
tdl.Typewriter.__init__ tdl.Typewriter-class.html#__init__
95-
tdl.Typewriter.addStr tdl.Typewriter-class.html#addStr
96-
tdl.Typewriter.write tdl.Typewriter-class.html#write
97-
tdl.Typewriter._updateConsole tdl.Typewriter-class.html#_updateConsole
98-
tdl.Typewriter.getCursor tdl.Typewriter-class.html#getCursor
99-
tdl.Typewriter._normalize tdl.Typewriter-class.html#_normalize
100105
tdl.Window tdl.Window-class.html
106+
tdl._MetaConsole._bgblend tdl._MetaConsole-class.html#_bgblend
101107
tdl.Window._setChar tdl.Window-class.html#_setChar
108+
tdl._MetaConsole.move tdl._MetaConsole-class.html#move
102109
tdl._MetaConsole.height tdl._MetaConsole-class.html#height
103-
tdl._MetaConsole.drawStr tdl._MetaConsole-class.html#drawStr
104-
tdl._MetaConsole.width tdl._MetaConsole-class.html#width
110+
tdl._MetaConsole.getSize tdl._MetaConsole-class.html#getSize
105111
tdl._MetaConsole.blit tdl._MetaConsole-class.html#blit
112+
tdl._MetaConsole._cursor tdl._MetaConsole-class.html#_cursor
106113
tdl.Window.__init__ tdl.Window-class.html#__init__
107114
tdl._MetaConsole.console tdl._MetaConsole-class.html#console
108115
tdl._MetaConsole.__contains__ tdl._MetaConsole-class.html#__contains__
109116
tdl.Window.drawChar tdl.Window-class.html#drawChar
110-
tdl._MetaConsole._normalizeRect tdl._MetaConsole-class.html#_normalizeRect
117+
tdl._MetaConsole.write tdl._MetaConsole-class.html#write
118+
tdl.Window.drawFrame tdl.Window-class.html#drawFrame
119+
tdl._MetaConsole.printStr tdl._MetaConsole-class.html#printStr
120+
tdl._MetaConsole._bgcolor tdl._MetaConsole-class.html#_bgcolor
111121
tdl.Window._translate tdl.Window-class.html#_translate
112122
tdl.Window.parent tdl.Window-class.html#parent
113-
tdl.Window.drawFrame tdl.Window-class.html#drawFrame
123+
tdl._MetaConsole._normalizeRect tdl._MetaConsole-class.html#_normalizeRect
114124
tdl._MetaConsole._normalizePoint tdl._MetaConsole-class.html#_normalizePoint
125+
tdl._MetaConsole.getCursor tdl._MetaConsole-class.html#getCursor
126+
tdl._MetaConsole._lockColors tdl._MetaConsole-class.html#_lockColors
127+
tdl._MetaConsole._colorLock tdl._MetaConsole-class.html#_colorLock
115128
tdl.Window.drawRect tdl.Window-class.html#drawRect
116129
tdl.Window._setCharBatch tdl.Window-class.html#_setCharBatch
117-
tdl._MetaConsole.getSize tdl._MetaConsole-class.html#getSize
130+
tdl._MetaConsole._fgcolor tdl._MetaConsole-class.html#_fgcolor
131+
tdl._MetaConsole.drawStr tdl._MetaConsole-class.html#drawStr
118132
tdl.Window.clear tdl.Window-class.html#clear
133+
tdl._MetaConsole.scroll tdl._MetaConsole-class.html#scroll
134+
tdl._MetaConsole.setColors tdl._MetaConsole-class.html#setColors
135+
tdl._MetaConsole._normalizeCursor tdl._MetaConsole-class.html#_normalizeCursor
119136
tdl.Window.__repr__ tdl.Window-class.html#__repr__
120137
tdl.Window.y tdl.Window-class.html#y
121138
tdl.Window.x tdl.Window-class.html#x
122-
tdl._MetaConsole.scroll tdl._MetaConsole-class.html#scroll
139+
tdl._MetaConsole.width tdl._MetaConsole-class.html#width
123140
tdl.Window.getChar tdl.Window-class.html#getChar
124141
tdl._MetaConsole tdl._MetaConsole-class.html
142+
tdl._MetaConsole._normalizeRect tdl._MetaConsole-class.html#_normalizeRect
143+
tdl._MetaConsole._bgblend tdl._MetaConsole-class.html#_bgblend
144+
tdl._MetaConsole.move tdl._MetaConsole-class.html#move
125145
tdl._MetaConsole.height tdl._MetaConsole-class.html#height
126146
tdl._MetaConsole.getSize tdl._MetaConsole-class.html#getSize
127-
tdl._MetaConsole.width tdl._MetaConsole-class.html#width
128147
tdl._MetaConsole.blit tdl._MetaConsole-class.html#blit
148+
tdl._MetaConsole._cursor tdl._MetaConsole-class.html#_cursor
149+
tdl._MetaConsole.__init__ tdl._MetaConsole-class.html#__init__
129150
tdl._MetaConsole.console tdl._MetaConsole-class.html#console
130151
tdl._MetaConsole.__contains__ tdl._MetaConsole-class.html#__contains__
131152
tdl._MetaConsole.drawChar tdl._MetaConsole-class.html#drawChar
153+
tdl._MetaConsole.write tdl._MetaConsole-class.html#write
154+
tdl._MetaConsole.width tdl._MetaConsole-class.html#width
155+
tdl._MetaConsole.printStr tdl._MetaConsole-class.html#printStr
156+
tdl._MetaConsole._bgcolor tdl._MetaConsole-class.html#_bgcolor
132157
tdl._MetaConsole.drawFrame tdl._MetaConsole-class.html#drawFrame
133-
tdl._MetaConsole._normalizeRect tdl._MetaConsole-class.html#_normalizeRect
134158
tdl._MetaConsole._normalizePoint tdl._MetaConsole-class.html#_normalizePoint
159+
tdl._MetaConsole.getCursor tdl._MetaConsole-class.html#getCursor
160+
tdl._MetaConsole._lockColors tdl._MetaConsole-class.html#_lockColors
161+
tdl._MetaConsole._colorLock tdl._MetaConsole-class.html#_colorLock
135162
tdl._MetaConsole.drawRect tdl._MetaConsole-class.html#drawRect
163+
tdl._MetaConsole._fgcolor tdl._MetaConsole-class.html#_fgcolor
136164
tdl._MetaConsole.drawStr tdl._MetaConsole-class.html#drawStr
165+
tdl._MetaConsole.setColors tdl._MetaConsole-class.html#setColors
166+
tdl._MetaConsole._normalizeCursor tdl._MetaConsole-class.html#_normalizeCursor
137167
tdl._MetaConsole.scroll tdl._MetaConsole-class.html#scroll
138168
tdl._MetaConsole.getChar tdl._MetaConsole-class.html#getChar
139169
tdl.event.App tdl.event.App-class.html
@@ -154,6 +184,7 @@ tdl.event.Event.__repr__ tdl.event.Event-class.html#__repr__
154184
tdl.event.Event.type tdl.event.Event-class.html#type
155185
tdl.event.KeyDown tdl.event.KeyDown-class.html
156186
tdl.event.KeyEvent.control tdl.event.KeyEvent-class.html#control
187+
tdl.event.KeyEvent.keychar tdl.event.KeyEvent-class.html#keychar
157188
tdl.event.KeyEvent.rightCtrl tdl.event.KeyEvent-class.html#rightCtrl
158189
tdl.event.KeyEvent.alt tdl.event.KeyEvent-class.html#alt
159190
tdl.event.KeyEvent.__init__ tdl.event.KeyEvent-class.html#__init__
@@ -167,6 +198,7 @@ tdl.event.KeyEvent.shift tdl.event.KeyEvent-class.html#shift
167198
tdl.event.Event.__repr__ tdl.event.Event-class.html#__repr__
168199
tdl.event.KeyEvent tdl.event.KeyEvent-class.html
169200
tdl.event.KeyEvent.control tdl.event.KeyEvent-class.html#control
201+
tdl.event.KeyEvent.keychar tdl.event.KeyEvent-class.html#keychar
170202
tdl.event.KeyEvent.char tdl.event.KeyEvent-class.html#char
171203
tdl.event.KeyEvent.alt tdl.event.KeyEvent-class.html#alt
172204
tdl.event.KeyEvent.__init__ tdl.event.KeyEvent-class.html#__init__
@@ -180,6 +212,7 @@ tdl.event.KeyEvent.shift tdl.event.KeyEvent-class.html#shift
180212
tdl.event.Event.__repr__ tdl.event.Event-class.html#__repr__
181213
tdl.event.KeyUp tdl.event.KeyUp-class.html
182214
tdl.event.KeyEvent.control tdl.event.KeyEvent-class.html#control
215+
tdl.event.KeyEvent.keychar tdl.event.KeyEvent-class.html#keychar
183216
tdl.event.KeyEvent.rightCtrl tdl.event.KeyEvent-class.html#rightCtrl
184217
tdl.event.KeyEvent.alt tdl.event.KeyEvent-class.html#alt
185218
tdl.event.KeyEvent.__init__ tdl.event.KeyEvent-class.html#__init__
@@ -230,6 +263,9 @@ tdl.map.AStar.getPath tdl.map.AStar-class.html#getPath
230263
tdl.map.AStar._as_parameter_ tdl.map.AStar-class.html#_as_parameter_
231264
tdl.map.AStar.__init__ tdl.map.AStar-class.html#__init__
232265
tdl.noise.Noise tdl.noise.Noise-class.html
266+
tdl.noise.Noise.__getstate__ tdl.noise.Noise-class.html#__getstate__
267+
tdl.noise.Noise.__setstate__ tdl.noise.Noise-class.html#__setstate__
233268
tdl.noise.Noise.__del__ tdl.noise.Noise-class.html#__del__
234269
tdl.noise.Noise.getPoint tdl.noise.Noise-class.html#getPoint
270+
tdl.noise.Noise.__copy__ tdl.noise.Noise-class.html#__copy__
235271
tdl.noise.Noise.__init__ tdl.noise.Noise-class.html#__init__

docs/class-tree.html

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ <h1 class="epydoc">Class Hierarchy</h1>
114114
<li> <strong class="uidlink"><a href="tdl.noise.Noise-class.html">tdl.noise.Noise</a></strong>:
115115
<em class="summary">An advanced noise generator.</em>
116116
</li>
117-
<li> <strong class="uidlink"><a href="tdl.Typewriter-class.html">tdl.Typewriter</a></strong>:
118-
<em class="summary">Converts a console into a scrolling text log that respects special
119-
characters.</em>
120-
</li>
121117
<li> <strong class="uidlink"><a href="tdl._MetaConsole-class.html">tdl._MetaConsole</a></strong>:
122118
<em class="summary">Contains methods shared by both the <a
123119
href="tdl.Console-class.html" class="link">Console</a> and <a
@@ -166,7 +162,7 @@ <h1 class="epydoc">Class Hierarchy</h1>
166162
<tr>
167163
<td align="left" class="footer">
168164
<a href="epydoc-log.html">Generated by Epydoc
169-
3.0.1 on Mon Dec 17 00:44:49 2012</a>
165+
3.0.1 on Wed Mar 06 18:21:18 2013</a>
170166
</td>
171167
<td align="right" class="footer">
172168
<a target="mainFrame" href="http://epydoc.sourceforge.net"

0 commit comments

Comments
 (0)