Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
疯人忠
Cvat
提交
a3026f48
C
Cvat
项目概览
疯人忠
/
Cvat
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
Cvat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a3026f48
编写于
12月 02, 2020
作者:
B
Boris Sekachev
提交者:
GitHub
12月 02, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2507 from openvinotoolkit/bs/fixed_grouping
Fixed grouping when press escape with drawn region or change a frame
上级
b2176452
26d9eba0
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
13 deletion
+17
-13
CHANGELOG.md
CHANGELOG.md
+1
-0
cvat-canvas/src/typescript/groupHandler.ts
cvat-canvas/src/typescript/groupHandler.ts
+14
-11
cvat-ui/package-lock.json
cvat-ui/package-lock.json
+1
-1
cvat-ui/package.json
cvat-ui/package.json
+1
-1
未找到文件。
CHANGELOG.md
浏览文件 @
a3026f48
...
...
@@ -41,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
-
Empty frames navigation (
<https://github.com/openvinotoolkit/cvat/pull/2505>
)
-
Disabled position editing in AAM (
<https://github.com/openvinotoolkit/cvat/pull/2506>
)
-
TypeError: Cannot read property 'toString' of undefined (
<https://github.com/openvinotoolkit/cvat/pull/2517>
)
-
Extra shapes are drawn after Esc, or G pressed while drawing a region in grouping (
<https://github.com/openvinotoolkit/cvat/pull/2507>
)
### Security
...
...
cvat-canvas/src/typescript/groupHandler.ts
浏览文件 @
a3026f48
...
...
@@ -35,11 +35,11 @@ export class GroupHandlerImpl implements GroupHandler {
private
getSelectionBox
(
event
:
MouseEvent
,
):
{
xtl
:
number
;
ytl
:
number
;
xbr
:
number
;
ybr
:
number
;
}
{
xtl
:
number
;
ytl
:
number
;
xbr
:
number
;
ybr
:
number
;
}
{
const
point
=
translateToSVG
((
this
.
canvas
.
node
as
any
)
as
SVGSVGElement
,
[
event
.
clientX
,
event
.
clientY
]);
const
stopSelectionPoint
=
{
x
:
point
[
0
],
...
...
@@ -96,11 +96,11 @@ export class GroupHandlerImpl implements GroupHandler {
const
bbox
=
shape
.
bbox
();
const
clientID
=
shape
.
attr
(
'
clientID
'
);
if
(
bbox
.
x
>
box
.
xtl
&&
bbox
.
y
>
box
.
ytl
&&
bbox
.
x
+
bbox
.
width
<
box
.
xbr
&&
bbox
.
y
+
bbox
.
height
<
box
.
ybr
&&
!
(
clientID
in
this
.
highlightedShapes
)
bbox
.
x
>
box
.
xtl
&&
bbox
.
y
>
box
.
ytl
&&
bbox
.
x
+
bbox
.
width
<
box
.
xbr
&&
bbox
.
y
+
bbox
.
height
<
box
.
ybr
&&
!
(
clientID
in
this
.
highlightedShapes
)
)
{
const
objectState
=
this
.
getStates
().
filter
(
(
state
:
any
):
boolean
=>
state
.
clientID
===
clientID
,
...
...
@@ -124,7 +124,6 @@ export class GroupHandlerImpl implements GroupHandler {
this
.
resetSelectedObjects
();
this
.
initialized
=
false
;
this
.
selectionRect
=
null
;
this
.
startSelectionPoint
=
{
x
:
null
,
y
:
null
,
...
...
@@ -213,6 +212,10 @@ export class GroupHandlerImpl implements GroupHandler {
}
this
.
statesToBeGroupped
=
[];
this
.
highlightedShapes
=
{};
if
(
this
.
selectionRect
)
{
this
.
selectionRect
.
remove
();
this
.
selectionRect
=
null
;
}
}
public
cancel
():
void
{
...
...
cvat-ui/package-lock.json
浏览文件 @
a3026f48
{
"name": "cvat-ui",
"version": "1.11.
1
",
"version": "1.11.
2
",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
cvat-ui/package.json
浏览文件 @
a3026f48
{
"name"
:
"cvat-ui"
,
"version"
:
"1.11.
1
"
,
"version"
:
"1.11.
2
"
,
"description"
:
"CVAT single-page application"
,
"main"
:
"src/index.tsx"
,
"scripts"
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录