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

6166 phase2 #25

Merged
merged 47 commits into from Dec 1, 2011
Merged

6166 phase2 #25

merged 47 commits into from Dec 1, 2011

Commits on Sep 21, 2011

  1. Display of shape text in web ROI table. See #6812

    Will Moore committed Sep 21, 2011
    Copy the full SHA
    b14a5ec View commit details
    Browse the repository at this point in the history

  2. Collapse the ROI-shape hierarchy if only 1 shape per ROI. See #6812

    Will Moore committed Sep 21, 2011
    Copy the full SHA
    5531616 View commit details
    Browse the repository at this point in the history

  3. Improving layout of ROI table in web. See #6832

    Will Moore committed Sep 21, 2011
    Copy the full SHA
    ac10af5 View commit details
    Browse the repository at this point in the history

  4. Small fixes to web ROI table. See #6832

    Will Moore committed Sep 21, 2011
    Copy the full SHA
    ccefdfa View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2011

  1. Mostly working roi thumbnails. Need to handle edge cases and big images.

    Will Moore committed Sep 23, 2011
    Copy the full SHA
    d67e0d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2011

  1. Roi thumbs line colour and display in table for Big images.

    Will Moore committed Sep 26, 2011
    Copy the full SHA
    44b3e0f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2011

  1. Roi-thumbnail zoom on mouse-over.

    Will Moore committed Oct 13, 2011
    Copy the full SHA
    6f0315f View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2011

  1. Web roi thumbnails handle regions outside image. See ome#6166

    Will Moore committed Oct 14, 2011
    Copy the full SHA
    a3c4b0e View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2011

  1. Handle clicks on roi_thumbnails

    Will Moore committed Oct 20, 2011
    Copy the full SHA
    650b49e View commit details
    Browse the repository at this point in the history

  2. roi support on big image viewer, see #6578

    @atarkowska
    atarkowska committed Oct 20, 2011
    Copy the full SHA
    7a0909d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/6166_web_rois' into feature/big_image_roi

    @atarkowska
    atarkowska committed Oct 20, 2011
    Copy the full SHA
    a4ed3b7 View commit details
    Browse the repository at this point in the history

  4. Selecting ROI shape returns centre positon: x, y.

    Will Moore committed Oct 20, 2011
    Copy the full SHA
    c129e02 View commit details
    Browse the repository at this point in the history

  5. highlighting object by clicking on it; choosing object moves viewer t… 

    …o that position, close #6578
    @atarkowska
    atarkowska committed Oct 20, 2011
    Copy the full SHA
    95d2ea7 View commit details
    Browse the repository at this point in the history

  6. Fix several small roi_thumb issues, line-colour picker

    Will Moore committed Oct 20, 2011
    Copy the full SHA
    e33e41f View commit details
    Browse the repository at this point in the history

  7. Removing console.log

    Will Moore committed Oct 20, 2011
    Copy the full SHA
    fdc9ccc View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2011

  1. Adding scroll-bars to ROI table

    Will Moore committed Oct 25, 2011
    Copy the full SHA
    583eb07 View commit details
    Browse the repository at this point in the history

  2. Allow toggle of ROI thumbnails display. See #7091

    Will Moore committed Oct 25, 2011
    Copy the full SHA
    8705183 View commit details
    Browse the repository at this point in the history

  3. Don't zoom in on ROI thumbnails for small ROIs. See #7091

    Will Moore committed Oct 25, 2011
    Copy the full SHA
    d6d1636 View commit details
    Browse the repository at this point in the history

  4. replacing mouse cursor, close #7096

    @atarkowska
    atarkowska committed Oct 25, 2011
    Copy the full SHA
    3468c95 View commit details
    Browse the repository at this point in the history

  5. adding exclusion for big image viewer in handleShapeRowClick

    @atarkowska
    atarkowska committed Oct 25, 2011
    Copy the full SHA
    2a2f803 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2011

  1. Fixing bug with ROI BBox() not found for multi-Z image.

    Will Moore committed Oct 26, 2011
    Copy the full SHA
    23357de View commit details
    Browse the repository at this point in the history

  2. Adding shape icons to ROI table

    Will Moore committed Oct 26, 2011
    Copy the full SHA
    56510e2 View commit details
    Browse the repository at this point in the history

  3. Adding Z and T ranges to ROI row of table

    Will Moore committed Oct 26, 2011
    Copy the full SHA
    b74dcb0 View commit details
    Browse the repository at this point in the history

  4. Fixing ROI thumbnails: padding colour and polyline

    Will Moore committed Oct 26, 2011
    Copy the full SHA
    e13b075 View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2011

  1. ROI table scrolls without losing header

    Will Moore committed Oct 27, 2011
    Copy the full SHA
    63a009d View commit details
    Browse the repository at this point in the history

  2. Adding Shape_thumbnails into ROI table. 

    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.
    Will Moore committed Oct 27, 2011
    Copy the full SHA
    15c0bab View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2011

  1. Workaround bug with text-shape selection coordinates

    Will Moore committed Oct 28, 2011
    Copy the full SHA
    35f1c85 View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2011

  1. Fixing IE error with scaling in panojs control_roi.js

    Will Moore committed Oct 31, 2011
    Copy the full SHA
    fda1873 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2011

  1. Small fix to ROI table row color IE bug.

    Will Moore committed Nov 1, 2011
    Copy the full SHA
    edbd443 View commit details
    Browse the repository at this point in the history

  2. Removing 'fill' of text shapes on deselection.

    Will Moore committed Nov 1, 2011
    Copy the full SHA
    130055d View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2011

  1. Handle web ROI thumbnails over max image size 

    If width OR height exceed omero.pixeldata.max_plane_width etc then we
return a blank thumbnail with 'ROI too large' text
    Will Moore committed Nov 3, 2011
    Copy the full SHA
    05b1eda View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2011

  1. Removing print statements

    Will Moore committed Nov 4, 2011
    Copy the full SHA
    6cdfd87 View commit details
    Browse the repository at this point in the history

  2. Web ROI table allows toggling of shape text visibility. Fixes #7179

    Will Moore committed Nov 4, 2011
    Copy the full SHA
    0aea57f View commit details
    Browse the repository at this point in the history

  3. Wrap long shape labels in image-viewer. See #7178

    Will Moore committed Nov 4, 2011
    Copy the full SHA
    2d7caab View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2011

  1. Trunctate long shape text in the ROI table. 

    Use tool-tip to display the full text.
    Will Moore committed Nov 5, 2011
    Copy the full SHA
    862f539 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2011

  1. ROI shape text handles click to select shape

    Will Moore committed Nov 7, 2011
    Copy the full SHA
    2e59fd1 View commit details
    Browse the repository at this point in the history

  2. ROI shapes text wrap depends on total label length

    Will Moore committed Nov 7, 2011
    Copy the full SHA
    20bd3a5 View commit details
    Browse the repository at this point in the history

  3. Fix ROI table layout expand/collapse bug in Safari 

    Use border around table cells instead of padding since Safari was not hiding
padding on each tbody collapse, but adding padding for expand
    Will Moore committed Nov 7, 2011
    Copy the full SHA
    793ae79 View commit details
    Browse the repository at this point in the history

  4. Fix scroll to Label shape in web. Closes #7176

    Will Moore committed Nov 7, 2011
    Copy the full SHA
    a3408d3 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2011

  1. Shape text colour matches line colour 

    This makes the web consistent with Insight. There is no 'text colour' attribute
for shapes, so you have to use the line colour.
    Will Moore committed Nov 10, 2011
    Copy the full SHA
    6ef266f View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2011

  1. Adding shape-text background - postit colour 

    Also fixed bug where selecting the shape increases the opacity of the
fill.
    Will Moore committed Nov 11, 2011
    Copy the full SHA
    2161980 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2011

  1. Fixing Text-Shape location, stroke, fill etc wrt Insight 

    Use the stroke colour to fill Text shapes, use stroke of Text shape to highlight.
    Will Moore committed Nov 14, 2011
    Copy the full SHA
    670954c View commit details
    Browse the repository at this point in the history

  2. Only refresh ROIs on panoJS move if Z and T have changed. Closes #7241

    Will Moore committed Nov 14, 2011
    Copy the full SHA
    578d1ed View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2011

  1. Fixed bug in stroke/fill attributes, 

    left over from the text & stroke/fill work in previous commits.
    Will Moore committed Nov 21, 2011
    Copy the full SHA
    b2bad1e View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2011

  1. Web ROI handles long-word labels 

    By breaking up long words to wrap in Image viewer and using css in table
    Will Moore committed Nov 25, 2011
    Copy the full SHA
    c8190d3 View commit details
    Browse the repository at this point in the history

  2. Fix toggle first table row bug

    Will Moore committed Nov 25, 2011
    Copy the full SHA
    0252c74 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2011

  1. Text in roi table now in <p> for wrapping.

    Will Moore committed Dec 1, 2011
    Copy the full SHA
    8786aad View commit details
    Browse the repository at this point in the history