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

inprove hilight tracking accuracy

Browse Source
This commit is contained in:
chrys 2018-06-09 13:59:54 +02:00
parent 558651f9d1
commit 07d8e0ae96
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/fenrirscreenreader/core/attributeManager.py
View File

@ -283,10 +283,32 @@ class attributeManager():
for line in range(len(self.prevAttributes)): for line in range(len(self.prevAttributes)):
if self.prevAttributes[line] != self.currAttributes[line]: if self.prevAttributes[line] != self.currAttributes[line]:
for column in range(len(self.prevAttributes[line])): for column in range(len(self.prevAttributes[line])):
if self.prevAttributes[line][column] != self.currAttributes[line][column]: if self.prevAttributes[line][column] == self.currAttributes[line][column]:
if not self.isDefaultAttribute(self.currAttributes[line][column]): continue
if not currCursor: if self.isUsefulForTracking(line, column, self.currAttributes, self.prevAttributes):
currCursor = {'x': column, 'y': line} if not currCursor:
result += textLines[line][column] currCursor = {'x': column, 'y': line}
result += textLines[line][column]
result += ' ' result += ' '
return result, currCursor return result, currCursor
def isUsefulForTracking(self, line, column, currAttributes, prevAttributes, attribute=1):
if len(currAttributes) <= 3:
return False
if line < 0:
return False
if line > len(currAttributes):
return False
useful = False
# non default tracking
#useful = not self.isDefaultAttribute(currAttributes[line][column])
# arround me tracking for bg
if line == 0:
useful = (currAttributes[line][column][attribute] != currAttributes[line + 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line + 2][column][attribute])
elif line >= len(prevAttributes):
useful = (currAttributes[line][column][attribute] != currAttributes[line - 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line - 2][column][attribute])
else:
useful = (currAttributes[line][column][attribute] != currAttributes[line + 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line - 1][column][attribute])
return useful