1、PPOCRLabel现在支持从中文路径导入图片，原本导入含中文路径的图片会导致崩溃。 (#11236)

2、PPOCRLabel现在支持移动被其他框覆盖的锚点，原本无法移动被覆盖的锚点。
3、修复utility.py中误输入字符导致的语法错误。
4、修复setValue()应输入int，实际输入float导致的类型错误。
5、修复paddleocr中未import predict_system的错误。
6、修复canvas.py中部分输入参数类型错误
7、修复了LabelList不兼容搜狗输入法或win11输入法的问题。原本使用搜狗输入法修改标注数据时，仅输入一个字母就会失去焦点并提交数据变更，导致无法输入完整的汉字。现在将处理逻辑改为失去焦点时仍不提交数据变更，直到切换item或按下enter键才提交。
8、新增扩大选框的功能

1、PPOCRLabel now supports importing images from Chinese paths, originally importing images containing Chinese paths would cause a crash.
2、PPOCRLabel now supports moving anchor points that are covered by other boxes, originally it could not move the covered anchor points.
3、Fix the syntax error caused by mistakenly inputting characters in utility.py.
4、Repair the type error caused by inputting int but float in setValue().
5、Repair the error of not import predict_system in paddleocr.
6、Fix some input parameter type errors in canvas.py.
7、LabelList can't use Sogou Input Method or Win11 Input Method to input text.
8、Add function of expand box.

Author: g39088902

PPOCRLabel.py

@@ -21,6 +21,8 @@
 import platform
 import subprocess
 import sys
+import traceback
+
 import xlrd
 from functools import partial
 
@@ -536,6 +538,8 @@ def __init__(self,
 
         lock = action(getStr("lockBox"), self.lockSelectedShape,
                       None, "lock", getStr("lockBoxDetail"), enabled=False)
+        expand = action(getStr("expandBox"), self.expandSelectedShape,
+                        "Ctrl+K", "expand", getStr("expandBoxDetail"), enabled=False)
 
         self.editButton.setDefaultAction(edit)
         self.newButton.setDefaultAction(create)
@@ -598,14 +602,14 @@ def __init__(self,
                               fitWindow=fitWindow, fitWidth=fitWidth,
                               zoomActions=zoomActions, saveLabel=saveLabel, change_cls=change_cls,
                               undo=undo, undoLastPoint=undoLastPoint, open_dataset_dir=open_dataset_dir,
-                              rotateLeft=rotateLeft, rotateRight=rotateRight, lock=lock, exportJSON=exportJSON,
+                              rotateLeft=rotateLeft, rotateRight=rotateRight, lock=lock, exportJSON=exportJSON,expand=expand,
                               fileMenuActions=(opendir, open_dataset_dir, saveLabel, exportJSON, resetAll, quit),
                               beginner=(), advanced=(),
                               editMenu=(createpoly, edit, copy, delete, singleRere, cellreRec, None, undo, undoLastPoint,
-                                        None, rotateLeft, rotateRight, None, color1, self.drawSquaresOption, lock,
+                                        None, rotateLeft, rotateRight, None, color1, self.drawSquaresOption, lock,expand,
                                         None, change_cls),
                               beginnerContext=(
-                                  create, createpoly, edit, copy, delete, singleRere, cellreRec, rotateLeft, rotateRight, lock, change_cls),
+                                  create, createpoly, edit, copy, delete, singleRere, cellreRec, rotateLeft, rotateRight, lock,expand,change_cls),
                               advancedContext=(createMode, editMode, edit, copy,
                                                delete, shapeLineColor, shapeFillColor),
                               onLoadActive=(create, createpoly, createMode, editMode),
@@ -1093,6 +1097,7 @@ def shapeSelectionChanged(self, selected_shapes):
         self.actions.edit.setEnabled(n_selected == 1)
         self.actions.lock.setEnabled(n_selected)
         self.actions.change_cls.setEnabled(n_selected)
+        self.actions.expand.setEnabled(n_selected)
 
     def addLabel(self, shape):
         shape.paintLabel = self.displayLabelOption.isChecked()
@@ -1259,8 +1264,8 @@ def copySelectedShape(self):
         # self.shapeSelectionChanged(True)
 
     def move_scrollbar(self, value):
-        self.labelListBar.setValue(value)
-        self.indexListBar.setValue(value)
+        self.labelListBar.setValue(int(value))
+        self.indexListBar.setValue(int(value))
 
     def labelSelectionChanged(self):
         if self._noSelectionSlot:
@@ -1405,9 +1410,9 @@ def _update_shape_color(self, shape):
         shape.line_color = QColor(r, g, b)
         shape.vertex_fill_color = QColor(r, g, b)
         shape.hvertex_fill_color = QColor(255, 255, 255)
-        shape.fill_color = QColor(r, g, b, 128)
+        shape.fill_color = QColor(r, g, b, 32)
         shape.select_line_color = QColor(255, 255, 255)
-        shape.select_fill_color = QColor(r, g, b, 155)
+        shape.select_fill_color = QColor(r, g, b, 32)
 
     def _get_rgb_by_label(self, label, kie_mode):
         shift_auto_shape_color = 2  # use for random color
@@ -1422,17 +1427,17 @@ def _get_rgb_by_label(self, label, kie_mode):
     def scrollRequest(self, delta, orientation):
         units = - delta / (8 * 15)
         bar = self.scrollBars[orientation]
-        bar.setValue(bar.value() + bar.singleStep() * units)
+        bar.setValue(int(bar.value() + bar.singleStep() * units))
 
     def setZoom(self, value):
         self.actions.fitWidth.setChecked(False)
         self.actions.fitWindow.setChecked(False)
         self.zoomMode = self.MANUAL_ZOOM
-        self.zoomWidget.setValue(value)
+        self.zoomWidget.setValue(int(value))
 
     def addZoom(self, increment=10):
-        self.setZoom(self.zoomWidget.value() + increment)
-        self.imageSlider.setValue(self.zoomWidget.value() + increment)  # set zoom slider value
+        self.setZoom(int(self.zoomWidget.value() + increment))
+        self.imageSlider.setValue(int(self.zoomWidget.value() + increment))  # set zoom slider value
 
     def zoomRequest(self, delta):
         # get the current scrollbar positions
@@ -1483,8 +1488,8 @@ def zoomRequest(self, delta):
         new_h_bar_value = h_bar.value() + move_x * d_h_bar_max
         new_v_bar_value = v_bar.value() + move_y * d_v_bar_max
 
-        h_bar.setValue(new_h_bar_value)
-        v_bar.setValue(new_v_bar_value)
+        h_bar.setValue(int(new_h_bar_value))
+        v_bar.setValue(int(new_v_bar_value))
 
     def setFitWindow(self, value=True):
         if value:
@@ -1957,10 +1962,11 @@ def deleteImg(self):
             deleteInfo = self.deleteImgDialog()
             if deleteInfo == QMessageBox.Yes:
                 if platform.system() == 'Windows':
-                    from win32com.shell import shell, shellcon
-                    shell.SHFileOperation((0, shellcon.FO_DELETE, deletePath, None,
-                                           shellcon.FOF_SILENT | shellcon.FOF_ALLOWUNDO | shellcon.FOF_NOCONFIRMATION,
-                                           None, None))
+                    # from win32com import shell, shellcon
+                    # shell.SHFileOperation((0, shellcon.FO_DELETE, deletePath, None,
+                    #                        shellcon.FOF_SILENT | shellcon.FOF_ALLOWUNDO | shellcon.FOF_NOCONFIRMATION,
+                    #                        None, None))
+                    os.remove(deletePath)
                     # linux
                 elif platform.system() == 'Linux':
                     cmd = 'trash ' + deletePath
@@ -2659,18 +2665,20 @@ def saveRecResult(self):
             for key in self.fileStatedict:
                 idx = self.getImglabelidx(key)
                 try:
-                    img = cv2.imread(key)
+                    img = cv2.imdecode(np.fromfile(key, dtype=np.uint8), -1)
                     for i, label in enumerate(self.PPlabel[idx]):
                         if label['difficult']:
                             continue
                         img_crop = get_rotate_crop_image(img, np.array(label['points'], np.float32))
                         img_name = os.path.splitext(os.path.basename(idx))[0] + '_crop_' + str(i) + '.jpg'
-                        cv2.imwrite(crop_img_dir + img_name, img_crop)
+                        cv2.imencode(".jpg",img_crop)[1].tofile(crop_img_dir + img_name)
                         f.write('crop_img/' + img_name + '\t')
                         f.write(label['transcription'] + '\n')
+                except KeyError as e:
+                    pass
                 except Exception as e:
                     ques_img.append(key)
-                    print("Can not read image ", e)
+                    traceback.print_exc()
         if ques_img:
             QMessageBox.information(self,
                                     "Information",
@@ -2780,6 +2788,23 @@ def format_shape(s):
             self.setDirty()
             self.actions.save.setEnabled(True)
 
+    def expandSelectedShape(self):
+        img = cv2.imdecode(np.fromfile(self.filePath, dtype=np.uint8), 1)
+        for shape in self.canvas.selectedShapes:
+            box = [[int(p.x()), int(p.y())] for p in shape.points]
+            if len(box) > 4:
+                box = self.gen_quad_from_poly(np.array(box))
+            assert len(box) == 4
+            box = boxPad(box, img.shape, 3)
+            shape.points = [QPointF(box[0][0], box[0][1]),
+                            QPointF(box[1][0], box[1][1]),
+                            QPointF(box[2][0], box[2][1]),
+                            QPointF(box[3][0], box[3][1])]
+            print(shape.points)
+            self.updateBoxlist()
+            self.setDirty()
+
+
 
 def inverted(color):
     return QColor(*[255 - v for v in color.getRgb()])

libs/canvas.py

@@ -232,22 +232,24 @@ def mouseMoveEvent(self, ev):
                 self.setStatusTip(self.toolTip())
                 self.update()
                 break
-            elif shape.containsPoint(pos):
-                if self.selectedVertex():
-                    self.hShape.highlightClear()
-                self.hVertex, self.hShape = None, shape
-                self.setToolTip(
-                    "Click & drag to move shape '%s'" % shape.label)
-                self.setStatusTip(self.toolTip())
-                self.overrideCursor(CURSOR_GRAB)
-                self.update()
-                break
-        else:  # Nothing found, clear highlights, reset state.
-            if self.hShape:
-                self.hShape.highlightClear()
-                self.update()
-            self.hVertex, self.hShape = None, None
-            self.overrideCursor(CURSOR_DEFAULT)
+            else:
+                for shape in reversed([s for s in self.shapes if self.isVisible(s)]):
+                    if shape.containsPoint(pos):
+                        if self.selectedVertex():
+                            self.hShape.highlightClear()
+                        self.hVertex, self.hShape = None, shape
+                        self.setToolTip(
+                            "Click & drag to move shape '%s'" % shape.label)
+                        self.setStatusTip(self.toolTip())
+                        self.overrideCursor(CURSOR_GRAB)
+                        self.update()
+                        break
+                else:  # Nothing found, clear highlights, reset state.
+                    if self.hShape:
+                        self.hShape.highlightClear()
+                        self.update()
+                    self.hVertex, self.hShape = None, None
+                    self.overrideCursor(CURSOR_DEFAULT)
 
     def mousePressEvent(self, ev):
         pos = self.transformPos(ev.pos())
@@ -593,7 +595,7 @@ def paintEvent(self, event):
             p.setPen(self.drawingRectColor)
             brush = QBrush(Qt.BDiagPattern)
             p.setBrush(brush)
-            p.drawRect(leftTop.x(), leftTop.y(), rectWidth, rectHeight)
+            p.drawRect(int(leftTop.x()), int(leftTop.y()), int(rectWidth), int(rectHeight))
 
 
         # ADD：
@@ -611,8 +613,8 @@ def paintEvent(self, event):
 
         if self.drawing() and not self.prevPoint.isNull() and not self.outOfPixmap(self.prevPoint):
             p.setPen(QColor(0, 0, 0))
-            p.drawLine(int(self.prevPoint.x()), 0, int(self.prevPoint.x()), self.pixmap.height())
-            p.drawLine(0, int(self.prevPoint.y()), self.pixmap.width(), int(self.prevPoint.y()))
+            p.drawLine(int(self.prevPoint.x()), 0, int(self.prevPoint.x()), int(self.pixmap.height()))
+            p.drawLine(0, int(self.prevPoint.y()), int(self.pixmap.width()), int(self.prevPoint.y()))
 
         self.setAutoFillBackground(True)
         if self.verified:

libs/editinlist.py

@@ -24,6 +24,10 @@ def mouseDoubleClickEvent(self, event):
         pass
 
     def leaveEvent(self, event):
+        pass
+
+    def keyPressEvent(self, event) -> None:
         # close edit
-        for i in range(self.count()):
-            self.closePersistentEditor(self.item(i))
+        if event.key() in [16777220, 16777221]:
+            for i in range(self.count()):
+                self.closePersistentEditor(self.item(i))

resources/strings/strings-en.properties

@@ -114,3 +114,5 @@ keyChange=Change Box Key
 TableRecognition=Table Recognition
 cellreRecognition=Cell Re-Recognition
 exportJSON=Export Table Label
+expandBox=Expand Box
+expandBoxDetail=Expand Box

resources/strings/strings-zh-CN.properties

@@ -113,4 +113,6 @@ keyDialogTip=请输入类型名称
 keyChange=更改Box关键字类别
 TableRecognition=表格识别
 cellreRecognition=单元格重识别
-exportJSON=导出表格标注
+exportJSON=导出表格标注
+expandBox=扩大框
+expandBoxDetail=扩大所选框