p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Terminal width not available in Python 2

This commit is contained in:
nsubiron 2017-11-17 15:22:06 +01:00
parent 2c23fc1e0e
commit 54051420e6
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
PythonClient/carla_manual_control.py
View File

@ -29,7 +29,6 @@ from __future__ import print_function
import argparse import argparse
import logging import logging
import shutil
import sys import sys
import time import time
@ -84,6 +83,18 @@ def convert_depth(depth):
color_depth = grayscale_colormap(gray_depth, 'jet') * 255 color_depth = grayscale_colormap(gray_depth, 'jet') * 255
return color_depth return color_depth
if sys.version_info >= (3, 3):
import shutil
def get_terminal_width():
return shutil.get_terminal_size((80, 20)).columns
else:
def get_terminal_width():
return 120
class App(object): class App(object):
def __init__( def __init__(
@ -184,7 +195,8 @@ class App(object):
speed=pack.forward_speed, speed=pack.forward_speed,
other_lane=100 * pack.intersection_otherlane, other_lane=100 * pack.intersection_otherlane,
offroad=100 * pack.intersection_offroad) offroad=100 * pack.intersection_offroad)
empty_space = shutil.get_terminal_size((80, 20)).columns - len(message)
empty_space = max(0, get_terminal_width() - len(message))
sys.stdout.write('\r' + message + empty_space * ' ') sys.stdout.write('\r' + message + empty_space * ' ')
sys.stdout.flush() sys.stdout.flush()