VirtKeyboard: symbol detection improvement

Signed-off-by: Pierre Mazière <pierre.maziere@gmail.com>
This commit is contained in:
Pierre Mazière 2011-11-04 10:09:47 +01:00
commit d9b51c406d
2 changed files with 8 additions and 10 deletions

View file

@ -46,8 +46,8 @@ class LoginPage(BasePage):
'4':'2359eea8671bf112b58264bec0294f71', '4':'2359eea8671bf112b58264bec0294f71',
'5':'82b55b63480114f04fad8c5c4fa5673a', '5':'82b55b63480114f04fad8c5c4fa5673a',
'6':'e074864faeaeabb3be3d118192cd8879', '6':'e074864faeaeabb3be3d118192cd8879',
'7':'753468d88d4810206a6f0ab9c6ef1b16', '7':'af5740e4ca71fadc6f4ae1412d864a1c',
'8':'9cc4789a2cb223e8f2d5e676e90264b5', '8':'cab759c574038ad89a0e35cc76ab7214',
'9':'828cf0faf86ac78e7f43208907620527' '9':'828cf0faf86ac78e7f43208907620527'
} }
@ -105,8 +105,8 @@ class ChangePasswordPage(BasePage):
'4':'2359eea8671bf112b58264bec0294f71', '4':'2359eea8671bf112b58264bec0294f71',
'5':'82b55b63480114f04fad8c5c4fa5673a', '5':'82b55b63480114f04fad8c5c4fa5673a',
'6':'e074864faeaeabb3be3d118192cd8879', '6':'e074864faeaeabb3be3d118192cd8879',
'7':'753468d88d4810206a6f0ab9c6ef1b16', '7':'af5740e4ca71fadc6f4ae1412d864a1c',
'8':'9cc4789a2cb223e8f2d5e676e90264b5', '8':'cab759c574038ad89a0e35cc76ab7214',
'9':'828cf0faf86ac78e7f43208907620527' '9':'828cf0faf86ac78e7f43208907620527'
} }

View file

@ -67,9 +67,8 @@ class VirtKeyboard(object):
break; break;
else: else:
break break
if newY1!=-1 and empty_line: if newY1!=-1 and not empty_line:
newY2=y-1 newY2=y
break
newX1=-1 newX1=-1
newX2=-1 newX2=-1
for x in range(x1,min(x2+1,self.width)): for x in range(x1,min(x2+1,self.width)):
@ -82,9 +81,8 @@ class VirtKeyboard(object):
break break
else: else:
break break
if newX1!=-1 and empty_column: if newX1!=-1 and not empty_column:
newX2=x-1 newX2=x
break
return (newX1,newY1,newX2,newY2) return (newX1,newY1,newX2,newY2)
def checksum(self,(x1,y1,x2,y2)): def checksum(self,(x1,y1,x2,y2)):