idealeap
/
EMC
Not watched
1
0
Fork 0
Code
Releases 0 Wiki evaluate Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain HPC
Browse Source

fix: some err

main
少轻狂 2 years ago
parent
d47c833b70
commit
0fc1b5a238
No known key found for this signature in database GPG Key ID: 80E176093D33A9AB
6 changed files with 100 additions and 103 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      .gitignore
  2. +25
    -26
      app/api/annotation_data/data.json
  3. +68
    -68
      app/api/annotation_data/dataset.json
  4. +0
    -2
      app/api/api.py
  5. +0
    -1
      app/main.py
  6. +5
    -5
      src/pages/Personalization/annotations.vue

+ 2
- 1
.gitignore View File

@@ -12,4 +12,5 @@ __pycache__
.vscode .vscode
*.mjs *.mjs
build build
primary_img
primary_img
annotation_data

+ 25
- 26
app/api/annotation_data/data.json View File

@@ -41,6 +41,30 @@
], ],
"category_id": 2, "category_id": 2,
"ignore": 0 "ignore": 0
},
{
"area": 15960,
"iscrowd": 0,
"bbox": [
428,
93,
152,
105
],
"category_id": 3,
"ignore": 0
},
{
"area": 75210,
"iscrowd": 0,
"bbox": [
283,
203,
345,
218
],
"category_id": 3,
"ignore": 0
} }
] ]
}, },
@@ -704,31 +728,6 @@
"height": 320, "height": 320,
"width": 320 "width": 320
}, },
"annotation": [
{
"area": 1420,
"iscrowd": 0,
"bbox": [
177,
139,
71,
20
],
"category_id": 1,
"ignore": 0
},
{
"area": 1564,
"iscrowd": 0,
"bbox": [
57,
141,
68,
23
],
"category_id": 3,
"ignore": 0
}
]
"annotation": []
} }
} }

+ 68
- 68
app/api/annotation_data/dataset.json View File

@@ -165,6 +165,34 @@
"image_id": 0, "image_id": 0,
"id": 2 "id": 2
}, },
{
"area": 15960,
"iscrowd": 0,
"bbox": [
428,
93,
152,
105
],
"category_id": 3,
"ignore": 0,
"image_id": 0,
"id": 3
},
{
"area": 75210,
"iscrowd": 0,
"bbox": [
283,
203,
345,
218
],
"category_id": 3,
"ignore": 0,
"image_id": 0,
"id": 4
},
{ {
"area": 680, "area": 680,
"iscrowd": 0, "iscrowd": 0,
@@ -177,7 +205,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 1, "image_id": 1,
"id": 3
"id": 5
}, },
{ {
"area": 728, "area": 728,
@@ -191,7 +219,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 1, "image_id": 1,
"id": 4
"id": 6
}, },
{ {
"area": 2093, "area": 2093,
@@ -205,7 +233,7 @@
"category_id": 2, "category_id": 2,
"ignore": 0, "ignore": 0,
"image_id": 1, "image_id": 1,
"id": 5
"id": 7
}, },
{ {
"area": 3366, "area": 3366,
@@ -219,7 +247,7 @@
"category_id": 2, "category_id": 2,
"ignore": 0, "ignore": 0,
"image_id": 2, "image_id": 2,
"id": 6
"id": 8
}, },
{ {
"area": 1276, "area": 1276,
@@ -233,7 +261,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 2, "image_id": 2,
"id": 7
"id": 9
}, },
{ {
"area": 1224, "area": 1224,
@@ -247,7 +275,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 2, "image_id": 2,
"id": 8
"id": 10
}, },
{ {
"area": 833, "area": 833,
@@ -261,7 +289,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 3, "image_id": 3,
"id": 9
"id": 11
}, },
{ {
"area": 1701, "area": 1701,
@@ -275,7 +303,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 3, "image_id": 3,
"id": 10
"id": 12
}, },
{ {
"area": 3400, "area": 3400,
@@ -289,7 +317,7 @@
"category_id": 2, "category_id": 2,
"ignore": 0, "ignore": 0,
"image_id": 3, "image_id": 3,
"id": 11
"id": 13
}, },
{ {
"area": 1320, "area": 1320,
@@ -303,7 +331,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 4, "image_id": 4,
"id": 12
"id": 14
}, },
{ {
"area": 1071, "area": 1071,
@@ -317,7 +345,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 4, "image_id": 4,
"id": 13
"id": 15
}, },
{ {
"area": 5292, "area": 5292,
@@ -331,7 +359,7 @@
"category_id": 4, "category_id": 4,
"ignore": 0, "ignore": 0,
"image_id": 4, "image_id": 4,
"id": 14
"id": 16
}, },
{ {
"area": 1080, "area": 1080,
@@ -345,7 +373,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 5, "image_id": 5,
"id": 15
"id": 17
}, },
{ {
"area": 1292, "area": 1292,
@@ -359,7 +387,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 5, "image_id": 5,
"id": 16
"id": 18
}, },
{ {
"area": 4176, "area": 4176,
@@ -373,7 +401,7 @@
"category_id": 4, "category_id": 4,
"ignore": 0, "ignore": 0,
"image_id": 5, "image_id": 5,
"id": 17
"id": 19
}, },
{ {
"area": 1920, "area": 1920,
@@ -387,7 +415,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 6, "image_id": 6,
"id": 18
"id": 20
}, },
{ {
"area": 1680, "area": 1680,
@@ -401,7 +429,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 6, "image_id": 6,
"id": 19
"id": 21
}, },
{ {
"area": 1196, "area": 1196,
@@ -415,7 +443,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 7, "image_id": 7,
"id": 20
"id": 22
}, },
{ {
"area": 1323, "area": 1323,
@@ -429,7 +457,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 7, "image_id": 7,
"id": 21
"id": 23
}, },
{ {
"area": 1197, "area": 1197,
@@ -443,7 +471,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 8, "image_id": 8,
"id": 22
"id": 24
}, },
{ {
"area": 1008, "area": 1008,
@@ -457,7 +485,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 8, "image_id": 8,
"id": 23
"id": 25
}, },
{ {
"area": 1625, "area": 1625,
@@ -471,7 +499,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 9, "image_id": 9,
"id": 24
"id": 26
}, },
{ {
"area": 1276, "area": 1276,
@@ -485,7 +513,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 9, "image_id": 9,
"id": 25
"id": 27
}, },
{ {
"area": 1518, "area": 1518,
@@ -499,7 +527,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 10, "image_id": 10,
"id": 26
"id": 28
}, },
{ {
"area": 1083, "area": 1083,
@@ -513,7 +541,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 10, "image_id": 10,
"id": 27
"id": 29
}, },
{ {
"area": 1584, "area": 1584,
@@ -527,7 +555,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 11, "image_id": 11,
"id": 28
"id": 30
}, },
{ {
"area": 2240, "area": 2240,
@@ -541,7 +569,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 11, "image_id": 11,
"id": 29
"id": 31
}, },
{ {
"area": 2025, "area": 2025,
@@ -555,7 +583,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 12, "image_id": 12,
"id": 30
"id": 32
}, },
{ {
"area": 2106, "area": 2106,
@@ -569,7 +597,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 12, "image_id": 12,
"id": 31
"id": 33
}, },
{ {
"area": 1924, "area": 1924,
@@ -583,7 +611,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 13, "image_id": 13,
"id": 32
"id": 34
}, },
{ {
"area": 1500, "area": 1500,
@@ -597,7 +625,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 13, "image_id": 13,
"id": 33
"id": 35
}, },
{ {
"area": 3080, "area": 3080,
@@ -611,7 +639,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 14, "image_id": 14,
"id": 34
"id": 36
}, },
{ {
"area": 2184, "area": 2184,
@@ -625,7 +653,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 14, "image_id": 14,
"id": 35
"id": 37
}, },
{ {
"area": 1680, "area": 1680,
@@ -639,7 +667,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 15, "image_id": 15,
"id": 36
"id": 38
}, },
{ {
"area": 1620, "area": 1620,
@@ -653,7 +681,7 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 15, "image_id": 15,
"id": 37
"id": 39
}, },
{ {
"area": 1700, "area": 1700,
@@ -667,7 +695,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 16, "image_id": 16,
"id": 38
"id": 40
}, },
{ {
"area": 1536, "area": 1536,
@@ -681,7 +709,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 16, "image_id": 16,
"id": 39
"id": 41
}, },
{ {
"area": 2490, "area": 2490,
@@ -695,7 +723,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 17, "image_id": 17,
"id": 40
"id": 42
}, },
{ {
"area": 1702, "area": 1702,
@@ -709,7 +737,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 17, "image_id": 17,
"id": 41
"id": 43
}, },
{ {
"area": 1235, "area": 1235,
@@ -723,7 +751,7 @@
"category_id": 3, "category_id": 3,
"ignore": 0, "ignore": 0,
"image_id": 18, "image_id": 18,
"id": 42
"id": 44
}, },
{ {
"area": 1386, "area": 1386,
@@ -737,34 +765,6 @@
"category_id": 1, "category_id": 1,
"ignore": 0, "ignore": 0,
"image_id": 18, "image_id": 18,
"id": 43
},
{
"area": 1420,
"iscrowd": 0,
"bbox": [
177,
139,
71,
20
],
"category_id": 1,
"ignore": 0,
"image_id": 19,
"id": 44
},
{
"area": 1564,
"iscrowd": 0,
"bbox": [
57,
141,
68,
23
],
"category_id": 3,
"ignore": 0,
"image_id": 19,
"id": 45 "id": 45
} }
], ],


+ 0
- 2
app/api/api.py View File

@@ -89,7 +89,6 @@ def getModelSetting(args):
args["ModelSetting"][0]["status"] = model_dict args["ModelSetting"][0]["status"] = model_dict
return args return args
def checkAction(queue,type,action,tip): def checkAction(queue,type,action,tip):
print(type,action,queue[2]["time"]-queue[0]["time"])
# 输入一个长度为3的队列，根据情况判断是否执行动作 # 输入一个长度为3的队列，根据情况判断是否执行动作
if(queue[0]["status"]==0 and queue[1]["status"]==1 and queue[2]["status"]==0 and type=="张开持续1S" and (queue[2]["time"]-queue[0]["time"])>1): if(queue[0]["status"]==0 and queue[1]["status"]==1 and queue[2]["status"]==0 and type=="张开持续1S" and (queue[2]["time"]-queue[0]["time"])>1):
if(action=="悬停鼠标"): if(action=="悬停鼠标"):
@@ -187,7 +186,6 @@ class API:
self.queue.clear()#执行动作则清空队列 self.queue.clear()#执行动作则清空队列
else: else:
self.queue[-1]["time"]=time.time() self.queue[-1]["time"]=time.time()
print(self.queue)




def getPrimaryImg(self,type="不裁剪"): def getPrimaryImg(self,type="不裁剪"):


+ 0
- 1
app/main.py View File

@@ -37,7 +37,6 @@ def WebViewApp(port,dev=False):
timer.start() # 启动定时器 timer.start() # 启动定时器
def exitProgram(): def exitProgram():
icon.stop() icon.stop()
print("exitProgram")
global timer global timer
timer.cancel() timer.cancel()
def action(): def action():


+ 5
- 5
src/pages/Personalization/annotations.vue View File

@@ -138,7 +138,7 @@ const getEditImg = async (num = 0) => {
if (expertData.annotationData[saveData.image.file_name]) { if (expertData.annotationData[saveData.image.file_name]) {
saveData.annotation = expertData.annotationData[ saveData.annotation = expertData.annotationData[
saveData.image.file_name saveData.image.file_name
].annotation
].annotation// 这里有浅拷贝问题，但是没关系
saveData.annotation.forEach((item) => { saveData.annotation.forEach((item) => {
// 更换画笔颜色 // 更换画笔颜色
DrawCtx.fillStyle = categories[item.category_id - 1].color DrawCtx.fillStyle = categories[item.category_id - 1].color
@@ -412,14 +412,14 @@ onMounted(async () => {
<div class="flex-col items-end"> <div class="flex-col items-end">
<div class="btn-group"> <div class="btn-group">
<button class="btn hover:btn-primary" @click="expertAllData()"> <button class="btn hover:btn-primary" @click="expertAllData()">
<router-link class="flex items-center">
<div class="flex items-center">
<div i-mingcute-cloud-line />云端训练 <div i-mingcute-cloud-line />云端训练
</router-link>
</div>
</button> </button>
<button class="btn hover:btn-primary" @click="expertAllData()"> <button class="btn hover:btn-primary" @click="expertAllData()">
<router-link class="flex items-center">
<div class="flex items-center">
<div i-mingcute-computer-line />本地训练 <div i-mingcute-computer-line />本地训练
</router-link>
</div>
</button> </button>
</div> </div>
</div> </div>


Write Preview
Loading…
Cancel
Save