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

Roi table pagination #231

Merged
merged 44 commits into from
Feb 26, 2019
Merged

Roi table pagination #231

merged 44 commits into from
Feb 26, 2019

Commits on Feb 6, 2019

  1. Simple pagination of ROI table

    @will-moore
    will-moore committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    b7149a2 View commit details
    Browse the repository at this point in the history

  2. Don't set roi_count to data.size on load or save

    @will-moore
    will-moore committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    3cbecf5 View commit details
    Browse the repository at this point in the history

  3. Add missing REGIONS_PAGE_SIZE constant

    @will-moore
    will-moore committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    586d925 View commit details
    Browse the repository at this point in the history

  4. Show ROI table header while loading

    @will-moore
    will-moore committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    c2d3cac View commit details
    Browse the repository at this point in the history

  5. Usability and css tweaks to pagination controls

    @will-moore
    will-moore committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    8c0227a View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. Don't allow pagination to lose unsaved ROI changes

    @will-moore
    will-moore committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    14484eb View commit details
    Browse the repository at this point in the history

  2. Update roi_count on save/delete

    @will-moore
    will-moore committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    94b7580 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2019

  1. Support /rois_by_plane/iid/z/t/ to load ROIs by Shape plane

    @will-moore
    will-moore committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    bc55bef View commit details
    Browse the repository at this point in the history

  2. Load ROIs by Z/T plane

    @will-moore
    will-moore committed Feb 10, 2019
    Configuration menu
    Copy the full SHA
    36c4f4b View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2019

  1. Don't request ROIs before image config loaded 

    If we requestRois here (when switching images and the ROI tab is active)
then we load ROIs before we know the current Z/T index of the image
and before any cached Z/T settings have been applied.
We don't need to request ROIs here, since the image_info will do
this on success from loading image info if ROIs tab is active
    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    063c163 View commit details
    Browse the repository at this point in the history

  2. Support /rois_by_plane/id/the_z-z_end/the_t-t_end/ for z/t ranges

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    e6fbabb View commit details
    Browse the repository at this point in the history

  3. /rois_by_plane/ loads ALL shapes for each ROI

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    6171f84 View commit details
    Browse the repository at this point in the history

  4. Handle Z-projection in UI, loading ROIs if any shape in range

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    8817cc8 View commit details
    Browse the repository at this point in the history

  5. Only paginate by Z/T plane if ROI count > page size

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    064b18d View commit details
    Browse the repository at this point in the history

  6. /rois_by_plane/ never loads ALL ROIs just to count

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    48024c7 View commit details
    Browse the repository at this point in the history

  7. Show number of ROIs on current Z/T plane

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    75747d3 View commit details
    Browse the repository at this point in the history

  8. Don't paginate when querying ROIs by ID

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    aeeb14e View commit details
    Browse the repository at this point in the history

  9. flake8 fixes

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    ed31084 View commit details
    Browse the repository at this point in the history

  10. Big css refactor with flex-box to fix ROI table scrolling

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    daef1af View commit details
    Browse the repository at this point in the history

  11. Remove JavaScript css fixes setTableHeight() etc

    @will-moore
    will-moore committed Feb 11, 2019
    Configuration menu
    Copy the full SHA
    f0c32af View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2019

  1. Improve query for /rois_by_shape/ and handle 0 ROIs on plane

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    c9bd1cc View commit details
    Browse the repository at this point in the history

  2. Check for unsaved ROIs before changing Z/T or projection

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    e4d4d20 View commit details
    Browse the repository at this point in the history

  3. Re-order app.css styles to improve readability

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    e93131b View commit details
    Browse the repository at this point in the history

  4. Remove unnecessary .regions-list2 div

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    f7b9258 View commit details
    Browse the repository at this point in the history

  5. Fix display of 'Loading Regions...'

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    d4f53c9 View commit details
    Browse the repository at this point in the history

  6. Reset pagination when moving to new Z/T plane

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    29cf2f9 View commit details
    Browse the repository at this point in the history

  7. Use <input> for roi_page_number to allow direct editing

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    2b05d30 View commit details
    Browse the repository at this point in the history

  8. Missing css for .roi_page_number

    @will-moore
    will-moore committed Feb 12, 2019
    Configuration menu
    Copy the full SHA
    7e01929 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2019

  1. Disable colourpickers and other edit buttons while loading ROIs

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    9eccfed View commit details
    Browse the repository at this point in the history

  2. Fix scrollContainer() to ROI in table after css changes

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    6a91246 View commit details
    Browse the repository at this point in the history

  3. Check for unsavedROIs on T/Z click of < and > buttons

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    8feb39f View commit details
    Browse the repository at this point in the history

  4. Reset regions_info.selected_shapes to [] on reload 

    This fixes disabled ROI edit buttons because selected_shapes.length > 0 but shape was from
previous page of ROIs so canEdit etc was false
    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    0753e47 View commit details
    Browse the repository at this point in the history

  5. Disable drawing tools Rect, Ellipse etc while regions_info.is_pending

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    8a7acf9 View commit details
    Browse the repository at this point in the history

  6. Z/T attachment controls show disabled status better

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    9b49c46 View commit details
    Browse the repository at this point in the history

  7. Many calls to requestData(true), last one will be respected 

    This should keep the regions data in sync with image_info Z and T index since we keep making
requestData calls until no more requestData calls happend while is_pending.
    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    b7b7ce0 View commit details
    Browse the repository at this point in the history

  8. Rename variable image_config.is_movie_playing

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    a29b1d6 View commit details
    Browse the repository at this point in the history

  9. Don't load ROIs while movie playing

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    2228690 View commit details
    Browse the repository at this point in the history

  10. pagination limit is not more than api_settings.API_MAX_LIMIT

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    ad91503 View commit details
    Browse the repository at this point in the history

  11. Add omero config set omero.web.iviewer.roi_page_size

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    ab7b22a View commit details
    Browse the repository at this point in the history

  12. Fix merge conflict from previous commit

    @will-moore
    will-moore committed Feb 13, 2019
    Configuration menu
    Copy the full SHA
    ded26c2 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2019

  1. Fix ROI table width in IE

    @will-moore
    will-moore committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    bb7e5c5 View commit details
    Browse the repository at this point in the history

  2. CSS tweaks to ROI table

    @will-moore
    will-moore committed Feb 18, 2019
    Configuration menu
    Copy the full SHA
    a0be5cf View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2019

  1. Load ROIs for selected image in multi-view mode if ROI tab selected

    @will-moore
    will-moore committed Feb 19, 2019
    Configuration menu
    Copy the full SHA
    42f5d68 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2019

  1. Don't request ROIs if image_info not ready

    @will-moore
    will-moore committed Feb 21, 2019
    Configuration menu
    Copy the full SHA
    1e152ff View commit details
    Browse the repository at this point in the history