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.

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

Markdown labels #209

Merged
merged 7 commits into from Jun 13, 2017

Conversation

Projects
None yet
4 participants
@will-moore
Member

will-moore commented Apr 24, 2017

Adds support for markdown in panel labels as requested in https://trello.com/c/BNjiEiAZ/3-labels-italics

screen shot 2017-05-02 at 15 31 20

To test:

  • Create figure labels including italics, bold and bold italic styles with markdown.
  • Check that they render correctly on the figure itself (in various locations on each panel).
  • See that the [M] button beside the 'Add Labels' heading shows the Markdown info dialog.
  • Check that the figure exports as PDF and TIFF with correctly formatted labels.
  • Also: fixed wrapping of figure labels when label is wider than panel (previously these wrapped in the figure app but not in exported PDF/TIFF). Now they extend up to 1 panel width either side of panel.
    NB: Python markdown is not currently installed on eel server, so you will need to enter html labels to see these formatted correctly on export. See http://web-dev-merge.openmicroscopy.org/figure/file/17802/ (user-3).
@waxenegger

This comment has been minimized.

Show comment
Hide comment
@waxenegger

waxenegger Apr 25, 2017

Member

Very nice feature, the help menu is a good idea given the various markdown formats.

The display in figure works for bold, italics and link though the link hidden under the svg (z-index) so that it cannot be clicked in figure itself but that may be intentional.

The no-wrap of longer labels is consistent in figure and exported versions.

I read your remark about python markdown on eel but couldn't see the html tag effects in the pdf/tiff I exported but then again it might be better to wait till eel has the respective markdown library installed anyhow.

Member

waxenegger commented Apr 25, 2017

Very nice feature, the help menu is a good idea given the various markdown formats.

The display in figure works for bold, italics and link though the link hidden under the svg (z-index) so that it cannot be clicked in figure itself but that may be intentional.

The no-wrap of longer labels is consistent in figure and exported versions.

I read your remark about python markdown on eel but couldn't see the html tag effects in the pdf/tiff I exported but then again it might be better to wait till eel has the respective markdown library installed anyhow.

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore Apr 26, 2017

Member

@waxenegger Sorry, I forgot that I need to upload the script manually. I just uploaded it now (seems to be working) but can do it again whenever you're ready to test.

Member

will-moore commented Apr 26, 2017

@waxenegger Sorry, I forgot that I need to upload the script manually. I just uploaded it now (seems to be working) but can do it again whenever you're ready to test.

@snoopycrimecop snoopycrimecop referenced this pull request Apr 30, 2017

Merged

Page colour #211

@waxenegger

This comment has been minimized.

Show comment
Hide comment
@waxenegger

waxenegger May 2, 2017

Member

The export works now using html tags.

Member

waxenegger commented May 2, 2017

The export works now using html tags.

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore May 5, 2017

Member

Bug with non-square panels causing incorrect positioning of left-vertical label (from @bramalingam)

screen shot 2017-05-05 at 14 25 49

Member

will-moore commented May 5, 2017

Bug with non-square panels causing incorrect positioning of left-vertical label (from @bramalingam)

screen shot 2017-05-05 at 14 25 49

@jburel

This comment has been minimized.

Show comment
Hide comment
@jburel

jburel May 9, 2017

Member

@bramalingam @will-moore did you import such images on eel to make the testing easier?

Member

jburel commented May 9, 2017

@bramalingam @will-moore did you import such images on eel to make the testing easier?

@bramalingam

This comment has been minimized.

Show comment
Hide comment
@bramalingam

bramalingam May 9, 2017

Member

The markdown suggestions work as expected.
The left-vertical label issue (#209 (comment)) no longer exists as well.

Looks good to merge.

Member

bramalingam commented May 9, 2017

The markdown suggestions work as expected.
The left-vertical label issue (#209 (comment)) no longer exists as well.

Looks good to merge.

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore
Member

will-moore commented May 9, 2017

@jburel You can use this figure for testing http://web-dev-merge.openmicroscopy.org/figure/file/19809/ (user-1)

@jburel jburel merged commit 12103c1 into ome:master Jun 13, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@jburel jburel added this to the 3.1.0 milestone Jun 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment