From a9ae17b0b3de9bcadce8f1b0692c4c61756830c7 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 15:38:41 +0800 Subject: [PATCH 1/4] test the name --- public/self/js/Director/detection.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index 8b63ef854..6231a720d 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -712,6 +712,7 @@ function loadimg(){ reset_var(); var picturePath = labeltastresult[fileindex].pic_image_field; img.src = ip + "/getgiteaimage?filename=" + picturePath; + console.log("picturePath",picturePath) var html = picturePath.substring(picturePath.lastIndexOf("/") + 1) + "  "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" document.getElementById("float_text").innerHTML = html; } From 6248ce16f21105fa2e03a0394117594d0b789bdc Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 15:44:44 +0800 Subject: [PATCH 2/4] test the name --- public/self/js/Director/detection.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index 6231a720d..5bd98d1c2 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -713,7 +713,16 @@ function loadimg(){ var picturePath = labeltastresult[fileindex].pic_image_field; img.src = ip + "/getgiteaimage?filename=" + picturePath; console.log("picturePath",picturePath) - var html = picturePath.substring(picturePath.lastIndexOf("/") + 1) + "  "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" + var picIndex = picturePath.indexOf("/",70); + + if(picIndex != -1){ + float_text_name = picturePath.substring(picIndex + 1); + float_text_name = float_text_name.substring(float_text_name.indexOf('/')+1); + }else{ + float_text_name = picturePath.substring(picturePath.lastIndexOf("/") + 1) + } + console.log("float_text_name",float_text_name) + var html = float_text_name + "  "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" document.getElementById("float_text").innerHTML = html; } function save(){ From 1d38b8a8acc3638acf7835e4e1f465920a62dc35 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 15:51:35 +0800 Subject: [PATCH 3/4] fix #437 --- public/self/js/Director/detection.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index 5bd98d1c2..b165e0ddc 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -712,7 +712,7 @@ function loadimg(){ reset_var(); var picturePath = labeltastresult[fileindex].pic_image_field; img.src = ip + "/getgiteaimage?filename=" + picturePath; - console.log("picturePath",picturePath) + var picIndex = picturePath.indexOf("/",70); if(picIndex != -1){ @@ -721,8 +721,8 @@ function loadimg(){ }else{ float_text_name = picturePath.substring(picturePath.lastIndexOf("/") + 1) } - console.log("float_text_name",float_text_name) - var html = float_text_name + "  "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" + + var html = float_text_name + "    "+ "(" + (tablePageData.current * pageSize + fileindex + 1) + "/" + tablePageData.total + ")" document.getElementById("float_text").innerHTML = html; } function save(){ From b2b217fa098704c895dc76a859c8ecdcb5b170d5 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 23 Sep 2021 16:08:12 +0800 Subject: [PATCH 4/4] test canvas size --- public/self/js/Director/detection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/self/js/Director/detection.js b/public/self/js/Director/detection.js index b165e0ddc..c822d7515 100644 --- a/public/self/js/Director/detection.js +++ b/public/self/js/Director/detection.js @@ -2853,8 +2853,8 @@ function isJSON(str) { img.onload = function(){ loadFinished = false; // 初始设置画布大小，最大值宽和高 - canvas.width = maxWidth;//document.getElementById("tool0").offsetWidth; - canvas.height = maxHeight;//document.getElementById("tool0").offsetWidth/1280*720; + canvas.width = img.width;// maxWidth document.getElementById("tool0").offsetWidth; + canvas.height =img.height;//maxHeight document.getElementById("tool0").offsetWidth/1280*720; //调整画布大小 if ((img.width/img.height)<(canvas.width/canvas.height)){ canvas.width=canvas.height * img.width / img.height;