Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DA-Platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
文档服务地址:
http://47.92.0.57:3000/
周报索引地址:
http://47.92.0.57:3000/s/NruNXRYmV
Open sidebar
Berlin
DA-Platform
Commits
4aaf22f8
Commit
4aaf22f8
authored
Jul 16, 2020
by
张欣玥
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
image解决了放大缩小的一些bug
parent
196f3b59
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
67 additions
and
51 deletions
+67
-51
imageAnnotiation.vue
...front/src/components/imageAnnotation/imageAnnotiation.vue
+67
-51
No files found.
DAPlatform-front/src/components/imageAnnotation/imageAnnotiation.vue
View file @
4aaf22f8
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
user-select: none;
user-select: none;
display: flex;
display: flex;
justify-content:flex-start;
justify-content:flex-start;
overflow: auto"
overflow: auto
;
"
id = "center_pic">
id = "center_pic">
<!--
<div
style=
"zoom: 2;text-align:center;user-select: none"
id =
"center_pic"
>
-->
<!--
<div
style=
"zoom: 2;text-align:center;user-select: none"
id =
"center_pic"
>
-->
<!--
<img
src=
"https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png"
style=
"pointer-events: none"
>
-->
<!--
<img
src=
"https://juanmdbucket.oss-cn-beijing.aliyuncs.com/20200301231737.png"
style=
"pointer-events: none"
>
-->
...
@@ -178,7 +178,7 @@ export default {
...
@@ -178,7 +178,7 @@ export default {
}
}
},
},
async
mounted
()
{
async
mounted
()
{
//获取图片列表并转换格式
//
获取图片列表并转换格式
let
imageList
=
await
this
.
getLabelList
()
let
imageList
=
await
this
.
getLabelList
()
console
.
log
(
imageList
)
console
.
log
(
imageList
)
this
.
imageList
=
imageList
.
imageList
this
.
imageList
=
imageList
.
imageList
...
@@ -319,11 +319,23 @@ export default {
...
@@ -319,11 +319,23 @@ export default {
_this
.
ctx
.
fill
()
_this
.
ctx
.
fill
()
})
})
},
},
mathAdd
(
a
,
b
)
{
return
this
.
$math
.
add
(
this
.
$math
.
bignumber
(
a
),
this
.
$math
.
bignumber
(
b
))
},
mathSub
(
a
,
b
)
{
return
this
.
$math
.
subtract
(
this
.
$math
.
bignumber
(
a
),
this
.
$math
.
bignumber
(
b
))
},
mathMul
(
a
,
b
)
{
return
this
.
$math
.
multiply
(
this
.
$math
.
bignumber
(
a
),
this
.
$math
.
bignumber
(
b
))
},
mathDiv
(
a
,
b
)
{
return
this
.
$math
.
divide
(
this
.
$math
.
bignumber
(
a
),
this
.
$math
.
bignumber
(
b
))
},
goBigger
()
{
goBigger
()
{
var
scale
=
this
.
scaleSize
var
scale
=
this
.
scaleSize
if
(
scale
<
2
)
{
if
(
scale
<
2
)
{
// this.scaleSize = scale + 0.1
// this.scaleSize = scale + 0.1
this
.
scaleSize
=
this
.
$math
.
add
(
this
.
$math
.
bignumber
(
scale
),
this
.
$math
.
bignumber
(
0.1
)
)
this
.
scaleSize
=
this
.
mathAdd
(
scale
,
0.1
)
}
else
{
}
else
{
this
.
scaleSize
=
2
this
.
scaleSize
=
2
}
}
...
@@ -337,7 +349,7 @@ export default {
...
@@ -337,7 +349,7 @@ export default {
goSmaller
()
{
goSmaller
()
{
var
scale
=
this
.
scaleSize
var
scale
=
this
.
scaleSize
if
(
scale
>
0.5
)
{
if
(
scale
>
0.5
)
{
this
.
scaleSize
=
this
.
$math
.
subtract
(
this
.
$math
.
bignumber
(
scale
),
this
.
$math
.
bignumber
(
0.1
)
)
this
.
scaleSize
=
this
.
mathSub
(
scale
,
0.1
)
}
else
{
}
else
{
this
.
scaleSize
=
0.5
this
.
scaleSize
=
0.5
}
}
...
@@ -474,15 +486,14 @@ export default {
...
@@ -474,15 +486,14 @@ export default {
this
.
labelName
=
children
[
index
].
labelName
this
.
labelName
=
children
[
index
].
labelName
this
.
labelPosition
=
''
this
.
labelPosition
=
''
var
lenTmp
=
tmp
[
index
].
length
/
2
;
var
lenTmp
=
tmp
[
index
].
length
/
2
var
i
=
0
;
var
i
=
0
for
(
i
=
0
;
i
<
lenTmp
;
i
++
)
{
for
(
i
=
0
;
i
<
lenTmp
;
i
++
)
{
this
.
labelPosition
+=
'坐标'
+
(
i
+
1
)
+
': ('
this
.
labelPosition
+=
'坐标'
+
(
i
+
1
)
+
': ('
this
.
labelPosition
+=
tmp
[
index
][
2
*
i
]
this
.
labelPosition
+=
tmp
[
index
][
2
*
i
]
this
.
labelPosition
+=
','
this
.
labelPosition
+=
','
this
.
labelPosition
+=
tmp
[
index
][
2
*
i
+
1
]
this
.
labelPosition
+=
tmp
[
index
][
2
*
i
+
1
]
this
.
labelPosition
+=
')
\
n'
this
.
labelPosition
+=
')
\
n'
}
}
...
@@ -701,15 +712,13 @@ export default {
...
@@ -701,15 +712,13 @@ export default {
}
}
},
},
async
getLabelList
()
{
async
getLabelList
()
{
/**
/**
* 这是一个大致的格式转换
* 这是一个大致的格式转换
// */
// */
try
{
try
{
this
.
data
=
[]
this
.
data
=
[]
let
params
=
{
let
params
=
{
"relationList"
:
[
'relationList'
:
[
123
,
123
,
11
11
]
]
...
@@ -727,12 +736,10 @@ export default {
...
@@ -727,12 +736,10 @@ export default {
// self.$store.commit('setImageData', imageList.imageList)
// self.$store.commit('setImageData', imageList.imageList)
console
.
log
(
imageList
)
console
.
log
(
imageList
)
return
imageList
return
imageList
}
}
else
{
else
{
// self.$store.commit('clearImageData')
// self.$store.commit('clearImageData')
alert
(
'请求出错!'
)
alert
(
'请求出错!'
)
}
}
}
catch
(
err
)
{
}
catch
(
err
)
{
// self.$store.commit('clearImageData')
// self.$store.commit('clearImageData')
console
.
log
(
err
)
console
.
log
(
err
)
...
@@ -762,8 +769,7 @@ export default {
...
@@ -762,8 +769,7 @@ export default {
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
cancelButtonText
:
'取消'
}).
then
(({
value
})
=>
{
}).
then
(({
value
})
=>
{
if
(
value
==
null
)
if
(
value
==
null
)
{
value
=
'iss'
}
value
=
'iss'
labelName
=
value
labelName
=
value
this
.
makeLabel
(
labelName
)
this
.
makeLabel
(
labelName
)
}).
catch
(()
=>
{
}).
catch
(()
=>
{
...
@@ -771,23 +777,23 @@ export default {
...
@@ -771,23 +777,23 @@ export default {
this
.
makeLabel
(
labelName
)
this
.
makeLabel
(
labelName
)
})
})
},
},
//创建储存用的标签数据
//
创建储存用的标签数据
makeLabel
(
labelName
)
{
makeLabel
(
labelName
)
{
let
currentImageId
=
this
.
pictureId
let
currentImageId
=
this
.
pictureId
let
currentLabelId
=
this
.
data
[
currentImageId
].
children
.
length
let
currentLabelId
=
this
.
data
[
currentImageId
].
children
.
length
//以下部分创建PointList
//
以下部分创建PointList
var
tmpPointList
=
this
.
canvasAll
[
currentImageId
]
var
tmpPointList
=
this
.
canvasAll
[
currentImageId
]
var
lenTmp
=
tmpPointList
[
currentLabelId
].
length
/
2
var
lenTmp
=
tmpPointList
[
currentLabelId
].
length
/
2
let
pointList
=
[]
let
pointList
=
[]
for
(
var
i
=
0
;
i
<
lenTmp
;
i
++
)
{
for
(
var
i
=
0
;
i
<
lenTmp
;
i
++
)
{
let
tmp
=
{
let
tmp
=
{
pointId
:
i
,
pointId
:
i
,
X
:
tmpPointList
[
currentLabelId
][
2
*
i
],
X
:
tmpPointList
[
currentLabelId
][
2
*
i
],
Y
:
tmpPointList
[
currentLabelId
][
2
*
i
+
1
]
Y
:
tmpPointList
[
currentLabelId
][
2
*
i
+
1
]
}
}
pointList
.
push
(
tmp
)
pointList
.
push
(
tmp
)
}
}
//pointList完成
//
pointList完成
const
newLabel
=
{
const
newLabel
=
{
labelId
:
currentLabelId
,
labelId
:
currentLabelId
,
labelName
:
labelName
,
labelName
:
labelName
,
...
@@ -839,13 +845,13 @@ export default {
...
@@ -839,13 +845,13 @@ export default {
console
.
log
(
'onmousedown'
)
console
.
log
(
'onmousedown'
)
if
(
_this
.
radio1
==
'矩形标注'
)
{
if
(
_this
.
radio1
==
'矩形标注'
)
{
_this
.
canvas
.
style
.
cursor
=
'crosshair'
_this
.
canvas
.
style
.
cursor
=
'crosshair'
r1
=
e
.
layerX
r1
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
r2
=
e
.
layerY
r2
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
_this
.
createR
(
e
,
'begin'
,
r1
,
r2
)
_this
.
createR
(
e
,
'begin'
,
r1
,
r2
)
}
else
if
(
_this
.
radio1
==
'多边形标注'
)
{
}
else
if
(
_this
.
radio1
==
'多边形标注'
)
{
_this
.
canvas
.
style
.
cursor
=
'crosshair'
_this
.
canvas
.
style
.
cursor
=
'crosshair'
r1
=
e
.
layerX
r1
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
r2
=
e
.
layerY
r2
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
_this
.
createPTmp
.
push
(
r1
)
_this
.
createPTmp
.
push
(
r1
)
_this
.
createPTmp
.
push
(
r2
)
_this
.
createPTmp
.
push
(
r2
)
_this
.
createP
(
e
,
'begin'
,
r1
,
r2
)
_this
.
createP
(
e
,
'begin'
,
r1
,
r2
)
...
@@ -862,8 +868,8 @@ export default {
...
@@ -862,8 +868,8 @@ export default {
r2
=
null
r2
=
null
}
else
if
(
_this
.
radio1
==
'多边形标注'
)
{
}
else
if
(
_this
.
radio1
==
'多边形标注'
)
{
_this
.
canvas
.
style
.
cursor
=
'crosshair'
_this
.
canvas
.
style
.
cursor
=
'crosshair'
r1
=
e
.
layerX
r1
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
r2
=
e
.
layerY
r2
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
}
else
{
}
else
{
_this
.
canvas
.
style
.
cursor
=
'auto'
_this
.
canvas
.
style
.
cursor
=
'auto'
}
}
...
@@ -894,9 +900,8 @@ export default {
...
@@ -894,9 +900,8 @@ export default {
_this
.
canvas
.
onmousemove
=
function
(
e
)
{
_this
.
canvas
.
onmousemove
=
function
(
e
)
{
_this
.
ctx
.
clearRect
(
0
,
0
,
_this
.
canvas
.
width
,
_this
.
canvas
.
height
)
_this
.
ctx
.
clearRect
(
0
,
0
,
_this
.
canvas
.
width
,
_this
.
canvas
.
height
)
let
rx
=
e
.
layerX
-
r1
let
rx
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
-
r1
let
ry
=
e
.
layerY
-
r2
let
ry
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
-
r2
// console.log(r1 + ' ' + r2 + ' ' + rx + ' ' + ry)
// 把每个标注画出来
// 把每个标注画出来
_this
.
restoreCanvas
()
_this
.
restoreCanvas
()
...
@@ -921,21 +926,28 @@ export default {
...
@@ -921,21 +926,28 @@ export default {
}
}
_this
.
ctx
.
clearRect
(
0
,
0
,
_this
.
canvas
.
width
,
_this
.
canvas
.
height
)
_this
.
ctx
.
clearRect
(
0
,
0
,
_this
.
canvas
.
width
,
_this
.
canvas
.
height
)
let
rx
=
e
.
layerX
-
r1
console
.
log
(
'X:'
+
e
.
layerX
+
'Y:'
+
e
.
layerY
)
let
ry
=
e
.
layerY
-
r2
console
.
log
(
'r1:'
+
r1
+
'r2:'
+
r2
)
let
layerX
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
let
layerY
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
let
rx
=
layerX
-
r1
let
ry
=
layerY
-
r2
// 排除点击就添加标签的可能
// 排除点击就添加标签的可能
if
((
rx
>=
1
||
rx
<=
-
1
)
&&
(
ry
>=
1
||
ry
<=
-
1
))
{
if
((
rx
>=
1
||
rx
<=
-
1
)
&&
(
ry
>=
1
||
ry
<=
-
1
))
{
_this
.
ctx
.
beginPath
()
_this
.
ctx
.
beginPath
()
_this
.
ctx
.
fillStyle
=
'rgba(51,135,255,0.54)'
_this
.
ctx
.
fillStyle
=
'rgba(51,135,255,0.54)'
_this
.
ctx
.
fillRect
(
r1
,
r2
,
rx
,
ry
)
_this
.
ctx
.
fillRect
(
r1
,
r2
,
rx
,
ry
)
console
.
log
(
r1
+
' '
+
r2
+
' '
+
rx
+
' '
+
ry
)
// _this.ctx.stroke()
// _this.ctx.stroke()
// 把每个标注画出来
// 把每个标注画出来
let
id
=
_this
.
pictureId
let
id
=
_this
.
pictureId
// 存到记录里
// 存到记录里
var
num
=
[
r1
,
r2
,
r1
+
rx
,
r2
,
r1
+
rx
,
r2
+
ry
,
r1
,
r2
+
ry
]
var
num
=
[
r1
,
r2
,
_this
.
mathAdd
(
r1
,
rx
),
r2
,
_this
.
mathAdd
(
r1
,
rx
),
_this
.
mathAdd
(
r2
,
ry
),
r1
,
_this
.
mathAdd
(
r2
,
ry
)]
console
.
log
(
'num'
)
console
.
log
(
num
)
_this
.
canvasAll
[
id
].
push
(
num
)
_this
.
canvasAll
[
id
].
push
(
num
)
_this
.
addLabel
()
_this
.
addLabel
()
...
@@ -958,11 +970,13 @@ export default {
...
@@ -958,11 +970,13 @@ export default {
// 把每个标注画出来
// 把每个标注画出来
_this
.
restoreCanvas
()
_this
.
restoreCanvas
()
// 第一条线
if
(
_this
.
createPTmp
.
length
==
2
)
{
if
(
_this
.
createPTmp
.
length
==
2
)
{
_this
.
ctx
.
beginPath
()
_this
.
ctx
.
beginPath
()
_this
.
ctx
.
moveTo
(
r1
,
r2
)
_this
.
ctx
.
moveTo
(
r1
,
r2
)
_this
.
ctx
.
lineTo
(
e
.
layerX
,
e
.
layerY
)
r1
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
r2
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
_this
.
ctx
.
lineTo
(
r1
,
r2
)
_this
.
ctx
.
closePath
()
_this
.
ctx
.
closePath
()
_this
.
ctx
.
strokeStyle
=
'black'
_this
.
ctx
.
strokeStyle
=
'black'
_this
.
ctx
.
stroke
()
_this
.
ctx
.
stroke
()
...
@@ -973,7 +987,9 @@ export default {
...
@@ -973,7 +987,9 @@ export default {
for
(
i
=
1
;
i
<
_this
.
createPTmp
.
length
/
2
;
i
++
)
{
for
(
i
=
1
;
i
<
_this
.
createPTmp
.
length
/
2
;
i
++
)
{
_this
.
ctx
.
lineTo
(
_this
.
createPTmp
[
2
*
i
],
_this
.
createPTmp
[
2
*
i
+
1
])
_this
.
ctx
.
lineTo
(
_this
.
createPTmp
[
2
*
i
],
_this
.
createPTmp
[
2
*
i
+
1
])
}
}
_this
.
ctx
.
lineTo
(
e
.
layerX
,
e
.
layerY
)
r1
=
_this
.
mathDiv
(
e
.
layerX
,
_this
.
scaleSize
)
r2
=
_this
.
mathDiv
(
e
.
layerY
,
_this
.
scaleSize
)
_this
.
ctx
.
lineTo
(
r1
,
r2
)
_this
.
ctx
.
closePath
()
_this
.
ctx
.
closePath
()
_this
.
ctx
.
strokeStyle
=
'black'
_this
.
ctx
.
strokeStyle
=
'black'
_this
.
ctx
.
stroke
()
_this
.
ctx
.
stroke
()
...
@@ -997,7 +1013,7 @@ export default {
...
@@ -997,7 +1013,7 @@ export default {
outputData
.
push
(
newData
)
outputData
.
push
(
newData
)
})
})
console
.
log
(
"outputdata"
)
console
.
log
(
'outputdata'
)
console
.
log
(
outputData
)
console
.
log
(
outputData
)
this
.
imageNum
=
this
.
data
.
len
this
.
imageNum
=
this
.
data
.
len
this
.
axios
({
this
.
axios
({
...
@@ -1014,20 +1030,20 @@ export default {
...
@@ -1014,20 +1030,20 @@ export default {
callback
:
action
=>
{
callback
:
action
=>
{
this
.
$message
({
this
.
$message
({
type
:
'info'
,
type
:
'info'
,
message
:
`action:
${
action
}
`
message
:
`action:
${
action
}
`
})
;
})
}
}
})
;
})
}
else
{
}
else
{
this
.
$alert
(
'保存失败'
,
'保存失败'
,
{
this
.
$alert
(
'保存失败'
,
'保存失败'
,
{
confirmButtonText
:
'确定'
,
confirmButtonText
:
'确定'
,
callback
:
action
=>
{
callback
:
action
=>
{
this
.
$message
({
this
.
$message
({
type
:
'info'
,
type
:
'info'
,
message
:
`action:
${
action
}
`
message
:
`action:
${
action
}
`
})
;
})
}
}
})
;
})
}
}
}).
catch
(
err
=>
{
}).
catch
(
err
=>
{
this
.
$alert
(
'保存失败'
,
'保存失败'
,
{
this
.
$alert
(
'保存失败'
,
'保存失败'
,
{
...
@@ -1035,10 +1051,10 @@ export default {
...
@@ -1035,10 +1051,10 @@ export default {
callback
:
action
=>
{
callback
:
action
=>
{
this
.
$message
({
this
.
$message
({
type
:
'info'
,
type
:
'info'
,
message
:
`action:
${
action
}
`
message
:
`action:
${
action
}
`
})
;
})
}
}
})
;
})
})
})
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment