Fix several bugs in PPOCRLabel
Spelling mistake, detection box missing,etc.
This commit is contained in:
parent
4c3155058f
commit
5520d88609
|
@ -147,6 +147,7 @@ class MainWindow(QMainWindow, WindowMixin):
|
||||||
self.itemsToShapesbox = {}
|
self.itemsToShapesbox = {}
|
||||||
self.shapesToItemsbox = {}
|
self.shapesToItemsbox = {}
|
||||||
self.prevLabelText = getStr('tempLabel')
|
self.prevLabelText = getStr('tempLabel')
|
||||||
|
self.noLabelText = getStr('nullLabel')
|
||||||
self.model = 'paddle'
|
self.model = 'paddle'
|
||||||
self.PPreader = None
|
self.PPreader = None
|
||||||
self.autoSaveNum = 5
|
self.autoSaveNum = 5
|
||||||
|
@ -1020,7 +1021,7 @@ class MainWindow(QMainWindow, WindowMixin):
|
||||||
item.setText(str([(int(p.x()), int(p.y())) for p in shape.points]))
|
item.setText(str([(int(p.x()), int(p.y())) for p in shape.points]))
|
||||||
self.updateComboBox()
|
self.updateComboBox()
|
||||||
|
|
||||||
def updateComboBox(self): # TODO:貌似没用
|
def updateComboBox(self):
|
||||||
# Get the unique labels and add them to the Combobox.
|
# Get the unique labels and add them to the Combobox.
|
||||||
itemsTextList = [str(self.labelList.item(i).text()) for i in range(self.labelList.count())]
|
itemsTextList = [str(self.labelList.item(i).text()) for i in range(self.labelList.count())]
|
||||||
|
|
||||||
|
@ -1040,7 +1041,7 @@ class MainWindow(QMainWindow, WindowMixin):
|
||||||
return dict(label=s.label, # str
|
return dict(label=s.label, # str
|
||||||
line_color=s.line_color.getRgb(),
|
line_color=s.line_color.getRgb(),
|
||||||
fill_color=s.fill_color.getRgb(),
|
fill_color=s.fill_color.getRgb(),
|
||||||
points=[(p.x(), p.y()) for p in s.points], # QPonitF
|
points=[(int(p.x()), int(p.y())) for p in s.points], # QPonitF
|
||||||
# add chris
|
# add chris
|
||||||
difficult=s.difficult) # bool
|
difficult=s.difficult) # bool
|
||||||
|
|
||||||
|
@ -1069,7 +1070,7 @@ class MainWindow(QMainWindow, WindowMixin):
|
||||||
# print('Image:{0} -> Annotation:{1}'.format(self.filePath, annotationFilePath))
|
# print('Image:{0} -> Annotation:{1}'.format(self.filePath, annotationFilePath))
|
||||||
return True
|
return True
|
||||||
except:
|
except:
|
||||||
self.errorMessage(u'Error saving label data')
|
self.errorMessage(u'Error saving label data', u'Error saving label data')
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def copySelectedShape(self):
|
def copySelectedShape(self):
|
||||||
|
@ -1802,10 +1803,14 @@ class MainWindow(QMainWindow, WindowMixin):
|
||||||
result.insert(0, box)
|
result.insert(0, box)
|
||||||
print('result in reRec is ', result)
|
print('result in reRec is ', result)
|
||||||
self.result_dic.append(result)
|
self.result_dic.append(result)
|
||||||
if result[1][0] == shape.label:
|
else:
|
||||||
print('label no change')
|
print('Can not recognise the box')
|
||||||
else:
|
self.result_dic.append([box,(self.noLabelText,0)])
|
||||||
rec_flag += 1
|
|
||||||
|
if self.noLabelText == shape.label or result[1][0] == shape.label:
|
||||||
|
print('label no change')
|
||||||
|
else:
|
||||||
|
rec_flag += 1
|
||||||
|
|
||||||
if len(self.result_dic) > 0 and rec_flag > 0:
|
if len(self.result_dic) > 0 and rec_flag > 0:
|
||||||
self.saveFile(mode='Auto')
|
self.saveFile(mode='Auto')
|
||||||
|
@ -1836,9 +1841,14 @@ class MainWindow(QMainWindow, WindowMixin):
|
||||||
print('label no change')
|
print('label no change')
|
||||||
else:
|
else:
|
||||||
shape.label = result[1][0]
|
shape.label = result[1][0]
|
||||||
self.singleLabel(shape)
|
else:
|
||||||
self.setDirty()
|
print('Can not recognise the box')
|
||||||
print(box)
|
if self.noLabelText == shape.label:
|
||||||
|
print('label no change')
|
||||||
|
else:
|
||||||
|
shape.label = self.noLabelText
|
||||||
|
self.singleLabel(shape)
|
||||||
|
self.setDirty()
|
||||||
|
|
||||||
def autolcm(self):
|
def autolcm(self):
|
||||||
vbox = QVBoxLayout()
|
vbox = QVBoxLayout()
|
||||||
|
|
|
@ -45,7 +45,7 @@ class Canvas(QWidget):
|
||||||
CREATE, EDIT = list(range(2))
|
CREATE, EDIT = list(range(2))
|
||||||
_fill_drawing = False # draw shadows
|
_fill_drawing = False # draw shadows
|
||||||
|
|
||||||
epsilon = 11.0
|
epsilon = 5.0
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
super(Canvas, self).__init__(*args, **kwargs)
|
super(Canvas, self).__init__(*args, **kwargs)
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -87,6 +87,7 @@ creatPolygon=四点标注
|
||||||
drawSquares=正方形标注
|
drawSquares=正方形标注
|
||||||
saveRec=保存识别结果
|
saveRec=保存识别结果
|
||||||
tempLabel=待识别
|
tempLabel=待识别
|
||||||
|
nullLabel=无法识别
|
||||||
steps=操作步骤
|
steps=操作步骤
|
||||||
choseModelLg=选择模型语言
|
choseModelLg=选择模型语言
|
||||||
cancel=取消
|
cancel=取消
|
||||||
|
|
|
@ -77,7 +77,7 @@ IR=Image Resize
|
||||||
autoRecognition=Auto Recognition
|
autoRecognition=Auto Recognition
|
||||||
reRecognition=Re-recognition
|
reRecognition=Re-recognition
|
||||||
mfile=File
|
mfile=File
|
||||||
medit=Eidt
|
medit=Edit
|
||||||
mview=View
|
mview=View
|
||||||
mhelp=Help
|
mhelp=Help
|
||||||
iconList=Icon List
|
iconList=Icon List
|
||||||
|
@ -87,6 +87,7 @@ creatPolygon=Create Quadrilateral
|
||||||
drawSquares=Draw Squares
|
drawSquares=Draw Squares
|
||||||
saveRec=Save Recognition Result
|
saveRec=Save Recognition Result
|
||||||
tempLabel=TEMPORARY
|
tempLabel=TEMPORARY
|
||||||
|
nullLabel=NULL
|
||||||
steps=Steps
|
steps=Steps
|
||||||
choseModelLg=Choose Model Language
|
choseModelLg=Choose Model Language
|
||||||
cancel=Cancel
|
cancel=Cancel
|
||||||
|
|
Loading…
Reference in New Issue