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

Feature/big image roi #16

Merged
merged 32 commits into from Nov 17, 2011
Merged

Feature/big image roi #16

merged 32 commits into from Nov 17, 2011

Conversation

atarkowska
Copy link
Member

ROI on big image viewer, 4.4 feature. please pull it to develop

  • Ola

Will Moore and others added 15 commits September 21, 2011 13:34
Display of shape text in web ROI table. See #6812
b14a5ec
Collapse the ROI-shape hierarchy if only 1 shape per ROI. See #6812
5531616
Improving layout of ROI table in web. See #6832
ac10af5
Small fixes to web ROI table. See #6832
ccefdfa
Mostly working roi thumbnails. Need to handle edge cases and big images.
d67e0d8
Roi thumbs line colour and display in table for Big images.
44b3e0f
Roi-thumbnail zoom on mouse-over.
6f0315f
Web roi thumbnails handle regions outside image. See #6166
a3c4b0e
Handle clicks on roi_thumbnails
650b49e
@atarkowska
roi support on big image viewer, see #6578
7a0909d
@atarkowska
Merge branch 'feature/6166_web_rois' into feature/big_image_roi
a4ed3b7
Selecting ROI shape returns centre positon: x, y.
c129e02
@atarkowska
highlighting object by clicking on it; choosing object moves viewer t…
95d2ea7 
…o that position, close #6578
Fix several small roi_thumb issues, line-colour picker
e33e41f
Removing console.log
fdc9ccc
@chris-allan
Copy link
Member

Four things to tackle before we start testing again:

  1. Add Y-axis scrollability of the ROI table; currently it is useless with more than a trivial number of ROI
  2. Make ROI thumbnails disabled by default and with a toggle to turn them on; currently it is very expensive with lots of ROI
  3. Never zoom an ROI thumbnail; currently small ROI thumbnails (ex. 10x10) are zoomed to fit a much larger area
  4. In the main viewer panel the default cursor should be returned to the pointer and switch to the hand upon a drag event; currently it is the hand by default and this makes it difficult to click on ROI

@atarkowska
Copy link
Member Author

tickets: #7091 and #7096

@chris-allan
Copy link
Member

Small issue with the display location of the selection when dealing with "Label" ROI.

Screenshot

@chris-allan
Copy link
Member

A few UI issues to address after discussion with @jburel and @will-moore:

  1. Background colour of the thumbnail
  2. Scrolling so that we are not loosing the header of the dialog
  3. Replacing text shapes with icons currently in use by OMERO.insight
  4. Show range [min, max] for Z and T on the ROI row in the table

@chris-allan
Copy link
Member

@aleksandra-tarkowska: On the selection and dragging front everything seems to be okay except when you try and click and drag when your mouse pointer is over an ROI. How much of this we can address right now I'm not sure.

@will-moore
Copy link
Member

@chris-allan: I can't reproduce the Text selection bug above. Any ideas? Other issues are fixed now.

@chris-allan
Copy link
Member

@will-moore: New thumbnails look great as do the shape icons. The Z and T ranges seem to be working as advertised. Couple issues:

  1. Any reason to not capitalize "shape" to be consistent with the other column headers? In fact with the icons there now do we even need a header?
  2. From the four points we discussed on Tuesday the header of the dialog still scrolls with the entire window. Is this a pain to fix?

With respect to the Text selection bug here's another example in the non-zoomed case (originally I thought it had to do with the larger image size and the fact that I had zoomed to 1:1):

Non-zoomed Text/Label selection bug

In addition it seems like we have the center coordinates out of sync with respect to what OMERO.insight is storing and using:

Comparison to the above in OMERO.insight

@chris-allan
Copy link
Member

@will-moore: 63a009d looking good.

@chris-allan
Copy link
Member

@will-moore, @aleksandra-tarkowska: A few bugs on MSIE:

  1. Selections not being removed from the tree

Selection bug screenshot

  1. Partial loading of the image. Sometimes this also happens on Firefox:

Partial load bug screenshot
Partial load bug when zoomed screenshot

Will Moore added 7 commits October 27, 2011 16:43
Adding Shape_thumbnails into ROI table.
15c0bab 
ROI rows still show 'ROI' thumbnail as before, but now each row also shows
a Shape thumbnail.
Also removed 'Shape' text from icon column header and
added the Point in the ROI & Shape thumbnails.
Workaround bug with text-shape selection coordinates
35f1c85
Fixing IE error with scaling in panojs control_roi.js
fda1873
Small fix to ROI table row color IE bug.
edbd443
Removing 'fill' of text shapes on deselection.
130055d
Handle web ROI thumbnails over max image size
05b1eda 
If width OR height exceed omero.pixeldata.max_plane_width etc then we
return a blank thumbnail with 'ROI too large' text
Removing print statements
6cdfd87
@chris-allan
Copy link
Member

@will-moore: I've got Jean-Marie's latest OMERO.insight from http://hudson.openmicroscopy.org.uk/job/OMERO-merge-blue/21/ so I can test the "really, really big" thumbnails on the plane tomorrow.

@chris-allan
Copy link
Member

@will-moore: Finished final review today, this all looks good. Even in IE8. :) Merging.

chris-allan added a commit that referenced this pull request Nov 17, 2011
@chris-allan
Merge pull request #16 from aleksandra-tarkowska/feature/big_image_roi
b4a9f96 
Feature/big image roi
@chris-allan chris-allan merged commit b4a9f96 into ome:develop Nov 17, 2011
sbesson pushed a commit to sbesson/openmicroscopy that referenced this pull request Jun 1, 2012
Merge pull request ome#16 from sbesson/roi_counting
46b78ad 
Modify ROI counting method in BlitzGateway
joshmoore added a commit to cneves/openmicroscopy that referenced this pull request Jul 18, 2012
@joshmoore
Merge pull request ome#16 from cneves/9348-close-handle
5e828c0 
closing handles (see #9348)
snoopycrimecop pushed a commit to snoopycrimecop/openmicroscopy that referenced this pull request Nov 6, 2014
Merge pull request ome#16 from will-moore/template_cleanup
abbd64a 
Fixing right-panel tabs in shares
snoopycrimecop pushed a commit to snoopycrimecop/openmicroscopy that referenced this pull request Apr 28, 2016
Merge pull request ome#16 from pwalczysko/duplicate-command-further-t…
0885367 
…ests

Add tests for hierarchy and skiphead duplication
jburel referenced this pull request in jburel/openmicroscopy Nov 18, 2017
@mtbc
Merge pull request #16 from dominikl/admin_create_log
759801e 
Add the "log" command to admin CLI, discussed with @joshmoore
jburel added a commit that referenced this pull request Jan 23, 2018
@jburel
Merge pull request #16 from rgozim/robot-infra
e212d0b 
Updated readme
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
4.4.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@atarkowska @chris-allan @will-moore