Skip to content

Commit

Permalink
release: v2.2.9
Browse files Browse the repository at this point in the history
  • Loading branch information
jwhx committed Jun 2, 2024
1 parent fa3a662 commit 85437bf
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MegSpot",
"version": "v2.2.8",
"version": "v2.2.9",
"author": "weiyajun <[email protected]>",
"description": "A tool to improve the viewing of pictures and videos by researchers",
"homepage": "https://github.com/MegEngine/MegSpot",
Expand Down Expand Up @@ -44,8 +44,8 @@
"appId": "org.megvii.megspot",
"copyright": " Copyright (c) 2022 Megvii Inc. All rights reserved.",
"releaseInfo": {
"releaseNotes": "新增功能:\n 1. 支持新建任意行数、列数的布局配置",
"releaseDate": "2024.02.07"
"releaseNotes": "一、新增功能:\n 1. 拖拽对比 模式中显示图像名称;\n 2. 支持在图像对比及视频对比中进入 拖拽对比 模式;\n二、bug修复:\n 1. 已修复拖拽对比中图像展示的顺序;",
"releaseDate": "2024.06.02"
},
"directories": {
"output": "build"
Expand Down
2 changes: 0 additions & 2 deletions src/renderer/views/image/Content.vue
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,12 @@ export default {
shareCanvas.path = path
const imageBlob = await this.imageToBlob(image)
shareCanvas.imageUrl = URL.createObjectURL(imageBlob)
console.log(shareCanvas)
shareCanvas.name = canvas.getName(false)
return shareCanvas
})
)
).map((i) => i.value)
twoCanvas.sort((a, b) => a.index - b.index)
console.log('twoCanvas', twoCanvas)
this.$parent.showCompare = true
setTimeout(() => {
this.$parent.$refs.imageDragCompareRef.setImageInfoList(twoCanvas)
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/views/video/Content.vue
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,9 @@ export default {
const canvasViews = this.$refs['video_canvas']
const twoCanvas = (
await Promise.allSettled(
canvasViews.slice(0, 2).map(async (canvas) => {
canvasViews.slice(0, 2).map(async (canvas,index) => {
const shareCanvas = {
index,
name: '',
_width: 0,
_height: 0,
Expand Down Expand Up @@ -469,6 +470,7 @@ export default {
})
)
).map((i) => i.value)
twoCanvas.sort((a, b) => a.index - b.index)
this.$parent.showCompare = true
setTimeout(() => {
this.$parent.$refs.imageDragCompareRef.setImageInfoList(twoCanvas)
Expand Down
4 changes: 3 additions & 1 deletion src/renderer/views/video/Toolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,9 @@ export default {
this.$bus.$emit('changeGroup', this.startIndex)
},
handleCompare() {
this.$bus.$emit('compare')
if (!this.videoPaused) {
this.$bus.$emit('compare')
}
},
handleShare() {
this.$bus.$emit('share')
Expand Down

0 comments on commit 85437bf

Please sign in to comment.