Skip to content

Continually refresh OCR and speak new text as it appears #15331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanbudd merged 16 commits into from
Sep 1, 2023
Merged

Continually refresh OCR and speak new text as it appears #15331

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
568abed
Continually refresh OCR and speak new text as it appears.
jcsteh Jun 18, 2020
04223ec
Add config option and sanity fixes
LeonarddeR Aug 24, 2023
3a407b7
Update user guide
LeonarddeR Aug 25, 2023
43d9ad6
Disallow screen curtain when recognizing
LeonarddeR Aug 25, 2023
7301fc2
Add note about refresh interval
LeonarddeR Aug 25, 2023
54aa157
Merge remote-tracking branch 'origin/master' into continualOcr
LeonarddeR Aug 30, 2023
fd3f2b6
Apply suggestions from code review
LeonarddeR Aug 30, 2023
a6b4f36
Many review actions
LeonarddeR Aug 30, 2023
7d43fa5
Fix edge case for screen curtain
LeonarddeR Aug 30, 2023
07820a0
Remove debugging
LeonarddeR Aug 30, 2023
c1a18bb
Undo whitespace changes
LeonarddeR Aug 30, 2023
d7a5a40
Two remainings
LeonarddeR Aug 30, 2023
72ebf0c
Fix checkPot
LeonarddeR Aug 30, 2023
95897a7
Move sentence in user guide
LeonarddeR Aug 31, 2023
e9eedb1
Merge remote-tracking branch 'origin/master' into continualOcr
seanbudd Sep 1, 2023
1078b75
update changes
seanbudd Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Disallow screen curtain when recognizing
  • Loading branch information
@LeonarddeR
LeonarddeR committed Aug 25, 2023
commit 43d9ad61a9a0f57398896d6efb4ad7f5b9c20638
20 changes: 13 additions & 7 deletions source/globalCommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,7 +1050,7 @@ def script_reviewMode_next(self,gesture):
braille.handler.setTether(TetherTo.REVIEW.value, auto=True)
speech.speakTextInfo(pos)
else:
# Translators: reported when there are no other available review modes for this object
# Translators: reported when there are no other available review modes for this object
ui.reviewMessage(_("No next review mode"))

@script(
Expand All @@ -1071,7 +1071,7 @@ def script_reviewMode_previous(self,gesture):
braille.handler.setTether(TetherTo.REVIEW.value, auto=True)
speech.speakTextInfo(pos)
else:
# Translators: reported when there are no other available review modes for this object
# Translators: reported when there are no other available review modes for this object
ui.reviewMessage(_("No previous review mode"))

@script(
Expand Down Expand Up @@ -2184,7 +2184,7 @@ def _reportFormattingHelper(self, info, browseable=False):
indentation,content=speech.splitTextIndentation(line.text)
if indentation:
textList.extend(speech.getIndentationSpeech(indentation, formatConfig))

info=info.copy()
info.expand(textInfos.UNIT_CHARACTER)
formatField=textInfos.FormatField()
Expand All @@ -2201,7 +2201,7 @@ def _reportFormattingHelper(self, info, browseable=False):
# Translators: Reported when trying to obtain formatting information (such as font name, indentation and so on) but there is no formatting information for the text under cursor.
ui.message(_("No formatting information"))
return

ui.message(" ".join(textList))
else:
if formatField:
Expand Down Expand Up @@ -3380,7 +3380,7 @@ def script_reportClipboardText(self,gesture):
# Translators: Presented when there is no text on the clipboard.
ui.message(_("There is no text on the clipboard"))
return
if len(text) < 1024:
if len(text) < 1024:
ui.message(text)
else:
# Translators: If the number of characters on the clipboard is greater than about 1000, it reports this message and gives number of characters on the clipboard.
Expand Down Expand Up @@ -3555,7 +3555,7 @@ def script_braille_reportFormatting(self, gesture):
category=SCRCAT_BRAILLE
)
def script_braille_previousLine(self, gesture):
if braille.handler.buffer.regions:
if braille.handler.buffer.regions:
braille.handler.buffer.regions[-1].previousLine(start=True)

@script(
Expand All @@ -3564,7 +3564,7 @@ def script_braille_previousLine(self, gesture):
category=SCRCAT_BRAILLE
)
def script_braille_nextLine(self, gesture):
if braille.handler.buffer.regions:
if braille.handler.buffer.regions:
braille.handler.buffer.regions[-1].nextLine()

@script(
Expand Down Expand Up @@ -4259,6 +4259,12 @@ def _enableScreenCurtain(doEnable: bool = True):
)
)
else:
from contentRecog.recogUi import RecogResultNVDAObject
if isinstance(api.getFocusObject(), RecogResultNVDAObject):
Comment thread
LeonarddeR marked this conversation as resolved.
Outdated
# Translators: Warning message when trying to enable the screen curtain when OCR is active.
warningMessage = _("Could not enable screen curtain when performing content recognition")
ui.message(warningMessage, speechPriority=speech.priorities.Spri.NOW)
return
_enableScreenCurtain()

@script(
Expand Down