Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Annotation work #1039

Merged
merged 65 commits into from
Aug 9, 2016
Merged

Annotation work #1039

merged 65 commits into from
Aug 9, 2016

Conversation

rsinghal
Copy link
Collaborator

@rsinghal rsinghal commented Aug 9, 2016

A lot of improvements to annotations

rsinghal and others added 30 commits June 28, 2016 15:12
@rsinghal
update font awesome to 4.4.0 from 4.1.0 to get mouse-pointer
220bf8d
@rsinghal
remove draw-tool class
a781a9f
@rsinghal
added new classes
629fcf2
@rsinghal
fixing events
d1b93a1
@rsinghal
Merge branch 'release2.1' into 881-annotation-controls
f1ea9a4
@rsinghal
fix a few small things
fbfcf82
@radpet
Add the current zoom level to the calculation of the distance to the …
018f975 
…starting point
@rsinghal
Merge pull request #1002 from SirmaITT/feature/fix_polygon_close
4b77200 
Fix the hard polygon closing
@radpet
Add stroke type picker
4a4a47f 
Pass the state to the hud->controls in order to get the configured build path
@rsinghal
properly switch between shapes
1bbc25a
@rsinghal
Merge commit '28d80fa59c8336ea7c6418c82b01e2ff0ff2c200' into annotati…
239003d 
…on-work
@rsinghal
Merge pull request #997 from SirmaITT/feature/stroke_dropdown
b80012e 
Add stroke type picker
@rsinghal
Merge branch 'release2.1' into 881-annotation-controls
6d7c4b6 
# Conflicts:
#	js/src/widgets/imageView.js
@rsinghal
Merge branch 'release2.1' into annotation-work
319d209 
# Conflicts:
#	js/src/widgets/contextControls.js
#	js/src/widgets/hud.js
#	locales/en/translation.json
@rsinghal
fixes to color picker UIs and dropped cancel/choose buttons @radpet
2322688
@rsinghal
Merge branch '881-annotation-controls' into annotation-work
734b50a 
# Conflicts:
#	css/mirador.css
#	js/src/annotations/osd-svg-overlay.js
#	js/src/widgets/bookView.js
#	js/src/widgets/contextControls.js
#	js/src/widgets/hud.js
#	js/src/widgets/imageView.js
@rsinghal
css updates
9337ec1
@rsinghal
comment out carets for border and fill colors. add tooltip for border…
431f77d 
… style
@rsinghal
increase padding around annotation editor form and make sure it is dr…
68cf54f 
…aggable in annotation creation and editing modes.
@rsinghal
change cursor type to crosshair when in edit mode for annotations.
7b988f3
@rsinghal
have window confirmations use i18next
53cc940
@rsinghal
don't redraw qtip/editor when drawing multiple shapes for one annotation
645e7a7
@rsinghal
make sure we can draw different shapes with the same annotation box
d761d92
@radpet
Change cursor icon on move depending where it pointed to when shape i…
5dbf617 
…s selected
@rsinghal
comment out pointer change for now
7052115
@rsinghal
Merge pull request #1013 from SirmaITT/feature/change_cursors_on_move
d60f132 
Change cursor on move for rectangles/ellipse
@rsinghal
temporarily disable move/pointer cursor types
2daa79c
@rsinghal
use correct setting
dbfe818
@rsinghal
trying to associate overlay ids with annotation ids in the application
d47faf5
@radpet
Add raster as rotate icon to rectangles and ellipses
c14de42 
Add mouse move (rebased)

Fix rectangle rotate icon
Fix ellipse rotate icon
rsinghal and others added 21 commits July 18, 2016 17:04
@rsinghal
reset annotation controls state when changing pages. currently does n…
fdad827 
…ot preserve border colors during pagination.
@rsinghal
added deleteAnnotation translation
19c380c
@radpet
Use PointText to display trash icon
cb1efc7 
Use Raster as mask to the trash icon to make it clickable because we don't hitTest for 'fill'
Change Icon color to the same color as the selected shape's stroke
@rsinghal
Merge pull request #1020 from SirmaITT/feature/delete-shape-action
ebf08f8 
Display delete button when shape is selected
@rsinghal
removed references to this.parent since this already knows the windowId
0152120
@radpet
Deletes shape when clicked on the trash can icon.
5df17bb 
Unsubscribe from all events in the osd overlay when the osd is closed
@rsinghal
Merge pull request #1026 from SirmaITT/feature/delete-shape
3a3a6af 
Deletes shape when clicked on the trash can icon.
@radpet
Add dialog builder that use bootbox lib
103d9b6 
Refactor all native confirm dialogs to use the dialog builder
Add translations

Fix more memory leaks
Add test to check the unsubscription when overlay is about to be destroyed
@rsinghal
Merge pull request #1029 from SirmaITT/feature/delete-confirmation-di…
3470c07 
…alogs

Change delete confirms to use custom dialogs
@radpet
Add stroke width change on newly created shapes
fb3cb26 
Refactor pin tool
Refactor polygon tool
Refactor freehand tool

Fix deletion of only one point (freehand and polygon tool)

Disable shape selecting when out of edit mode or create new annotation mode
@radpet
Fix missing confirmation dialogs when mirador is in fullscreen mode
11e9f14
@radpet
Expand annotation functionality to handle annotations without shapes
896ae7d
@radpet
Reset current tool after mode change
655c53f
@radpet
Preserve strokeWidth of newly created shape on resize
e817aed
@rsinghal
Merge pull request #1030 from SirmaITT/feature/polygon-freeshape-pin-…
9d2229b 
…editable

Refactor tools to handle new edit workflow
@rsinghal
reset annotation editor values in overlay when a user turns off annot…
0e39245 
…ation or clicks the pointer icon (which effectively cancels an open annotation)
@rsinghal
Merge branch 'release2.1' into annotation-work
5f020fc 
# Conflicts:
#	css/mirador.css
@rsinghal
fix broken tests
553e6e9
@rsinghal
better selector so we don't get a duplicate editor with multiple slots
f124d02
@radpet
Change rectangle rotation handle to icon
e12d5f1 
Change ellipse rotation handle to icon
@rsinghal
Merge pull request #1036 from SirmaITT/feature/rotation-icon-to-rect-…
b752046 
…ellipse

Rotation Icons
@radpet
Copy link
Contributor

radpet commented Aug 9, 2016

@rsinghal I am implementing one more pull request that will improve the annotation integration with external systems and will fix many memory leaks caused by not unsubscribing from events. I should be ready really soon (hope to be tomorrow but more likely this Thursday).

@coveralls
Copy link

Coverage Status

Coverage increased (+2.5%) to 46.788% when pulling b752046 on annotation-work into c03cc14 on release2.1.

@coveralls
Copy link

Coverage Status

Coverage increased (+2.6%) to 46.859% when pulling 5d67ac2 on annotation-work into c03cc14 on release2.1.

@rsinghal rsinghal merged commit 368172f into release2.1 Aug 9, 2016
@radpet
Copy link
Contributor

radpet commented Aug 9, 2016 •
edited
Loading

@rsinghal

@rsinghal I am implementing one more pull request that will improve the annotation integration with external systems and will fix many memory leaks caused by not unsubscribing from events. I should be ready really soon (hope to be tomorrow but more likely this Thursday).

I saw you merged annotation-work. I'll send the new pr to annotation-work as soon as possible.

@aeschylus
Copy link
Collaborator

👍

@rsinghal
Copy link
Collaborator Author

rsinghal commented Aug 9, 2016

@radpet Not a problem. We can still work against annotation-work (I am finishing up #983), I just wanted to get the merge in since the work around annotation is nearly done and I wanted it to be available to @aeschylus as he does some other work.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@rsinghal @radpet @coveralls @aeschylus