New: Multi Image Annotations #73

JustinHoldstock · 2017-04-13T18:19:17Z

Tests are almost done!

jeremypress · 2017-04-13T21:26:38Z

src/lib/annotations/image/MultiImageAnnotator.js

+        }
+
+        // If no page was selected, ignore
+        const page = Number(event.target.getAttribute('data-page-number'));


could simplify this a little

const location = super.getLocationFromEvent(event)
const page = ...;
if (location && page) {
return { page, ...location }
}

return location; #could also just return none to make it more clear what location is

jeremypress · 2017-04-13T21:27:58Z

src/lib/viewers/BaseViewer.js

+     * @abstract
+     * @return {Function|null} Click handler
+     */
+    getPointModeClickHandler() {}


Should we not do this if we're about to move annotations out of the viewers?

@pramodsum Do you want me to wait to merge this in until after your separation happens? I can then pull this out, and put it into the separate repo

Hmm... It'll probably take longer for the separation commit to be fully completed so might make sense to merge this in as is and i'll rebase my commit off this and adjust accordingly.

I'm trying to chunk out the separation commits into smaller and easier to review bits (and into parts i'm more comfortable separating out sooner rather than later). We should be able to get one if not some of the separation commits in before this annotator so we can rebase and fix accordingly

jeremypress · 2017-04-13T21:31:49Z

src/lib/viewers/image/ImageBaseViewer.js

+     * @return {boolean} Whether or not viewer is annotatable
+     */
+    isAnnotatable(type) {
+        const typeIsAllowed = this.annotationTypes.some((allowed) => {


What about a "canAnnotateType" method? Following the model of what we do for other functionality checks like "canDownload" or "hasWebGL"

@pramodsum has already solved this. See above comment about waiting or not

I have generalized this and a few other methods in PR #75 so we might be able to get some of the refactoring in before this annotator gets merged.

…ew into New-MultiImage-Annotations

pramodsum

I think it might make sense to merge a portion of the annotations bundling/refactor changes ( #75 ) before merging this viewer. It will simplify some of the duplicated logic in this code review as well.

Other than that looks good! I have a few questions about zooming in the image viewer but we can discuss that in person 😄

pramodsum · 2017-04-14T07:12:57Z

.babelrc

-                        "src/lib/viewers/box3d/model3d/Model3dAnimationClipsPullup.js",
-                        "src/lib/viewers/box3d/model3d/model3dSettingsPullup.js",
-                        "src/lib/viewers/box3d/model3d/Model3dVrControls.js",
+                        "src/lib/viewers/box3d/model3d/Model3DAnimationClipsPullup.js",


Just wanted to double check if this was intended to go w/ this commit :)

It was, but I'm going to just add it into the one I'm working on for fixture renaming, and ignore it here

pramodsum · 2017-04-14T07:17:44Z

src/lib/viewers/image/ImageBaseViewer.js

+     * @private
+     * @return {void}
+     */
+    initAnnotations() {


Will be moved in #75

pramodsum · 2017-04-14T07:18:10Z

src/lib/viewers/image/ImageBaseViewer.js

+     * @protected
+     * @return {void}
+     */
+    showAnnotations() {


pramodsum · 2017-04-14T07:21:43Z

src/lib/viewers/image/ImageBaseViewer.js

+     * @param {AnnotationService} annotationService An instance of the annotation service.
+     */
+    /* istanbul ignore next */
+    createAnnotator(/* fileVersionID, annotationService */) {}


After the initialization of annotator is generalized based on the viewer in #75 will we be needing this method? I think the only real difference for this between ImageAnnotator and MultiImageAnnotator is the actually initialization, right?

I don't think we'll need it, after that

pramodsum · 2017-04-14T15:09:45Z

src/lib/annotations/image/ImageAnnotator.js

-        // Get image tag inside viewer
-        const imageEl = this._annotatedElement.querySelector('img');
-        if (!imageEl) {
+        // If we haven't click on an image, don't annotate.


I wonder if we can implement something similar for all annotators! For DocAnnotator we also check if we're inside the page element or in the dialog so we might be able to clean up some of this logic elsewhere too!

pramodsum · 2017-04-14T15:11:53Z

src/lib/annotations/image/MultiImageAnnotator.js

+     * @param {Event} event - DOM event
+     * @return {Object|null} Location object
+     */
+    getLocationFromEvent(event) {


If this is the only thing we're creating a separate MultiImageAnnotator for, I wonder if it's possible to consolidate it into the ImageAnnotator as something that'll default to page 1 for normal images. I'm pretty sure we already include the page number in the single page image annotations location object

pramodsum · 2017-04-14T15:14:24Z

src/lib/viewers/BaseViewer.js

+     * @abstract
+     * @return {Function|null} Click handler
+     */
+    getPointModeClickHandler() {}


I'm trying to chunk out the separation commits into smaller and easier to review bits (and into parts i'm more comfortable separating out sooner rather than later). We should be able to get one if not some of the separation commits in before this annotator so we can rebase and fix accordingly

tonyjin · 2017-04-18T18:53:50Z

src/lib/annotations/image/ImagePointDialog.js

@@ -30,7 +30,7 @@ class ImagePointDialog extends AnnotationDialog {
        const dialogWidth = dialogDimensions.width;

        // Get image tag inside viewer
-        const imageEl = this._annotatedElement.querySelector('img');
+        const imageEl = this._annotatedElement.querySelector(`[data-page-number="${this._location.page}"]`) || this._annotatedElement.querySelector('img');


Add a comment that this can also be for multi-page images? Had to think a bit before I realized what this was for :)

tonyjin · 2017-04-18T18:58:17Z

src/lib/viewers/image/ImageBaseViewer.js

@@ -312,7 +451,7 @@ class ImageBaseViewer extends BaseViewer {
     */
    cancelDragEvent(event) {
        event.preventDefault();
-        event.stopPropogation();


tonyjin · 2017-04-18T18:58:32Z

src/lib/viewers/image/ImageBaseViewer.js

+     * Handles zoom
+     * @param {string} [type] - Type of zoom in|out|reset
+     * @private
+     * @return {void}


Fix JSDoc ordering and spacing

tonyjin · 2017-04-18T18:59:06Z

src/lib/viewers/image/ImageBaseViewer.js

     *
+     * @param {string} fileVersionID The file version id of the file to annotate.
+     * @param {AnnotationService} annotationService An instance of the annotation service.


Dashes between param name and description

tonyjin · 2017-04-18T19:01:33Z

src/lib/viewers/image/MultiImageViewer.js

+
+        switch (type) {
+            case 'in':
+                newWidth = imageContainerWidth + 100;


100 moved to constant

tonyjin · 2017-04-18T19:01:42Z

src/lib/viewers/image/MultiImageViewer.js

+        this.emit('zoom');
+
+        // Give the browser some time to render before updating pannability
+        setTimeout(this.updatePannability, 50);


const for timeout

tonyjin · 2017-04-18T19:02:46Z

src/lib/viewers/image/MultiImageViewer.js

+        this.wrapperEl.scrollLeft = (this.wrapperEl.scrollWidth - viewportWidth) / 2;
+
+        if (this.annotator) {
+            this.scaleAnnotations(this.imageEl.offsetWidth, this.imageEl.offsetHeight);


Can we move this direct calling of annotator code into an event handler somewhere based off of the 'zoom' event + w/e data you can pass along?

tonyjin · 2017-04-18T19:04:00Z

src/lib/viewers/image/MultiImageViewer.js

+            if (this.controls) {
+                this.controls.enable();
+            }
+        });


You can test these relatively easily in tests going forward by manually emitting an event after createAnnotator() is called in your tests and seeing if the imageEl has classes, controls are disabled, etc.

pramodsum · 2017-04-24T23:10:00Z

This should be unblocked now that #75 is merged

pramodsum · 2017-05-07T19:59:03Z

#75 was reversed to this will have to wait for #95 to be merged

pramodsum · 2017-05-11T18:30:57Z

@JustinHoldstock can we close this?

New: Multi Image Annotations

2899d6f

pramodsum self-requested a review April 13, 2017 18:21

jeremypress reviewed Apr 13, 2017

View reviewed changes

Justin Holdstock added 3 commits April 13, 2017 16:45

Chore: update tests

58f6b3e

Chore: Updated 3D file names in istanbul-exclude

461f44d

Merge branch 'master' of github.com:JustinHoldstock/box-content-previ…

d524d51

…ew into New-MultiImage-Annotations

pramodsum suggested changes Apr 14, 2017

View reviewed changes

pramodsum reviewed Apr 14, 2017

View reviewed changes

tonyjin reviewed Apr 18, 2017

View reviewed changes

JustinHoldstock closed this May 15, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New: Multi Image Annotations #73

New: Multi Image Annotations #73

JustinHoldstock commented Apr 13, 2017

jeremypress Apr 13, 2017

jeremypress Apr 13, 2017

JustinHoldstock Apr 13, 2017

pramodsum Apr 14, 2017

pramodsum Apr 14, 2017

jeremypress Apr 13, 2017

JustinHoldstock Apr 13, 2017

pramodsum Apr 14, 2017 •

edited

Loading

pramodsum left a comment

pramodsum Apr 14, 2017

JustinHoldstock Apr 17, 2017

pramodsum Apr 14, 2017

pramodsum Apr 14, 2017

pramodsum Apr 14, 2017

JustinHoldstock Apr 17, 2017

pramodsum Apr 14, 2017

pramodsum Apr 14, 2017

pramodsum Apr 14, 2017

tonyjin Apr 18, 2017

JustinHoldstock May 9, 2017

tonyjin Apr 18, 2017

tonyjin Apr 18, 2017

tonyjin Apr 18, 2017

tonyjin Apr 18, 2017

tonyjin Apr 18, 2017

tonyjin Apr 18, 2017

tonyjin Apr 18, 2017

pramodsum commented Apr 24, 2017

pramodsum commented May 7, 2017

pramodsum commented May 11, 2017

New: Multi Image Annotations #73

New: Multi Image Annotations #73

Conversation

JustinHoldstock commented Apr 13, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pramodsum Apr 14, 2017 • edited Loading

Choose a reason for hiding this comment

pramodsum left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pramodsum commented Apr 24, 2017

pramodsum commented May 7, 2017

pramodsum commented May 11, 2017

pramodsum Apr 14, 2017 •

edited

Loading