Spw grid view2 #4924

will-moore · 2016-11-03T14:26:56Z

Spatial view of fields in Wells

2nd PR working towards ome/design#52
Builds on #4863

Also see https://trello.com/c/GxqDnD0P/211-spw-follow-up

To test:

Browse SPW, click on Well. Well 'bird's eye' spatial view should open below tree.
Selecting images in central lower panel should highlight these in bird's eye view.
Selecting images in bird's eye by clicking / shift-clicking or dragging should highlight same images in central lower panel and right panel.
Bird's eye panel will stay open until X in top right corner is clicked.
Will be shown again when Well is clicked.
Enter a value in the "Wrap [ ] images per row" field. On 'Enter' this should wrap the images in each well below. Should also wrap any new wells loaded.
Remove wrapping by clearing the input (or enter 0).

TODO:

integration tests for posX and posY

jburel · 2016-11-03T22:15:25Z

gh-4863 has been merged
so better to add your commits on top of develop so we can follow what's going on

will-moore · 2016-11-04T11:11:22Z

Data generated with script from dsudar/OMEROscripts#1

gusferguson · 2016-11-08T11:08:49Z

@will-moore

Tested using http://10.0.51.106/web/webclient/userdata/?experimenter=2 user-1 jpeg-xr group Safari

2007.10.17.17.04.55.xdce
Plate ID: 2
Owner: user 1

and other data.

Birdseye view shows spatial arrangement of fields when selected.

In the birdseye shift-click for multi selection does not work in Safari/Firefox/Chrome but cmd-click and click-drag both work.

All highlighting appears appropriate.
Small point - highlighting around image/field thumbnails in bottom half of centre pane is not really prominent enough - difficult to see which thumbnails are highlighted - particularly when non-adjacent multiple selections are made via birdseye. Could it be made darker or thickness increased?
Birdsye closes and reappears as expected.

Wrapping of thumbnails in well rows behaves as expected.
Did have single episode where clicked into wrap text box and incremented using ^ arrow on right side - cursor became trapped in wrap text box -and could select images and wells in centre pane, but could not select images in birdseye. Freed up on clicking to another well and could not replicate subsequently so must some issues between wrapping text box and birdseye view - but cannot be more helpful in pinning it down..

Could we reduce or remove the corner rounding on the wrap text box? - because it is so short it looks oval

All other functionality works as expected.

Good to merge from my POV.

atarkowska · 2016-11-10T09:18:01Z

Robots are failing in https://ci.openmicroscopy.org/view/Failing/job/OMERO-DEV-merge-robotframework/438/console. Where does wsScript.py come from exactly?

will-moore · 2016-12-06T09:37:38Z

Robot test passing at https://ci.openmicroscopy.org/view/Failing/job/OMERO-DEV-merge-robotframework/464/robot/Web%20&%20Web/Web_1/Show%20Test/Test%20Show%20Plate/

gusferguson · 2016-12-06T09:57:29Z

@will-moore

Tested using http://web-dev-merge.openmicroscopy.org/webclient/ user-5 and user-1

Behaves as expected.
No issues apparent.

Good to merge.

snoopycrimecop · 2016-12-09T03:33:04Z

Conflicting PR. Removed from build OMERO-DEV-merge-push#532. See the console output for more details.
Possible conflicts:

PR filter rating #4694 will-moore 'filter rating'
- components/tests/ui/resources/web/tree.txt

jburel · 2016-12-14T14:38:46Z

components/tests/ui/robot_setup.sh

@@ -45,6 +47,34 @@ echo "A2,Treatment,10" >> "$BULK_ANNOTATION_CSV"
 # Create file for upload as File Annotation
 echo "Robot test file annotations" > "$FILE_ANNOTATION"

+# Create a python script for setting posX and posY on wellsamples
+# Used below after importing a plate
+WELLSCRIPT="wsScript.py"


It will be better to have the script in a separate file so it is easier to understand and potentially re-use if need be

jburel · 2016-12-14T14:43:14Z

components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css

+#wellImages li {
+    display: inline-block;
+}
+#wellImages ul,  #wellImages h1{


jburel · 2016-12-14T14:45:53Z

few minor comments
spacial to change in few places

will-moore · 2016-12-14T16:13:34Z

Check typos and check robot tests (spw_test).

jburel · 2016-12-15T10:41:57Z

components/tests/ui/testcases/web/spw_test.txt

@@ -71,7 +71,7 @@ Test Spw Grid Layout
    Should Be Equal                         ${well1x}                   ${well5x}


-Test Spw Spacial Birds Eye
+Test Spw Spatial Birds Eye
    [Documentation]     Tests layout and clicking of 'spacial bird's eye' panel


one more spacial 'spacial bird's

jburel · 2016-12-15T10:45:38Z

one more typo.
Thanks for extracting the script
the robot tests were not run today due to server being down
Check the output of the test before merging due to the change in testing set-up

If we have more scripts required for testing, we may want to create a scripts repo under resources

path to script

Remove extra ")"

jburel · 2016-12-22T06:56:51Z

The commits above fix the setup issue. Other failures in the robot tests.

will-moore · 2017-01-05T13:32:29Z

Show test and SPW test are now passing.
https://ci.openmicroscopy.org/view/Failing/job/OMERO-DEV-merge-robotframework/489/robot/

atarkowska · 2017-01-06T17:43:24Z

components/tools/OmeroWeb/omeroweb/webclient/templates/webclient/base/base_container.html

@@ -179,6 +183,7 @@
        // jsTree code in ome.tree.js and center panel code in center_plugin.thumbs.js.html uses initially_select
        // instead of browser URL since URL may be /webclient/?path=plate.name-barcode|well.name-A1
        WEBCLIENT.initially_select = [{% for o in initially_select %}"{{ o }}"{% if not forloop.last %},{% endif %}{% endfor %}];
+        WEBCLIENT.initially_open = [{% for o in initially_open %}"{{ o }}"{% if not forloop.last %},{% endif %}{% endfor %}];


As discussed recently, constructing array this way is inconvenient, see #5018

atarkowska · 2017-01-06T21:24:55Z

@will-moore is this PR ready to be merged? Either could you please cherry-pick #5018 here or let's merge and I will fix the above in my PR. It is the only way I managed to pass non digits.

will-moore · 2017-01-08T00:05:47Z

I think this is good to merge now, with the robot tests passing.
I'd prefer to review #5018 separately instead of making this PR even more complex.
cc @jburel

will-moore closed this Nov 3, 2016

will-moore reopened this Nov 3, 2016

jburel added the develop label Nov 3, 2016

will-moore added 8 commits November 3, 2016 23:54

Add 'position' data to WellImages_json

503931d

Move scripts from plate.html to base_container - remove duplicates

8be63de

Move functions from plate.html to spwgridview.js

7bf5a41

Basic display of images in well bird's eye view

e344a45

Sync selection of images in well birds eye

c66cd64

Improving Well birds eye view

b2aebd1

More fixes and tweaks to well_birds_eye

e7b7931

Hide well_birds_eye on click X

81ced05

will-moore force-pushed the spw_grid_view2 branch from a9b5b9a to 81ced05 Compare November 3, 2016 23:55

will-moore closed this Nov 4, 2016

will-moore reopened this Nov 4, 2016

will-moore added 7 commits November 4, 2016 13:33

Fix height of center panel .tableLayout

f76910f

Move styles from plate.html to layout.css

f5aea1e

Adding 'Wrap x images per row' functionality

93fd99e

Robot setup populates posX and posY on WellSamples

8c71a61

Fix PYTHONPATH for wellSample posXY script in robot_setup.sh

a134fa3

Robot tests grid layout of well-images

6232966

robot test typo fix

abc5d85

will-moore added 5 commits November 10, 2016 22:54

robot_setup passes 'host' and 'port' to BlitzGateway in wsScript.py

7ef9233

Increase select highlight width around well images

7518e2a

Handle ?show=image-1 to select well and image

b08bcce

Add test of listwellimages json with posX & posY

b92a649

Adding to robot 'Test Spw Grid Layout' test

0929ac9

will-moore reopened this Dec 5, 2016

snoopycrimecop mentioned this pull request Dec 12, 2016

Filter rating robot tests #4990

Merged

jburel reviewed Dec 14, 2016

View reviewed changes

will-moore added 3 commits December 14, 2016 16:05

Moving robot_setup.sh wsScript.py -> well_sample_posXY.py

9d506e6

Add Usage docstring to well_sample_posXY.py

162890d

Typo fixes

338cac4

will-moore closed this Dec 14, 2016

will-moore reopened this Dec 14, 2016

jburel reviewed Dec 15, 2016

View reviewed changes

will-moore added a commit to will-moore/openmicroscopy that referenced this pull request Dec 15, 2016

Minor edit to fix merge conflict with PR ome#4924

22139a7

jburel and others added 4 commits December 19, 2016 16:27

Change path to script.

e0cd29a

Merge pull request #55 from jburel/spw_grid_view2

c0eb788

path to script

Remove extra ")"

fce8a2e

Merge pull request #56 from jburel/spw_grid_view2

901733d

Remove extra ")"

snoopycrimecop mentioned this pull request Jan 6, 2017

Allow non digits (rebased onto develop) #5018

Merged

atarkowska reviewed Jan 6, 2017

View reviewed changes

jburel merged commit 1c7dff9 into ome:develop Jan 8, 2017

jburel added this to the 5.3.0 milestone Mar 29, 2017

will-moore deleted the spw_grid_view2 branch February 18, 2019 04:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Spw grid view2 #4924

Spw grid view2 #4924

will-moore commented Nov 3, 2016 •

edited

jburel commented Nov 3, 2016

will-moore commented Nov 4, 2016

gusferguson commented Nov 8, 2016

atarkowska commented Nov 10, 2016 •

edited

will-moore commented Dec 6, 2016

gusferguson commented Dec 6, 2016

snoopycrimecop commented Dec 9, 2016

jburel Dec 14, 2016

jburel Dec 14, 2016

jburel commented Dec 14, 2016 •

edited

will-moore commented Dec 14, 2016

jburel Dec 15, 2016

jburel commented Dec 15, 2016

jburel commented Dec 22, 2016

will-moore commented Jan 5, 2017

atarkowska Jan 6, 2017 •

edited

atarkowska commented Jan 6, 2017 •

edited

will-moore commented Jan 8, 2017

Spw grid view2 #4924

Spw grid view2 #4924

Conversation

will-moore commented Nov 3, 2016 • edited

Spatial view of fields in Wells

jburel commented Nov 3, 2016

will-moore commented Nov 4, 2016

gusferguson commented Nov 8, 2016

atarkowska commented Nov 10, 2016 • edited

will-moore commented Dec 6, 2016

gusferguson commented Dec 6, 2016

snoopycrimecop commented Dec 9, 2016

jburel Dec 14, 2016

Choose a reason for hiding this comment

jburel Dec 14, 2016

Choose a reason for hiding this comment

jburel commented Dec 14, 2016 • edited

will-moore commented Dec 14, 2016

jburel Dec 15, 2016

Choose a reason for hiding this comment

jburel commented Dec 15, 2016

jburel commented Dec 22, 2016

will-moore commented Jan 5, 2017

atarkowska Jan 6, 2017 • edited

Choose a reason for hiding this comment

atarkowska commented Jan 6, 2017 • edited

will-moore commented Jan 8, 2017

will-moore commented Nov 3, 2016 •

edited

atarkowska commented Nov 10, 2016 •

edited

jburel commented Dec 14, 2016 •

edited

atarkowska Jan 6, 2017 •

edited

atarkowska commented Jan 6, 2017 •

edited