Commit dcd23225 authored by limingzhe's avatar limingzhe

fix: debug

parent ba43b643
No preview for this file type
{"ver":"1.1.2","uuid":"e9f579c0-59b7-4567-93ad-5b17f799e827","isBundle":false,"bundleName":"","priority":1,"compressionType":{},"optimizeHotUpdate":{},"inlineSpriteFrames":{},"isRemoteBundle":{"ios":false,"android":false},"subMetas":{}}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "e9f579c0-59b7-4567-93ad-5b17f799e827",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {
"ios": false,
"android": false
},
"subMetas": {}
}
\ No newline at end of file
......@@ -950,7 +950,7 @@ cc.Class({
const layer = new cc.Node();
layer.x = -this.canvas.width / 2 + 10;
layer.y = this.canvas.height / 2 - 10;
layer.active = false;
// layer.active = false;
const sample = getSprNode('sample');
sample.anchorX = 0;
......@@ -1808,6 +1808,12 @@ cc.Class({
console.log('! cantouch')
return;
}
this.changeWriteDataToBboxData(data.result)
console.log("data.result: ", data.result);
// const result = data.result;
// for (let i=0; i<result.length; i++) {
// result[i].top *= 400;
......@@ -2592,7 +2598,6 @@ cc.Class({
getAnswerDataNew(data, isSmall) {
let letter = this.data.letter || 'a';
let checkLetter, dotArr;
......@@ -2606,9 +2611,6 @@ cc.Class({
const answerData = {};
const resultTextArr = data.result.text;
......@@ -2624,9 +2626,7 @@ cc.Class({
colorRect.data = wordData;
this.sample.addChild(colorRect);
this.setOneAnswerDataNew(colorRect, dotArr, answerData);
}
......@@ -2779,6 +2779,44 @@ cc.Class({
},
changeWriteDataToBboxData(result) {
const curTextArr = result.text;
const bboxTextArr = [];
for (let i=0; i<curTextArr.length; i++) {
const score = curTextArr[i].content;
const {left, right, top, bottom, text} = curTextArr[i];
console.log('text..', JSON.stringify( curTextArr[i] ));
console.log('text..', text);
const disW = (right - left) / text.length;
const disH = (bottom - top);
for (let j=0; j<text.length; j++) {
const x1 = left + j * disW;
const y1 = top;
const x2 = x1 + disW;
const y2 = y1;
const x3 = x2;
const y3 = y2 + disH;
const x4 = x1;
const y4 = y3;
const bbox = [{x1, y1}, {x2, y2}, {x3, y3}, {x4, y4}]
const content = text[j];
bboxTextArr.push({bbox, content, score});
}
}
result.text = bboxTextArr;
},
setTestLabel(labelData) {
if (!this.debugLayer.parent || !this.debugLayer.active) {
......@@ -3129,6 +3167,9 @@ cc.Class({
getPhotoData(cb) {
const tmpData1 = {"result":{"text":[{"left":0,"right":0.33299797773361206,"top":0.0971250981092453,"bottom":0.12354312092065811,"content":1,"text":"race,write,and say."},{"left":0.14084507524967194,"right":0.9476861357688904,"top":0.13131313025951385,"bottom":0.21445220708847046,"content":0.9066159129142761,"text":"AAAA-A-AA"},{"left":0.28470826148986816,"right":0.9315895438194275,"top":0.2735042870044708,"bottom":0.32867133617401123,"content":0.9610617756843567,"text":"aaaq qa"},{"left":0.03018108569085598,"right":0.6438632011413574,"top":0.37995338439941406,"bottom":0.41025641560554504,"content":1,"text":"Listen. Then write Aa or cross it out. o5"},{"left":0.636820912361145,"right":0.7655935883522034,"top":0.4755244851112366,"bottom":0.5314685106277466,"content":0.8729087710380554,"text":"Aa"},{"left":0.10663983970880508,"right":0.11167001724243164,"top":0.5788655877113342,"bottom":0.6021755933761597,"content":0.7464486360549927,"text":"4"},{"left":0.1589537262916565,"right":0.29074445366859436,"top":0.5936285853385925,"bottom":0.6596736311912537,"content":0.8887001872062683,"text":"Aa"},{"left":0.6549295783042908,"right":0.7786720395088196,"top":0.5920745730400085,"bottom":0.6643356680870056,"content":0.9307805895805359,"text":"Aa"},{"left":0.11267605423927307,"right":0.4034205377101898,"top":0.7700077891349792,"bottom":0.807303786277771,"content":1,"text":"Lusten and chant, bd"},{"left":0.28973841667175293,"right":0.7162978053092957,"top":0.9254079461097717,"bottom":0.9712509512901306,"content":0.9342746138572693,"text":"户藤미 Ow"},{"left":0.8158953785896301,"right":0.7203219532966614,"top":0.9611499905586243,"bottom":0.9370629191398621,"content":0.7845855951309204,"text":"0章"}]}}
cb(tmpData1);
return;
const tmpData =
{
"code":200000,
......
......@@ -1365,37 +1365,37 @@
}
},
"@fortawesome/angular-fontawesome": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.6.1.tgz",
"integrity": "sha512-ARQjtRuT+ZskzJDJKPwuiGO3+7nS0iyNLU/uHVJHfG4LwGJxwVIGldwg1SU957sra0Z0OtWEajHMhiS4vB9LwQ=="
"version": "0.6.0",
"resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.6.0.tgz",
"integrity": "sha512-FcWwnEAshaLI8o1b08935OuXo8K3jSUInDDtkRwO+GtZy3VspOujpiOjxDU/gw6hNUEGsFDppqnRl2Prh6OWBw=="
},
"@fortawesome/fontawesome-common-types": {
"version": "0.2.30",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.30.tgz",
"integrity": "sha512-TsRwpTuKwFNiPhk1UfKgw7zNPeV5RhNp2Uw3pws+9gDAkPGKrtjR1y2lI3SYn7+YzyfuNknflpBA1LRKjt7hMg=="
"version": "0.2.36",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz",
"integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="
},
"@fortawesome/fontawesome-svg-core": {
"version": "1.2.30",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.30.tgz",
"integrity": "sha512-E3sAXATKCSVnT17HYmZjjbcmwihrNOCkoU7dVMlasrcwiJAHxSKeZ+4WN5O+ElgO/FaYgJmASl8p9N7/B/RttA==",
"version": "1.2.27",
"resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz",
"integrity": "sha512-sOD3DKynocnHYpuw2sLPnTunDj7rLk91LYhi2axUYwuGe9cPCw7Bsu9EWtVdNJP+IYgTCZIbyARKXuy5K/nv+Q==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.2.30"
"@fortawesome/fontawesome-common-types": "^0.2.27"
}
},
"@fortawesome/free-regular-svg-icons": {
"version": "5.14.0",
"resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.14.0.tgz",
"integrity": "sha512-6LCFvjGSMPoUQbn3NVlgiG4CY5iIY8fOm+to/D6QS/GvdqhDt+xZklQeERdCvVRbnFa1ITc1rJHPRXqkX5wztQ==",
"version": "5.12.1",
"resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.12.1.tgz",
"integrity": "sha512-bGda18seHXb+24K6DPUFzqn4kG7B+JViP/BscMcNUXvT00M86xNhdgP2TXSdflQXn53QWqymKjx/8rhaDOJyhA==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.2.30"
"@fortawesome/fontawesome-common-types": "^0.2.27"
}
},
"@fortawesome/free-solid-svg-icons": {
"version": "5.14.0",
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.14.0.tgz",
"integrity": "sha512-M933RDM8cecaKMWDSk3FRYdnzWGW7kBBlGNGfvqLVwcwhUPNj9gcw+xZMrqBdRqxnSXdl3zWzTCNNGEtFUq67Q==",
"version": "5.12.1",
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz",
"integrity": "sha512-k3MwRFFUhyL4cuCJSaHDA0YNYMELDXX0h8JKtWYxO5XD3Dn+maXOMrVAAiNGooUyM2v/wz/TOaM0jxYVKeXX7g==",
"requires": {
"@fortawesome/fontawesome-common-types": "^0.2.30"
"@fortawesome/fontawesome-common-types": "^0.2.27"
}
},
"@istanbuljs/schema": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment