Merge branch 'bleed' of https://github.com/chrys87/fenrir into bleed

This commit is contained in:
Storm Dragon 2018-03-24 15:07:05 -04:00
commit dd1185a3b1

View File

@ -24,7 +24,7 @@ class outputManager():
self.env['runtime']['settingsManager'].shutdownDriver('speechDriver') self.env['runtime']['settingsManager'].shutdownDriver('speechDriver')
self.env['runtime']['settingsManager'].shutdownDriver('brailleDriver') self.env['runtime']['settingsManager'].shutdownDriver('brailleDriver')
def presentText(self, text, interrupt=True, soundIcon = '', ignorePunctuation=False, announceCapital=False, flush=True): def presentText(self, text, interrupt=True, soundIcon = '', ignorePunctuation=False, announceCapital=False, flush=True, brailleAlternative = ''):
if text == '': if text == '':
return return
self.env['runtime']['debug'].writeDebugOut("presentText:\nsoundIcon:'"+soundIcon+"'\nText:\n" + text ,debug.debugLevel.INFO) self.env['runtime']['debug'].writeDebugOut("presentText:\nsoundIcon:'"+soundIcon+"'\nText:\n" + text ,debug.debugLevel.INFO)
@ -40,7 +40,11 @@ class outputManager():
self.lastEcho = text self.lastEcho = text
self.speakText(text, interrupt, ignorePunctuation,toAnnounceCapital) self.speakText(text, interrupt, ignorePunctuation,toAnnounceCapital)
if flush: if flush:
self.brailleText(text, flush) if brailleAlternative != '':
brlText = brailleAlternative
else:
brlText = text
self.brailleText(brlText, flush)
def getLastEcho(self): def getLastEcho(self):
return self.lastEcho return self.lastEcho
def speakText(self, text, interrupt=True, ignorePunctuation=False, announceCapital=False): def speakText(self, text, interrupt=True, ignorePunctuation=False, announceCapital=False):