Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Mirador Annotations Extend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IIIF
Mirador
Mirador Annotations Extend
Commits
086c6fdf
Commit
086c6fdf
authored
1 year ago
by
Anthony
Browse files
Options
Downloads
Patches
Plain Diff
Add video support on AnnotationSvgDrawing.js
parent
33eecb2e
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/components/AnnotationSvgDrawing.js
+96
-17
96 additions, 17 deletions
src/components/AnnotationSvgDrawing.js
with
96 additions
and
17 deletions
src/components/AnnotationSvgDrawing.js
+
96
−
17
View file @
086c6fdf
...
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
...
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
import
ReactDOM
from
'
react-dom
'
;
import
ReactDOM
from
'
react-dom
'
;
import
PropTypes
from
'
prop-types
'
;
import
PropTypes
from
'
prop-types
'
;
import
{
OSDReferences
}
from
'
mirador/dist/es/src/plugins/OSDReferences
'
;
import
{
OSDReferences
}
from
'
mirador/dist/es/src/plugins/OSDReferences
'
;
import
{
VideosReferences
}
from
'
mirador/dist/es/src/plugins/VideosReferences
'
;
import
{
renderWithPaperScope
,
PaperContainer
}
from
'
@psychobolt/react-paperjs
'
;
import
{
renderWithPaperScope
,
PaperContainer
}
from
'
@psychobolt/react-paperjs
'
;
import
{
import
{
EllipseTool
,
EllipseTool
,
...
@@ -19,6 +20,10 @@ class AnnotationSvgDrawing extends Component {
...
@@ -19,6 +20,10 @@ class AnnotationSvgDrawing extends Component {
constructor
(
props
)
{
constructor
(
props
)
{
super
(
props
);
super
(
props
);
this
.
paper
=
null
;
this
.
getDisplayProps
=
this
.
getDisplayProps
.
bind
(
this
);
this
.
onPaperResize
=
this
.
onPaperResize
.
bind
(
this
);
this
.
paperDidMount
=
this
.
paperDidMount
.
bind
(
this
);
this
.
addPath
=
this
.
addPath
.
bind
(
this
);
this
.
addPath
=
this
.
addPath
.
bind
(
this
);
}
}
...
@@ -26,6 +31,25 @@ class AnnotationSvgDrawing extends Component {
...
@@ -26,6 +31,25 @@ class AnnotationSvgDrawing extends Component {
componentDidMount
()
{
componentDidMount
()
{
const
{
windowId
}
=
this
.
props
;
const
{
windowId
}
=
this
.
props
;
this
.
OSDReference
=
OSDReferences
.
get
(
windowId
);
this
.
OSDReference
=
OSDReferences
.
get
(
windowId
);
this
.
onPaperResize
();
}
/** Sync drawing canvas size/zoom with annotations canvas */
onPaperResize
(
ev
)
{
const
{
windowId
}
=
this
.
props
;
if
(
VideosReferences
.
get
(
windowId
)
&&
this
.
paper
)
{
const
{
canvasOverlay
,
video
}
=
VideosReferences
.
get
(
windowId
);
const
{
height
,
width
}
=
canvasOverlay
.
ref
.
current
;
const
{
videoHeight
,
videoWidth
}
=
video
;
this
.
paper
.
view
.
center
=
new
Point
(
videoWidth
/
2
,
videoHeight
/
2
);
this
.
paper
.
view
.
zoom
=
canvasOverlay
.
scale
;
this
.
paper
.
view
.
viewSize
=
new
this
.
paper
.
Size
(
width
,
height
);
}
}
/** Save paperjs ref once created */
paperDidMount
(
paper
)
{
this
.
paper
=
paper
;
}
}
/** */
/** */
...
@@ -43,28 +67,73 @@ class AnnotationSvgDrawing extends Component {
...
@@ -43,28 +67,73 @@ class AnnotationSvgDrawing extends Component {
});
});
}
}
getDisplayProps
()
{
const
{
windowId
}
=
this
.
props
;
const
osdref
=
OSDReferences
.
get
(
windowId
);
const
videoref
=
VideosReferences
.
get
(
windowId
);
if
(
osdref
)
{
const
{
viewport
}
=
osdref
.
current
;
const
img
=
osdref
.
current
.
world
.
getItemAt
(
0
);
const
center
=
img
.
viewportToImageCoordinates
(
viewport
.
getCenter
(
true
));
return
{
canvasProps
:
{
style
:
{
height
:
'
100%
'
,
width
:
'
100%
'
}
},
viewProps
:
{
center
:
new
Point
(
center
.
x
,
center
.
y
),
rotation
:
viewport
.
getRotation
(),
scaling
:
new
Point
(
viewport
.
getFlip
()
?
-
1
:
1
,
1
),
zoom
:
img
.
viewportToImageZoom
(
viewport
.
getZoom
()),
},
};
}
if
(
videoref
)
{
const
{
height
,
width
}
=
videoref
.
canvasOverlay
.
ref
.
current
;
return
{
canvasProps
:
{
height
,
resize
:
'
true
'
,
style
:
{
left
:
0
,
position
:
'
absolute
'
,
top
:
0
,
},
width
,
},
viewProps
:
{
center
:
new
Point
(
width
/
2
,
height
/
2
),
height
,
width
,
zoom
:
videoref
.
canvasOverlay
.
scale
,
},
};
}
throw
new
Error
(
'
Unknown or missing data player, not OpenSeadragon (image viewer) nor the video player
'
);
}
/** */
/** */
paperThing
()
{
paperThing
()
{
const
{
viewProps
,
canvasProps
}
=
this
.
getDisplayProps
();
const
{
const
{
activeTool
,
fillColor
,
strokeColor
,
strokeWidth
,
svg
,
edit
activeTool
,
fillColor
,
strokeColor
,
strokeWidth
,
svg
,
}
=
this
.
props
;
}
=
this
.
props
;
if
(
!
activeTool
||
activeTool
===
'
cursor
'
)
{
if
(
!
activeTool
||
activeTool
===
'
cursor
'
)
{
return
null
;
return
null
;
}
}
// Setup Paper View to have the same center and zoom as the OSD Viewport
//
//
Setup Paper View to have the same center and zoom as the OSD Viewport
const
viewportZoom
=
this
.
OSDReference
.
viewport
.
getZoom
(
true
);
//
const viewportZoom = this.OSDReference.viewport.getZoom(true);
const
image1
=
this
.
OSDReference
.
world
.
getItemAt
(
0
);
//
const image1 = this.OSDReference.world.getItemAt(0);
const
center
=
image1
.
viewportToImageCoordinates
(
//
const center = image1.viewportToImageCoordinates(
this
.
OSDReference
.
viewport
.
getCenter
(
true
),
//
this.OSDReference.viewport.getCenter(true),
);
//
);
const
flipped
=
this
.
OSDReference
.
viewport
.
getFlip
();
//
const flipped = this.OSDReference.viewport.getFlip();
//
const
viewProps
=
{
//
const viewProps = {
center
:
new
Point
(
center
.
x
,
center
.
y
),
//
center: new Point(center.x, center.y),
rotation
:
this
.
OSDReference
.
viewport
.
getRotation
(),
//
rotation: this.OSDReference.viewport.getRotation(),
scaling
:
new
Point
(
flipped
?
-
1
:
1
,
1
),
//
scaling: new Point(flipped ? -1 : 1, 1),
zoom
:
image1
.
viewportToImageZoom
(
viewportZoom
),
//
zoom: image1.viewportToImageZoom(viewportZoom),
};
//
};
let
ActiveTool
=
RectangleTool
;
let
ActiveTool
=
RectangleTool
;
switch
(
activeTool
)
{
switch
(
activeTool
)
{
...
@@ -124,9 +193,19 @@ class AnnotationSvgDrawing extends Component {
...
@@ -124,9 +193,19 @@ class AnnotationSvgDrawing extends Component {
/** */
/** */
render
()
{
render
()
{
const
{
windowId
}
=
this
.
props
;
const
{
windowId
}
=
this
.
props
;
this
.
OSDReference
=
OSDReferences
.
get
(
windowId
).
current
;
const
osdref
=
OSDReferences
.
get
(
windowId
);
const
videoref
=
VideosReferences
.
get
(
windowId
);
if
(
!
osdref
&&
!
videoref
)
{
throw
new
Error
(
"
Unknown or missing data player, didn't found OpenSeadragon (image viewer) nor the video player
"
);
}
if
(
osdref
&&
videoref
)
{
throw
new
Error
(
'
Unhandled case: both OpenSeadragon (image viewer) and video player on the same canvas
'
);
}
const
container
=
osdref
?
osdref
.
current
.
element
:
videoref
.
ref
.
current
.
parentElement
;
return
(
return
(
ReactDOM
.
createPortal
(
this
.
paperThing
(),
this
.
OSDReference
.
element
)
ReactDOM
.
createPortal
(
this
.
paperThing
(),
container
)
);
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment