mirrors
/
tuhi
mirror of https://github.com/tuhiproject/tuhi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

wacom: drop Orientation from the Tuhi daemon 

This isn't something we need in the daemon, it depends too much on what the
client expects so let the client save this data and handle the rotation
accordingly.

Note that the sensor in Sparks and Slates is in landscape format, i.e. every
picture is 90 deg rotated from what you'd expect.

Fixes #33 (wontfix)
pull/81/merge
Peter Hutterer 2018-02-08 10:47:41 +10:00
parent ad145cc078
commit 112b689bf8
1 changed files with 0 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tuhi/wacom.py
View File

@ -41,11 +41,6 @@ MYSTERIOUS_NOTIFICATION_CHRC_UUID = '3a340721-c572-11e5-86c5-0002a5d5c51b'
WACOM_SLATE_WIDTH = 21600 WACOM_SLATE_WIDTH = 21600
WACOM_SLATE_HEIGHT = 14800 WACOM_SLATE_HEIGHT = 14800
ORIENTATION_PORTRAIT = 'portrait'
ORIENTATION_UPSIDEDOWN_PORTRAIT = 'tiartrop'
ORIENTATION_LANDSCAPE = 'landscape'
ORIENTATION_UPSIDEDOWN_LANDSCAPE = 'epacsdnal'
def signed_char_to_int(v): def signed_char_to_int(v):
return int.from_bytes([v], byteorder='little', signed=True) return int.from_bytes([v], byteorder='little', signed=True)
@ -119,7 +114,6 @@ class WacomDevice(GObject.Object):
self.device = device self.device = device
self.nordic_answer = None self.nordic_answer = None
self.pen_data_buffer = [] self.pen_data_buffer = []
self.orientation = ORIENTATION_PORTRAIT
self.thread = None self.thread = None
self.width = WACOM_SLATE_WIDTH self.width = WACOM_SLATE_WIDTH
self.height = WACOM_SLATE_HEIGHT self.height = WACOM_SLATE_HEIGHT
@ -174,19 +168,6 @@ class WacomDevice(GObject.Object):
x = int.from_bytes(data[0:2], byteorder='little') x = int.from_bytes(data[0:2], byteorder='little')
y = int.from_bytes(data[2:4], byteorder='little') y = int.from_bytes(data[2:4], byteorder='little')
pressure = int.from_bytes(data[4:6], byteorder='little') pressure = int.from_bytes(data[4:6], byteorder='little')
if self.orientation == ORIENTATION_PORTRAIT:
t = x
x = self.height - y
y = t
elif self.orientation == ORIENTATION_UPSIDEDOWN_PORTRAIT:
t = x
x = y
y = self.width - t
elif self.orientation == ORIENTATION_LANDSCAPE:
pass
elif self.orientation == ORIENTATION_UPSIDEDOWN_LANDSCAPE:
x = self.width - x
y = self.height - y
self.logger.info(f'New Pen Data: ({x},{y}), pressure: {pressure}') self.logger.info(f'New Pen Data: ({x},{y}), pressure: {pressure}')
data = data[6:] data = data[6:]
@ -559,10 +540,6 @@ class WacomDevice(GObject.Object):
if not self.is_spark(): if not self.is_spark():
self.width = w = self.get_dimensions('width') self.width = w = self.get_dimensions('width')
self.height = h = self.get_dimensions('height') self.height = h = self.get_dimensions('height')
if self.orientation in [ORIENTATION_PORTRAIT,
ORIENTATION_UPSIDEDOWN_PORTRAIT]:
w = self.height
h = self.width
logger.debug(f'dimensions: {w}x{h}') logger.debug(f'dimensions: {w}x{h}')
fw_high = self.get_firmware_version(0) fw_high = self.get_firmware_version(0)