Spw grid view (Insight) #4874
Spw grid view (Insight) #4874
Conversation
|
When the field view is always shown, we could remove the "Field View" button in the tool bar, as well as the "Field view" related code in the DataBrowser, right? The Databrowser is quite complex anyway, would be nice to get rid off some unnecessary code. /cc @jburel |
|
Also enabled the old Fields View (see above screenshot) again, so for testing, make sure that also still works. |
dominikl
force-pushed
the
spw_grid_view
branch
from
b4f49d8
to
aa3bdfa
Compare
| */ | ||
| public WellSampleNode getNode(Point p) { | ||
| Component c = findComponentAt(p); | ||
| if (c != null && c instanceof FieldDisplay) { |
|
Compared to Web, you do not have the Well shown in the RHP when well is clicked. |
|
Compared to Web, I do not have any possiblity to zoom out in the lower panel (where the fields are). This makes the lower panel unusable (by default, the Fields come huge. Note that the control slider in the screenshot regulates the TOP panel only. |
|
After discussion with @dominikl : the comment #4874 (comment) is touching upon the "relict" feature of Insight, the dropdown menu Field #1 etc. There is this remnant feature with dropdown menu and icon present in Insight which there was not in Web. The situation is complicated by the Web PR not being in the build (why?), so we cannot even compare. |
|
Stopping testing this until #4874 (comment) is resolved. |
|
After discussion with @will-moore :
|
|
#4874 (comment) sorry for missing comment |
|
Due to the number of fields in some plates (e.g.700) the interaction with menu needs to be carefully tested in both clients @pwalczysko |
|
Insight handles well 700 fields performance-wise (takes 15-30 sec to upload the 700 fields to the bottom pane. Web - still waiting for inclusion of the PR into merge. Re: Insight and 700 fields - it is obvious that the fields are not well labeled, I cannot see the Field number there. We think we should take the approach of Web, having the Well number at the begininng of the row only.
|
|
Bug: Select a plate with 6 wells and some 40 fields per well. ID 1805 user-4 on eel merge for example. |
|
RFE: Do not hide the other rows in bottom panel if one field of one row is clicked.
Suggest: adjust the behaviour to web. |
|
RFE: Show thumbs as they are coming.
Suggest: If the speed cannot be improved, take from web the tactics of showing the thumbs "as they come" which improves the waiting experience remarkably. |
|
If I remember correctly: the loading strategy at the time of implementation was to load all the fields before display. |
|
Please reverse the large thumbnails for normal datasets by default and also for plates by default as per #4850 (comment). |
dominikl
force-pushed
the
spw_grid_view
branch
from
9a595d8
to
242ad7f
Compare
| * @param well | ||
| * Pass <code>true</code> if this {@link WellSampleNode} | ||
| * represents the well, <code>false</code> if it represents the | ||
| * {@link WellSampleData} (ie field) |
| WellsModel wm = (WellsModel) model; | ||
|
|
||
| List<WellSampleNode> wells = wm.getSelectedWells(); | ||
| if (wells == null || wells.isEmpty()) |
There was a problem hiding this comment.
CollectionUtils.isEmpty(wells) could be used
| if (!(this instanceof WellsModel)) | ||
| return false; | ||
| Point p = new Point(row, column); | ||
| List<Point> l = new ArrayList<Point>(1); |
There was a problem hiding this comment.
List<Point> l = Arrays.asList(p); could be used
| view.setFieldMagnificationFactor(v); | ||
| else | ||
| view.setMagnificationFactor(v); | ||
| int value = (int) (v*FACTOR); |
There was a problem hiding this comment.
maybe introduced a method to reset the value. Same code line 143
to reset the slider value
| buildGUI(true); | ||
| } | ||
|
|
||
| /** | ||
| * Check's if the browser currently deals with wells |
|
|
||
| /** | ||
| /** |
There was a problem hiding this comment.
need to keep authors. need to add you details to the list
| boolean selectionChanged = false; | ||
| Set<Long> ids = new HashSet<Long>(); | ||
| for (WellSampleNode well : wells) { | ||
| if(!well.isWell()) |
| nodes = new ArrayList<WellSampleNode>(); | ||
| List<String> titles = new ArrayList<String>(); | ||
| for (WellSampleNode well : wells) { | ||
| if(!well.isWell()) |
| * @return See above. | ||
| */ | ||
| WellImageSet getSelectedWell() | ||
| WellSampleNode getSelectedWell() |
There was a problem hiding this comment.
CollectionUtils.isEmpty could be used
| if (wis.getRow() == row && wis.getColumn() == column) { | ||
| setSelectedWell(wis); | ||
| Point targetField = null; | ||
| for(Point p : fields) { |
dominikl
force-pushed
the
spw_grid_view
branch
from
bca7306
to
bc8cdac
Compare
|
@jburel - 10.0.51.106 |
|
Did you delete the data or create a new user? nothing under root |
|
@jburel - created new user user-1/ome and imported some data. |
|
Thanks for info |
| handle = hiBrwView.loadThumbnails(ctx, images, | ||
|
|
||
| Collection<DataObject> imgs = new ArrayList<DataObject>(); | ||
| for(ImageData i : images.values()) |
|
minor point: having the spinner next to the loading text might be more obvious but only if easy to lay out |
| boolean complete = result.size() == images.values().size(); | ||
|
|
||
| Point well = null; | ||
| for(Point p : images.keys()) { |
|
|
||
| EXIT: | ||
| for (WellSampleNode w : wells) { | ||
| if(w.isWell()) { |
| @@ -32,11 +32,15 @@ | |||
| import javax.swing.JLabel; | |||
| import javax.swing.JPanel; | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
// Third-party etc.
could be removed
| @@ -0,0 +1,453 @@ | |||
| /* | |||
| * org.openmicroscopy.shoola.agents.dataBrowser.view.WellFieldsCanvas | |||
| */ | ||
| public WellSampleNode getNode(Point p) { | ||
| Component c = findComponentAt(p); | ||
| if (c != null && c instanceof FieldDisplay) { |
| @@ -2,10 +2,10 @@ | |||
| * org.openmicroscopy.shoola.agents.dataBrowser.view.WellFieldsCanvas | |||
| * | |||
| *------------------------------------------------------------------------------ | |||
| * Copyright (C) 2006-2009 University of Dundee. All rights reserved. | |||
| * Copyright (C) 2006-2016 University of Dundee. All rights reserved. | |||
| @@ -2,7 +2,7 @@ | |||
| * org.openmicroscopy.shoola.agents.dataBrowser.view.DataBrowserWellToolBar | |||
| * | |||
| *------------------------------------------------------------------------------ | |||
| * Copyright (C) 2006-2008 University of Dundee. All rights reserved. | |||
| * Copyright (C) 2006-2016 University of Dundee. All rights reserved. | |||
There was a problem hiding this comment.
line 2 should be removed i.e. org.openmicroscopy etc.
| @@ -36,13 +38,18 @@ | |||
| import javax.swing.JPanel; | |||
| import javax.swing.JToggleButton; | |||
| import javax.swing.JToolBar; | |||
| import javax.swing.event.ChangeEvent; | |||
| import javax.swing.event.ChangeListener; | |||
|
|
|||
| //Third-party libraries | |||
| import org.jdesktop.swingx.JXBusyLabel; | |||
| @@ -2,7 +2,7 @@ | |||
| * org.openmicroscopy.shoola.agents.dataBrowser.view.PlateGridUI | |||
| * | |||
| *------------------------------------------------------------------------------ | |||
| * Copyright (C) 2006-2010 University of Dundee. All rights reserved. | |||
| * Copyright (C) 2006-2016 University of Dundee. All rights reserved. | |||
| //Third-party libraries | ||
| import info.clearthought.layout.TableLayout; | ||
|
|
||
|
|
||
| import org.apache.commons.collections.CollectionUtils; |
| @@ -1379,6 +1379,12 @@ public void setSelectedNodes(Object nodes) | |||
| if (selection == null || selection.size() == 0) return; | |||
There was a problem hiding this comment.
Could also be replaced by CollectionUtils.isempty
|
few comments on code |
|
@dominikl: Thanks. |
|
I'll also move the "busy" icon next to the "Loading..." label, should be easy to change the layout. |
|
Review: Just check the layout (text and busy icon) of the metadata |
|
Tested with OMERO.insight-5.3.0-m4-891-929ae02-ice36-b484-win eel user-3. Loading with spinner and Preview not available text showing as expected in Preview tab of RHP. |
|
Thanks Merging |
What this PR does
Corresponding Insight PR to #4863
Limitations:
Test
See the according Web PR above, make sure Insight basically does the same.