Skip to content

Commit

Permalink
Add files via upload
Browse files Browse the repository at this point in the history 
Fixed bug with xsetwacom listing Intuos Pro 2 tablets as Intuos Pro.  Also attempted to fix svg parsing for intuos pro 2 tablets as they are using an ancient format; still has some graphical defects.
  • Loading branch information
@tb2097
tb2097 authored Jan 29, 2019
1 parent 7321e5c commit b7733f5
Showing 1 changed file with 78 additions and 47 deletions.
125 changes: 78 additions & 47 deletions wacom-gui/wacom_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,16 @@ def get_connected_tablets(self):
pass
self.__get_libwacom_data()
self.tablets = {}
for device in detected.keys():
for device, inputs in detected.iteritems():
if device[-4:] == '(WL)':
dev_type = device[:-5]
else:
dev_type = device
devID = self.device_data[dev_type]['devID']
try:
devID = self.device_data[dev_type]['devID']
except:
dev_type = dev_type.replace("Pro", "Pro 2")
devID = self.device_data[dev_type]['devID']
if self.device_data[dev_type]['devID'] not in self.tablets.keys():
self.tablets[devID] = []
# assume if it's the same device it has the same inputs for all connected
Expand All @@ -74,7 +78,7 @@ def get_connected_tablets(self):
idx = self.tablets[devID].__len__()
self.tablets[devID].append(copy.deepcopy(self.device_data[dev_type]))
self.tablets[devID][idx]['cname'] = device
for dev_input in detected[dev_type]:
for dev_input in inputs:
idx = self.tablets[devID].__len__() - detected[device][dev_input]['id'].__len__()
for instance in sorted(detected[device][dev_input]['id']):
self.tablets[devID][idx][dev_input]['id'] = instance
Expand Down Expand Up @@ -235,11 +239,30 @@ def pretty_svg(self, device):
if elem.attrib['id'] in self.device_data[device]['pad']['buttons'].keys():
but_info = self.device_data[device]['pad']['buttons'][elem.attrib['id']]
if but_info['orient'] in ['Left', 'Right']:
self.device_data[device]['pad']['buttons'][elem.attrib['id']]['pos'] = \
"%06.f" % float(elem.attrib['y'])
if 'y' in elem.attrib.keys():
self.device_data[device]['pad']['buttons'][elem.attrib['id']]['pos'] = \
"%06.f" % float(elem.attrib['y'])
elif 'd' in elem.attrib.keys():
d = elem.attrib['d'].split(' ')
if d[1].find(',') != -1:
elem.attrib['y'] = d[1].split(',')[1]
else:
elem.attrib['y'] = d[2]
self.device_data[device]['pad']['buttons'][elem.attrib['id']]['pos'] = \
"%06.f" % float(elem.attrib['y'])
else:
self.device_data[device]['pad']['buttons'][elem.attrib['id']]['pos'] = \
"%06.f" % float(elem.attrib['x'])
if 'x' in elem.attrib.keys():
self.device_data[device]['pad']['buttons'][elem.attrib['id']]['pos'] = \
"%06.f" % float(elem.attrib['x'])
elif 'd' in elem.attrib.keys():
d = elem.attrib['d'].split(' ')
if d[1].find(',') != -1:
elem.attrib['x'] = d[1].split(',')[0]
else:
elem.attrib['x'] = d[1]
elem.attrib['x'] = elem.attrib['d'].split(' ')[1]
self.device_data[device]['pad']['buttons'][elem.attrib['id']]['pos'] = \
"%06.f" % float(elem.attrib['x'])
elif elem.tag.split('}')[1] == 'circle':
svg = '%s\n\t\t<circle' % svg
# get attr
Expand Down Expand Up @@ -298,54 +321,62 @@ def pretty_svg(self, device):
if yshift > 0:
svg_write = ''
for line in svg.split('\n'):
if 'y="' in line and 'ry' not in line:
val = line.split('"')
svg_write = "%s\n%s\"%d\"" % (svg_write, val[0], float(val[1]) - yshift)
elif 'd="' in line and 'id="' not in line:
val = line.split('"')
points = val[1].split()
subs = [" ".join(points[i:i + 3]) for i in range(0, len(points), 3)]
d = "%s\"" % val[0]
for sub in subs:
if sub[0] == 'M' or sub[0] == 'L':
attrs = sub.split()
attrs[2] = str(float(attrs[2]) - float(yshift))
d = "%s %s" % (d, " ".join(attrs))
else:
d = "%s %s" % (d, sub)
d = "%s\"" % d
svg_write = "%s\n%s" % (svg_write, d)
else:
if 'sodipodi' in line:
line = "sodipodi:%s" % line.split('}')[1]
svg_write = "%s\n%s" % (svg_write, line)
else:
if 'y="' in line and 'ry' not in line:
val = line.split('"')
svg_write = "%s\n%s\"%d\"" % (svg_write, val[0], float(val[1]) - yshift)
elif 'd="' in line and 'id="' not in line:
val = line.split('"')
points = val[1].split()
subs = [" ".join(points[i:i + 3]) for i in range(0, len(points), 3)]
d = "%s\"" % val[0]
for sub in subs:
if sub[0] == 'M' or sub[0] == 'L':
attrs = sub.split()
attrs[2] = str(float(attrs[2]) - float(yshift))
d = "%s %s" % (d, " ".join(attrs))
else:
d = "%s %s" % (d, sub)
d = "%s\"" % d
svg_write = "%s\n%s" % (svg_write, d)
else:
svg_write = "%s\n%s" % (svg_write, line)
svg = svg_write
# shift x values if it is too wide
if xmax >= 500:
xshift = 300 # shift over by 200 units in the x coord
svg_write = ''
for line in svg.split('\n'):
if 'x="' in line and 'rx' not in line:
val = line.split('"')
if float(val[1]) >= 500.0:
svg_write = "%s\n%s\"%d\"" % (svg_write, val[0], float(val[1]) - xshift)
else:
svg_write = "%s\n%s\"%d\"" % (svg_write, val[0], float(val[1]))
elif 'd="' in line and 'id="' not in line:
val = line.split('"')
points = val[1].split()
subs = [" ".join(points[i:i + 3]) for i in range(0, len(points), 3)]
d = "%s\"" % val[0]
for sub in subs:
if sub[0] == 'M' or sub[0] == 'L':
attrs = sub.split()
if float(attrs[1]) >= 500.0:
attrs[1] = str(float(attrs[1]) - float(xshift))
d = "%s %s" % (d, " ".join(attrs))
else:
d = "%s %s" % (d, sub)
d = "%s\"" % d
svg_write = "%s\n%s" % (svg_write, d)
else:
if 'sodipodi' in line:
line = "sodipodi:%s" % line.split('}')[1]
svg_write = "%s\n%s" % (svg_write, line)
else:
if 'x="' in line and 'rx' not in line:
val = line.split('"')
if float(val[1]) >= 500.0:
svg_write = "%s\n%s\"%d\"" % (svg_write, val[0], float(val[1]) - xshift)
else:
svg_write = "%s\n%s\"%d\"" % (svg_write, val[0], float(val[1]))
elif 'd="' in line and 'id="' not in line:
val = line.split('"')
points = val[1].split()
subs = [" ".join(points[i:i + 3]) for i in range(0, len(points), 3)]
d = "%s\"" % val[0]
for sub in subs:
if sub[0] == 'M' or sub[0] == 'L':
attrs = sub.split()
if float(attrs[1]) >= 500.0:
attrs[1] = str(float(attrs[1]) - float(xshift))
d = "%s %s" % (d, " ".join(attrs))
else:
d = "%s %s" % (d, sub)
d = "%s\"" % d
svg_write = "%s\n%s" % (svg_write, d)
else:
svg_write = "%s\n%s" % (svg_write, line)
# write top of svg file
if xmax >= 500:
svg = """<svg
Expand Down

0 comments on commit b7733f5

Please sign in to comment.