storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP barrir rework

Browse Source
This commit is contained in:
chrys 2018-07-04 16:23:38 +02:00
parent 2eebb12dca
commit 97a0f4bfbd
1 changed files with 58 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/fenrirscreenreader/core/barrierManager.py
View File

@ -33,27 +33,69 @@ class barrierManager():
self.env['runtime']['outputManager'].playSoundIcon(soundIcon='BarrierFound', interrupt=doInterrupt) self.env['runtime']['outputManager'].playSoundIcon(soundIcon='BarrierFound', interrupt=doInterrupt)
return sayLine return sayLine
def hasBarrier(self, start, end): def hasBorder(self, text, xCursor, yCursor, validBorder):
# check for corners here # check for corners here
lastLineNo = len(text) - 1
if yCursor <= 0:
if not (text[0][xCursor] in validBorder):
return False
if len(text) > 1:
if not (text[1][xCursor] in validBorder):
return False
if len(text) > 2:
if not (text[2][xCursor] in validBorder):
return False
elif yCursor >= lastLineNo:
if not (text[lastLineNo][xCursor] in validBorder):
return False
if len(text) > 1:
if not (text[lastLineNo - 1][xCursor] in validBorder):
return False
if len(text) > 2:
if not (text[lastLineNo - 2][xCursor] in validBorder):
return False
else:
if not (text[yCursor][xCursor] in validBorder):
return False
if not (text[yCursor - 1][xCursor] in validBorder):
return False
if not (text[yCursor + 1][xCursor] in validBorder):
return False
return True return True
def getBarrierText(self, line, xCursor): def getBarrierText(self, text, xCursor, yCursor):
line = text[yCursor]
if not self.env['runtime']['settingsManager'].getSettingAsBool('barrier', 'enabled'):
return False, line
offset = xCursor offset = xCursor
leftBarriers = self.env['runtime']['settingsManager'].getSetting('barrier', 'barrier')
rightBarriers = self.env['runtime']['settingsManager'].getSetting('barrier', 'grabDevices')
# is the cursor at the begin or end of an entry: # is the cursor at the begin or end of an entry:
#print(line[:offset + 1].count('│'),line[offset:].count('│')) #print(line[:offset + 1].count('│'),line[offset:].count('│'))
if line[:offset + 1].count('│') > line[offset:].count('│'): # start
for b in leftBarriers:
if line[:offset + 1].count(b) > line[offset:].count(b):
offset = xCursor - 1 offset = xCursor - 1
start = line[:offset + 1].rfind('│') + 1 start = line[:offset + 1].rfind(b) + 1
end = line[offset + 1:].find('│') if start != -1:
if start == end: if not self.hasBorder(text, xCursor, yCursor):
return False, line start = -1
break
if start == -1: if start == -1:
return False, line return False, line
# end
for b in rightBarriers:
end = line[offset + 1:].find(b)
if end != -1:
if not self.hasBorder(text, xCursor, yCursor):
end = -1
break
if end == -1: if end == -1:
return False, line return False, line
else: if start == end:
end += offset + 1
if not self.hasBarrier(start, end):
return False, line return False, line
end += offset + 1
return True, line[start:end] return True, line[start:end]