ag/pixelocr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename Letter to Glyph.

Browse source
This commit is contained in:
Andrey Golovizin 2014-08-18 15:44:36 +02:00
parent c5cb68f063
commit ada771b5c9
7 changed files with 72 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pixelocr/gui/__init__.py
View file

@ -44,8 +44,8 @@ def main():
ocr = OCREngine(sys.argv[1:])
ocr.pageChanged.connect(win.pageScene.setPage)
ocr.unknownLetter.connect(win.unknownLetter)
win.letterEntered.connect(ocr.give_help)
ocr.unknownGlyph.connect(win.unknownGlyph)
win.glyphEntered.connect(ocr.give_help)
ocr.start()
signal.signal(signal.SIGINT, signal.SIG_DFL)

8
pixelocr/gui/glyphedit.py
View file

@ -28,7 +28,7 @@ from PyQt4.QtGui import (
class GlyphEdit(QWidget):
letterEntered = signal([str])
glyphEntered = signal([str])
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@ -47,11 +47,11 @@ class GlyphEdit(QWidget):
self.italic.setShortcut('Ctrl+i')
self.text = QLineEdit(self)
self.text.returnPressed.connect(self.sendLetter)
self.text.returnPressed.connect(self.sendGlyph)
self.layout.addWidget(self.bold)
self.layout.addWidget(self.italic)
self.layout.addWidget(self.text)
def sendLetter(self):
self.letterEntered.emit(self.text.text())
def sendGlyph(self):
self.glyphEntered.emit(self.text.text())

22
pixelocr/gui/ocrengine.py
View file

@ -23,11 +23,11 @@ from PyQt4.QtCore import (
)
from ..image import Image
from ..page import Page, Letter, Space
from ..page import Page, Glyph, Space
class OCREngine(QThread):
unknownLetter = signal([Letter])
unknownGlyph = signal([Glyph])
pageChanged = signal([Page])
def __init__(self, filenames):
@ -54,21 +54,21 @@ class OCREngine(QThread):
yield ''.join(self.recognize_line(line))
def recognize_line(self, line):
for letter in line.letters:
yield self.recognize_letter(letter)
for glyph in line.glyphs:
yield self.recognize_glyph(glyph)
def recognize_letter(self, letter):
if isinstance(letter, Space):
def recognize_glyph(self, glyph):
if isinstance(glyph, Space):
return ' '
try:
return self.chardb[letter.key]
return self.chardb[glyph.key]
except KeyError:
text = self.ask_for_help(letter)
self.chardb[letter.key] = text
text = self.ask_for_help(glyph)
self.chardb[glyph.key] = text
return text
def ask_for_help(self, unknown_letter):
self.unknownLetter.emit(unknown_letter)
def ask_for_help(self, unknown_glyph):
self.unknownGlyph.emit(unknown_glyph)
return self.receive_help()
def give_help(self, text):

26
pixelocr/gui/pageview.py
View file

@ -50,8 +50,8 @@ class PageScene(QGraphicsScene):
page = None
pageItem = None
letterPen = QColor(0, 0, 0, 80)
letterBrush = QColor(255, 255, 0, 80)
glyphPen = QColor(0, 0, 0, 80)
glyphBrush = QColor(255, 255, 0, 80)
spacePen = QColor(0, 0, 0, 80)
spaceBrush = QColor(0, 0, 255, 20)
linePen = QColor(255, 50, 50, 100)
@ -60,11 +60,11 @@ class PageScene(QGraphicsScene):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.highlightedLetters = {}
self.highlightedGlyphs = {}
self.setBackgroundBrush(self.palette().window())
def setPage(self, page):
self.highlightedLetters.clear()
self.highlightedGlyphs.clear()
for item in self.items():
self.remoteItem(item)
self.page = page
@ -78,11 +78,11 @@ class PageScene(QGraphicsScene):
def highlightAll(self):
for line in page:
for letter in line:
if not letter.image.isspace:
self.addRect(letter.x - 1, letter.y - 1, letter.width + 1, letter.height + 1, self.letterPen, self.letterBrush)
for glyph in line:
if not glyph.image.isspace:
self.addRect(glyph.x - 1, glyph.y - 1, glyph.width + 1, glyph.height + 1, self.glyphPen, self.glyphBrush)
else:
self.addRect(letter.x - 1, letter.y - 1, letter.width + 1, letter.height + 1, self.spacePen, self.spaceBrush)
self.addRect(glyph.x - 1, glyph.y - 1, glyph.width + 1, glyph.height + 1, self.spacePen, self.spaceBrush)
self.addLine(line.left, line.baseline, line.right, line.baseline, self.linePen)
def addPage(self, page):
@ -90,14 +90,14 @@ class PageScene(QGraphicsScene):
graphicsitem = self.addPixmap(QPixmap.fromImage(qimage))
return graphicsitem
def highlightLetter(self, letter):
rect = self.addRect(letter.x - 1, letter.y - 1, letter.width + 1, letter.height + 1, self.letterPen, self.letterBrush)
self.highlightedLetters[letter] = rect
def highlightGlyph(self, glyph):
rect = self.addRect(glyph.x - 1, glyph.y - 1, glyph.width + 1, glyph.height + 1, self.glyphPen, self.glyphBrush)
self.highlightedGlyphs[glyph] = rect
def clearHighlight(self):
for item in self.highlightedLetters.values():
for item in self.highlightedGlyphs.values():
self.removeItem(item)
self.highlightedLetters.clear()
self.highlightedGlyphs.clear()
class PageView(QGraphicsView):

10
pixelocr/gui/window.py
View file

@ -34,7 +34,7 @@ from .glyphedit import GlyphEdit
class MainWindow(QMainWindow):
letterEntered = signal([str])
glyphEntered = signal([str])
def __init__(self):
super().__init__()
@ -46,8 +46,8 @@ class MainWindow(QMainWindow):
self.page = PageView(self.pageScene, centralWidget)
self.pageScene.pageItemChanged.connect(self.page.centerOnPage)
self.glyphEdit = GlyphEdit(centralWidget)
self.glyphEdit.letterEntered.connect(self.letterEntered)
self.glyphEdit.letterEntered.connect(self.pageScene.clearHighlight)
self.glyphEdit.glyphEntered.connect(self.glyphEntered)
self.glyphEdit.glyphEntered.connect(self.pageScene.clearHighlight)
layout = QVBoxLayout(centralWidget)
layout.setSpacing(0)
@ -74,8 +74,8 @@ class MainWindow(QMainWindow):
self.restoreGeometry(settings.value("windowGeometry") or b'')
self.restoreState(settings.value("windowState") or b'')
def unknownLetter(self, letter):
self.pageScene.highlightLetter(letter)
def unknownGlyph(self, glyph):
self.pageScene.highlightGlyph(glyph)
self.glyphEdit.setEnabled(True)
self.glyphEdit.text.clear()
self.glyphEdit.text.setFocus()