修Bug：操作取消未传递给调用方 (#402)

hiroi-sora · Mar 5, 2024 · dad6d0e · dad6d0e
1 parent 4adee15
commit dad6d0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/UmiOCR-data/py_src/tag_pages/ScreenshotOCR.py b/UmiOCR-data/py_src/tag_pages/ScreenshotOCR.py
@@ -22,6 +22,8 @@ def __init__(self, *args):
 
     # 对一个imgID进行OCR
     def ocrImgID(self, imgID, configDict):
+        if not imgID or not configDict:  # 截图取消
+            self.recentResult = {"code": 101, "data": ""}
         pixmap = PixmapProvider.getPixmap(imgID)
         if not pixmap:
             e = f'[Error] ScreenshotOCR: imgID "{imgID}" does not exist in the PixmapProvider dict.'

diff --git a/UmiOCR-data/qt_res/qml/TabPages/ScreenshotOCR/ScreenshotOCR.qml b/UmiOCR-data/qt_res/qml/TabPages/ScreenshotOCR/ScreenshotOCR.qml
@@ -30,7 +30,8 @@ TabPage {
     // 截图完毕
     function screenshotEnd(clipID) {
         popMainWindow()
-        if(!clipID) {
+        if(!clipID) { // 截图取消
+            tabPage.callPy("ocrImgID", undefined, undefined)
             return
         }
         const configDict = configsComp.getValueDict()
@@ -45,10 +46,12 @@ TabPage {
         const res = qmlapp.imageManager.getPaste()
         if(res.error) {
             qmlapp.popup.simple(qsTr("获取剪贴板异常"), res.error)
+            tabPage.callPy("ocrImgID", undefined, undefined)
             return
         }
         if(res.text) {
             qmlapp.popup.simple(qsTr("剪贴板中为文本"), res.text)
+            tabPage.callPy("ocrImgID", undefined, undefined)
             return
         }
         qmlapp.tab.showTabPageObj(tabPage) // 切换标签页