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.

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

Split view 10094 #960

Merged
merged 22 commits into from Mar 28, 2013
Merged

Split view 10094 #960

merged 22 commits into from Mar 28, 2013

Conversation

will-moore
Copy link
Member

This PR was originally opened before the 4.4.6 release as #610, but postponed 'till after release.

NB: One extra feature since the previous PR & testing is the ability to re-order the figure rows, via drag and drop.

Will Moore added 21 commits January 15, 2013 13:51
It was inconsistent to have the first key:value pair be ...key & ...value and then
have ...key1 & ...value1 etc. Now, the first ones are ...key0 and ...value0.
Also update the grey panels code (channels not in merged appear grey in split columns)
Conflicts:
	components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/dusty.css
	components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css
	components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/annotations/metadata_general.html
@will-moore
Copy link
Member Author

@joshmoore One question I have with this PR is how to prepare for the move to develop: There is a merge commit: 75b7227 because the original branch started before a bunch of FS-related UI changes and the cleanest way to fix conflicts was via a merge. However, I'm struggling to port the merge commit over to develop, even though I have created a similar 'original' branch to match the original branch in dev_4_4.

Can you remind me / point me to the branches that are in develop but NOT in dev_4_4? Since my dev_4_4 and develop merges should be identical, apart from whats in those branches. Cheers.

@joshmoore
Copy link
Member

The PRs which have been marked as not applicable to dev_4_4 are:

git log --pretty="%h %s %ar -- %N --" --first-parent --notes=see_also/dev_4_4 origin/develop | grep 'n/a' | grep will-moore
a2ca063 Merge pull request #790 from will-moore/Delete_by_fileset 4 weeks ago -- n/a
a2ade0d Merge pull request #787 from will-moore/Disable_Chgrp 4 weeks ago -- n/a

Those left open are:

$ scc unrebased-prs dev_4_4 develop
...
****************************************************************************************************
PRs on develop without note for dev_4_4
****************************************************************************************************
9b0924c Merge pull request #892 from mtbc/make-sha1-optional 29 hours ago
389a6fe Merge pull request #881 from mtbc/trac-10372 5 days ago
20dc0f0 Merge pull request #754 from joshmoore/10216-files 5 weeks ago
19cf1f1 Merge pull request #634 from will-moore/big_images_FS_9701 6 weeks ago
40e54cf Merge pull request #744 from joshmoore/assumeng-update 6 weeks ago
f533234 Merge pull request #736 from bpindelski/assumeng-blitz 6 weeks ago
94b23d7 Merge pull request #698 from bpindelski/eclipse-fix-v2 7 weeks ago
3c4ffef Merge pull request #630 from melissalinkert/9711 9 weeks ago

NB: To have access to the notes locally, you'll need to run git fetch origin refs/notes/*:refs/notes/*

@bpindelski
Copy link

In general looks ok. The drag and drop functions as expected. Two minor issues:

  • long channel or image names will overlap
    Split_View_Figure
  • (more general) the slider for zooming (both in split view figure window and in the image browser window) has a strange delay in Chrome, Safari and Opera. It works without any delay in Firefox.
  • dusty.css has a Git merge conflict marker. Please remove.

Besides that looks good to merge.

@jburel
Copy link
Member

jburel commented Mar 27, 2013

@will-moore: if you can handle the long name in that PR, that will be good

@will-moore
Copy link
Member Author

The long name issue should be dealt with by the script itself (different repo / PR). I'll tidy the dusty.css conflict comment. Just discussed the slider issue: this is very minor and outside the scope of this PR.

@bpindelski
Copy link

Looks good to merge.

jburel added a commit that referenced this pull request Mar 28, 2013
@jburel jburel merged commit 7a88264 into ome:dev_4_4 Mar 28, 2013
@gusferguson
Copy link

@will-moore
Tested on gretzky user-5 read-write-1

Ran script on .dv and .png images.
UI - had issue with interacting with figure
Could not place title or affect order of images.
The up-down arrow to the left of the title does not appear to be active.
Drag and drop of images did not work.
All other parameters appeared to be adjustable although affect on output could not be determined.
See first screenshot.
After running script, appeared to be successful in Activities window.
Figure appears to be attached to image.
Attempting to view or download image resulted in page with:
Unhandled Exception
An unhandled exception was thrown by the application.
Attempts to trace error using Firefox debugging gave no useful results.
See screenshot 2.

Do you want a ticket for this?

Screenshot 1:

Screenshot split view 1

Screenshot 2:

Screenshot split view 2

@will-moore will-moore deleted the split_view_10094 branch March 29, 2013 14:36
@will-moore
Copy link
Member Author

The bug with retrieving the script output (attached file) has also been noticed ome/omero-scripts#23
but no ticket created yet.

The drag-handle shouldn't do anything if you only have 1 row, since there's no re-ordering to be done. Not sure how you managed to drag the images like that - I couldn't reproduce just now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants