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

Spw grid view2 #4924

Merged
merged 42 commits into from
Jan 8, 2017
Merged

Spw grid view2 #4924

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
503931d
Add 'position' data to WellImages_json
will-moore Oct 19, 2016
8be63de
Move scripts from plate.html to base_container - remove duplicates
will-moore Oct 26, 2016
7bf5a41
Move functions from plate.html to spwgridview.js
will-moore Oct 26, 2016
e344a45
Basic display of images in well bird's eye view
will-moore Oct 27, 2016
c66cd64
Sync selection of images in well birds eye
will-moore Oct 27, 2016
b2aebd1
Improving Well birds eye view
will-moore Nov 2, 2016
e7b7931
More fixes and tweaks to well_birds_eye
will-moore Nov 3, 2016
81ced05
Hide well_birds_eye on click X
will-moore Nov 3, 2016
f76910f
Fix height of center panel .tableLayout
will-moore Nov 4, 2016
f5aea1e
Move styles from plate.html to layout.css
will-moore Nov 4, 2016
93fd99e
Adding 'Wrap x images per row' functionality
will-moore Nov 4, 2016
8c71a61
Robot setup populates posX and posY on WellSamples
will-moore Nov 4, 2016
a134fa3
Fix PYTHONPATH for wellSample posXY script in robot_setup.sh
will-moore Nov 7, 2016
6232966
Robot tests grid layout of well-images
will-moore Nov 7, 2016
abc5d85
robot test typo fix
will-moore Nov 7, 2016
7ef9233
robot_setup passes 'host' and 'port' to BlitzGateway in wsScript.py
will-moore Nov 10, 2016
7518e2a
Increase select highlight width around well images
will-moore Nov 14, 2016
b08bcce
Handle ?show=image-1 to select well and image
will-moore Nov 14, 2016
b92a649
Add test of listwellimages json with posX & posY
will-moore Nov 14, 2016
0929ac9
Adding to robot 'Test Spw Grid Layout' test
will-moore Nov 15, 2016
b5c4988
Fix ?show=well-1 showing Well in right panel
will-moore Nov 15, 2016
90d3124
flake8 fix
will-moore Nov 15, 2016
5335598
Robot test for 'Show Well Images'
will-moore Nov 15, 2016
c1e8c64
Added new robot 'Test Spw Spacial Birds Eye'
will-moore Nov 15, 2016
1ceebdc
Filter listWellImages by 'run'
will-moore Nov 18, 2016
46b0b1b
Pass acquisition/run to listWellImages url
will-moore Nov 18, 2016
80377b6
Robot tests plate has 2 acquisitions
will-moore Nov 18, 2016
9b30c26
Fix xPos, yPos -> x_pos, y_pos in test_plategrid.py
will-moore Nov 24, 2016
2c202ba
Typo fixes
will-moore Nov 24, 2016
05915ac
Don't try to 'show' multiple Wells in show._initially_select
will-moore Dec 2, 2016
51f58be
Revert "Don't try to 'show' multiple Wells in show._initially_select"
will-moore Dec 2, 2016
18b17f6
Use both show.initially_open and show.initially_select
will-moore Dec 2, 2016
acf7400
Fix robot test
will-moore Dec 2, 2016
570e2d7
When ?show=well-1 only show Well when plate first loaded
will-moore Dec 2, 2016
7fdbe52
Merge remote-tracking branch 'origin/develop' into spw_grid_view2
will-moore Dec 5, 2016
9d506e6
Moving robot_setup.sh wsScript.py -> well_sample_posXY.py
will-moore Dec 14, 2016
162890d
Add Usage docstring to well_sample_posXY.py
will-moore Dec 14, 2016
338cac4
Typo fixes
will-moore Dec 14, 2016
e0cd29a
Change path to script.
jburel Dec 19, 2016
c0eb788
Merge pull request #55 from jburel/spw_grid_view2
Dec 19, 2016
fce8a2e
Remove extra ")"
jburel Dec 20, 2016
901733d
Merge pull request #56 from jburel/spw_grid_view2
Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/tests/ui/testcases/web/spw_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one more spacial 'spacial bird's


Select Experimenter
Expand All @@ -83,7 +83,7 @@ Test Spw Spacial Birds Eye
Wait Until Page Contains Element xpath=//div[@id='well_birds_eye']//img
Xpath Should Match X Times //div[@id='well_birds_eye']//img ${FIELD_COUNT}

# Spacial layout: x and y
# Spatial layout: x and y
${well1x}= Get Horizontal Position xpath=//div[@id='well_birds_eye']//img[1]
${well2x}= Get Horizontal Position xpath=//div[@id='well_birds_eye']//img[2]
${well3x}= Get Horizontal Position xpath=//div[@id='well_birds_eye']//img[3]
Expand Down
2 changes: 1 addition & 1 deletion components/tools/OmeroWeb/omeroweb/webclient/static/webclient/css/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2216,7 +2216,7 @@ div.paging input.button_pagination {
#wellImages li {
display: inline-block;
}
#wellImages ul, #wellImages h1{
#wellImages ul, #wellImages h1 {
margin: 5px;
}
#wellImages .ui-selected {
Expand Down