From f56e57dfe2abbda235022b23dd5aded8fd39a725 Mon Sep 17 00:00:00 2001
From: chrys <chrys87@web.de>
Date: Sun, 27 May 2018 22:41:03 +0200
Subject: [PATCH] unify lineends

---
 .../core/attributeManager.py                  | 28 +++++++++++++++----
 .../screenDriver/vcsaDriver.py                |  7 +++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/fenrirscreenreader/core/attributeManager.py b/src/fenrirscreenreader/core/attributeManager.py
index f9957897..ebe35747 100644
--- a/src/fenrirscreenreader/core/attributeManager.py
+++ b/src/fenrirscreenreader/core/attributeManager.py
@@ -159,21 +159,37 @@ class attributeManager():
     def trackHighlights(self, oldAttr, newAttr, text, lenght):
         result = ''
         currCursor = None
-        if oldAttr == newAttr:
-            return result,  currCursor
+        #if oldAttr == newAttr:
+        #    return result,  currCursor
         if len(newAttr) == 0:
+            print('len')
             return result,  currCursor
         if len(oldAttr) != len(newAttr):
+            print('ON len')
             return result,  currCursor         
-            
+        
         textLines = text.split('\n')
 
-        if len(textLines) - 1 != len(newAttr):
+        if len(textLines) != len(newAttr):
+            print(len(textLines), len(newAttr))        
             return result,  currCursor
-
+        print(len(textLines), len(newAttr))
         background = []
+
         try:
-            bgStat = Counter(newAttr).most_common(3)
+            allAttrib = [line for line in newAttr]
+            print(allAttrib)
+            #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])
diff --git a/src/fenrirscreenreader/screenDriver/vcsaDriver.py b/src/fenrirscreenreader/screenDriver/vcsaDriver.py
index 8154d6e1..6ab95bc4 100644
--- a/src/fenrirscreenreader/screenDriver/vcsaDriver.py
+++ b/src/fenrirscreenreader/screenDriver/vcsaDriver.py
@@ -195,7 +195,8 @@ class driver(screenDriver):
     def autoDecodeVCSA(self, allData, rows, cols):
         allText = ''
         allAttrib = []
-        i = 0        
+        i = 0
+        print(rows)
         for y in range(rows):
             lineText = ''
             lineAttrib = []
@@ -254,7 +255,9 @@ class driver(screenDriver):
                 'default', # fontsize
                 'default') # fontfamily
                 lineAttrib.append(charAttrib)
-            allText += lineText + '\n'
+            allText += lineText
+            if y + 1 < rows:
+                allText += '\n'
             allAttrib.append(lineAttrib)
         return str(allText), allAttrib