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

Update attributeManager.py

Browse Source
This commit is contained in:
chrys87 2018-06-12 10:07:17 +02:00 committed by GitHub
parent 46e778e54a
commit b130dd3271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,7 +232,6 @@ class attributeManager():
return attributeFormatString return attributeFormatString
def trackHighlights(self): def trackHighlights(self):
result = '' result = ''
currCursor = None currCursor = None
# screen change # screen change
@ -252,34 +251,6 @@ class attributeManager():
if len(textLines) != len(self.currAttributes): if len(textLines) != len(self.currAttributes):
return result, currCursor return result, currCursor
#print(len(textLines), len(newAttr))
#background = []
try:
pass
#llAttrib = [line for line in newAttr]
#print(Counter(allAttrib[0]).most_common())
#from collections import Counter
#import random
#tups = [ (1,2), (3,4), (5,6), (1,2), (3,4) ]
#lst = Counter(tups).most_common()
#highest_count = max([i[1] for i in lst])
#values = [i[0] for i in lst if i[1] == highest_count]
#random.shuffle(values)
#print(values[0])
#bgStat = Counter(newAttr).most_common(3)
#for i in bgStat:
# print(i)
#background.append(bgStat[0][0])
# if there is a third color add a secondary background (for dialogs for example)
#if len(bgStat) > 2:
# if bgStat[1][1] > 40:
# background.append(bgStat[1][0])
except Exception as e:
print(e)
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])):
@ -291,7 +262,7 @@ class attributeManager():
result += textLines[line][column] result += textLines[line][column]
result += ' ' result += ' '
return result, currCursor return result, currCursor
def isUsefulForTracking(self, line, column, currAttributes, prevAttributes, attribute=1): def isUsefulForTracking(self, line, column, currAttributes, prevAttributes, attribute=1 , mode = 'zaxe'):
if len(currAttributes) <= 3: if len(currAttributes) <= 3:
return False return False
if line < 0: if line < 0:
@ -299,16 +270,20 @@ class attributeManager():
if line > len(currAttributes): if line > len(currAttributes):
return False return False
useful = False useful = False
# non default tracking if mode == 'default':
#useful = not self.isDefaultAttribute(currAttributes[line][column]) # non default tracking
useful = not self.isDefaultAttribute(currAttributes[line][column])
# arround me tracking for bg elif (mode == 'zaxe') or (mode == ''):
if line == 0: # arround me tracking for bg
useful = (currAttributes[line][column][attribute] != currAttributes[line + 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line + 2][column][attribute]) if line == 0:
elif line >= len(prevAttributes): useful = (currAttributes[line][column][attribute] != currAttributes[line + 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line + 2][column][attribute])
useful = (currAttributes[line][column][attribute] != currAttributes[line - 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line - 2][column][attribute]) elif line >= len(prevAttributes):
else: useful = (currAttributes[line][column][attribute] != currAttributes[line - 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line - 2][column][attribute])
useful = (currAttributes[line][column][attribute] != currAttributes[line + 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line - 1][column][attribute]) else:
useful = (currAttributes[line][column][attribute] != currAttributes[line + 1][column][attribute]) and (currAttributes[line][column][attribute] != currAttributes[line - 1][column][attribute])
elif mode == 'barrier':
# to be implement
useful = True
return useful return useful