nixo
/
tuhi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wacom: we only have one drawing per exchange 

skip putting a single drawing in a list
This commit is contained in:
Peter Hutterer 2018-02-14 13:06:56 +10:00
parent c39b735e1e
commit 80d0066cef
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tuhi/wacom.py
View File

@ -610,16 +610,13 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
dx, dy, dp = 0, 0, 0 dx, dy, dp = 0, 0, 0
timestamp = int(calendar.timegm(timestamp)) timestamp = int(calendar.timegm(timestamp))
drawings = []
drawing = None
stroke = None stroke = None
success, offset = self.parse_pen_data_prefix(data) success, offset = self.parse_pen_data_prefix(data)
if not success: if not success:
return [] return None
drawing = Drawing(self.device.name, (self.width, self.height), timestamp) drawing = Drawing(self.device.name, (self.width, self.height), timestamp)
drawings.append(drawing)
while offset < len(data): while offset < len(data):
bitmask, opcode, raw_args, args, offset = self.next_pen_data(data, offset) bitmask, opcode, raw_args, args, offset = self.next_pen_data(data, offset)
@ -655,7 +652,7 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
else: else:
stroke.new_abs((x, y), p) stroke.new_abs((x, y), p)
return drawings return drawing
def read_offline_data(self): def read_offline_data(self):
self.b1_command() self.b1_command()
@ -667,8 +664,8 @@ class WacomProtocolBase(WacomProtocolLowLevelComm):
pen_data = self.wait_for_end_read() pen_data = self.wait_for_end_read()
str_pen = binascii.hexlify(bytes(pen_data)) str_pen = binascii.hexlify(bytes(pen_data))
logger.info(f'received {str_pen}') logger.info(f'received {str_pen}')
drawings = self.parse_pen_data(pen_data, timestamp) drawing = self.parse_pen_data(pen_data, timestamp)
for drawing in drawings: if drawing:
self.emit('drawing', drawing) self.emit('drawing', drawing)
self.ack_transaction() self.ack_transaction()
transaction_count += 1 transaction_count += 1