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

Make GlyphEditor return proper bold and italic flags (and store them in the DB).

Browse source
This commit is contained in:
Andrey Golovizin 2014-09-01 18:07:29 +02:00
parent 9c8de1ce0f
commit 892038f65b
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pixelocr/gui/glyphedit.py
View file

@ -28,7 +28,7 @@ from PyQt4.QtGui import (
class GlyphEdit(QWidget): class GlyphEdit(QWidget):
glyphEntered = signal([str]) glyphEntered = signal([str, bool, bool])
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -54,4 +54,4 @@ class GlyphEdit(QWidget):
self.layout.addWidget(self.text) self.layout.addWidget(self.text)
def sendGlyph(self): def sendGlyph(self):
self.glyphEntered.emit(self.text.text()) self.glyphEntered.emit(self.text.text(), self.bold.isChecked(), self.italic.isChecked())

8
pixelocr/gui/ocrengine.py
View file

@ -77,16 +77,16 @@ class OCREngine(QThread):
try: try:
return self.glyphdb[glyph].text return self.glyphdb[glyph].text
except KeyError: except KeyError:
text = self.ask_for_help(glyph) text, bold, italic = self.ask_for_help(glyph)
self.glyphdb.add_glyph(glyph, text) self.glyphdb.add_glyph(glyph, text, bold, italic)
return text return text
def ask_for_help(self, unknown_glyph): def ask_for_help(self, unknown_glyph):
self.unknownGlyph.emit(unknown_glyph) self.unknownGlyph.emit(unknown_glyph)
return self.receive_help() return self.receive_help()
def give_help(self, text): def give_help(self, *args):
self.help_queue.put(text) self.help_queue.put(args)
def receive_help(self): def receive_help(self):
return self.help_queue.get() return self.help_queue.get()

6
pixelocr/gui/window.py
View file

@ -40,7 +40,7 @@ from .glyphdbedit import GlyphDBEdit
class MainWindow(QMainWindow): class MainWindow(QMainWindow):
BASE_TITLE = 'PixelOCR' BASE_TITLE = 'PixelOCR'
dbedit = None dbedit = None
glyphEntered = signal([str]) glyphEntered = signal([str, bool, bool])
def __init__(self, ocr): def __init__(self, ocr):
super().__init__() super().__init__()
@ -105,10 +105,10 @@ class MainWindow(QMainWindow):
self.glyphEdit.text.clear() self.glyphEdit.text.clear()
self.glyphEdit.text.setFocus() self.glyphEdit.text.setFocus()
def unknownGlyphEntered(self, text): def unknownGlyphEntered(self, text, bold, italic):
self.glyphEdit.setEnabled(False) self.glyphEdit.setEnabled(False)
self.glyphEdit.text.clear() self.glyphEdit.text.clear()
self.glyphEntered.emit(text) self.glyphEntered.emit(text, bold, italic)
def showGlyphDBEdit(self): def showGlyphDBEdit(self):
if self.dbedit is None: if self.dbedit is None: