Commit ac6526b9 authored by Guido van Rossum's avatar Guido van Rossum

Some small changes.

Raise ImportError instead of SystemExit when $DISPLAY is not set, so
regrtest.py will do the right thing.

Add a call to gl.clear() to clear the window before drawing in it.

Add some verbose prints for completeness.

Use gl.v2i() for the coordinates of one of the lines, for a little bit
of variety.

Reduce the time the window is displayed from 5 to 2 seconds.
parent 12972e58
...@@ -87,7 +87,8 @@ def main(): ...@@ -87,7 +87,8 @@ def main():
try: try:
display = os.environ['DISPLAY'] display = os.environ['DISPLAY']
except: except:
raise SystemExit # Raise ImportError because regrtest.py handles it specially.
raise ImportError, "No $DISPLAY -- skipping gl test"
# touch all the attributes of gl without doing anything # touch all the attributes of gl without doing anything
if verbose: if verbose:
...@@ -108,6 +109,9 @@ def main(): ...@@ -108,6 +109,9 @@ def main():
if verbose: if verbose:
print 'winopen "CrissCross"' print 'winopen "CrissCross"'
w = gl.winopen('CrissCross') w = gl.winopen('CrissCross')
if verbose:
print 'clear'
gl.clear()
if verbose: if verbose:
print 'ortho2' print 'ortho2'
gl.ortho2(0.0, 400.0, 0.0, 400.0) gl.ortho2(0.0, 400.0, 0.0, 400.0)
...@@ -130,12 +134,18 @@ def main(): ...@@ -130,12 +134,18 @@ def main():
if verbose: if verbose:
print 'bgnline' print 'bgnline'
gl.bgnline() gl.bgnline()
gl.v2f(400.0, 0.0)
gl.v2f(0.0, 400.0)
if verbose: if verbose:
print 'Displaying window for 5 seconds...' print 'v2i'
gl.v2i(400, 0)
gl.v2i(0, 400)
if verbose:
print 'endline'
gl.endline() gl.endline()
time.sleep(5) if verbose:
print 'Displaying window for 2 seconds...'
time.sleep(2)
if verbose:
print 'winclose'
gl.winclose(w) gl.winclose(w)
main() main()
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