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

Insight import location #536

Merged
merged 82 commits into from
Jan 18, 2013
Merged

Insight import location #536

merged 82 commits into from
Jan 18, 2013

Conversation

scottlittlewood
Copy link
Contributor

Extract the location dialog and improve the UI & code base. Make Project / Screen selection more obvious.

@scottlittlewood
Copy link
Contributor Author

Ready for some testing, check that functionality hasn't been broken / changed.

@jburel
Copy link
Member

jburel commented Dec 10, 2012

@scottlittlewood;

  • Group selection box takes a lot of space. The layout should be reviewed.
  • After switching to another group, I could not add the image.

@scottlittlewood
Copy link
Contributor Author

@jburel Testing the switching of users has highlighted that the event fired is not consumed by the importer code and so the groups are out of synch.

@scottlittlewood
Copy link
Contributor Author

When running as standalone the view and model are discarded and the Importer UI disappears

@scottlittlewood
Copy link
Contributor Author

The ImporterComponent is discarding the view and model and is not being created again so the UI is not showing.

…er agent

The ImporterAgent is now aware how it is started up (master / embedded mode) allowing for us to refresh the application when a user switch is performed.
@scottlittlewood
Copy link
Contributor Author

@jburel The lastest commits should resolve the issues regarding switching users in Importer standalone and embedded in Insight modes

@jburel
Copy link
Member

jburel commented Jan 14, 2013

@scottlittlewood: last commit

+import org.openmicroscopy.shoola.agents.treeviewer.TreeViewerAgent;
Should be replaced by the ImporterAgent

@jburel
Copy link
Member

jburel commented Jan 14, 2013

@scottlittlewood:

setInputsEnabled(false);
EditorDialog editor = new EditorDialog(owner,
newDataObject, false);
editor.addPropertyChangeListener(this);
editor.setModal(true);
UIUtilities.centerAndShow(editor);

                setInputsEnabled(true);

Modify the flag of the controls is not necessary. The problem is when you switch between group that when the change should happen.

@jburel
Copy link
Member

jburel commented Jan 14, 2013

@scottlittlewood: PR opened to fix the previous comment.

Set enabled flag when switching group.
@jburel
Copy link
Member

jburel commented Jan 15, 2013

@scottlittlewood: The rest looks good. Standalone works as expected. Just the minor change mentioned in previous comment.

@scottlittlewood
Copy link
Contributor Author

@jburel Resolved the state checking of the model following your advice. Cleaned up the imports too as I noticed one was unused.

@jburel
Copy link
Member

jburel commented Jan 17, 2013

@scottlittlewood: I found the following error

java.lang.Exception: Abnormal termination due to an uncaught exception.
java.lang.NullPointerException
    at java.util.Hashtable.get(Hashtable.java:334)
    at org.openmicroscopy.shoola.agents.fsimporter.chooser.LocationDialog.populateLocationComboBoxes(LocationDialog.java:1144)

To reproduce:

  • Log in as user 1
  • open importer
  • switch user. Select user 2
  • Open the importer. Play with Location selection. Close it
  • Go to datamanager
  • Right click on dataset and click import. The error happens.

@scottlittlewood
Copy link
Contributor Author

@jburel I think this only occurs when attempting to directly import in to a Project, not a dataset. The Type check error commit above should fix this as I was able to recreate the issue by reverting the code and attempting to import in to a project.

@jburel
Copy link
Member

jburel commented Jan 17, 2013

@scottlittlewood: selecting a project is a case that we should handle since we can import folder directly as dataset.

@jburel
Copy link
Member

jburel commented Jan 18, 2013

@scottlittlewood: the remaining issues have been fixed. ready to go.

jburel added a commit that referenced this pull request Jan 18, 2013
@jburel jburel merged commit f70c33c into ome:dev_4_4 Jan 18, 2013
@joshmoore
Copy link
Member

Just as a summary, I thought I'd add a screenshot of the new version. Few minor comments, but assume those can happen elsewhere.

image

@jburel
Copy link
Member

jburel commented Jan 18, 2013

@joshmoore, @scottlittlewood: Yes few things to be done but they will happen in another PR. Fixed some major usability issues (especially when using to import p/d/i and screens)

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.

3 participants