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

Various fixes #23

Merged
merged 4 commits into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public CompletableFuture<Optional<BufferedImage>> getOrphanedFolderIcon() {
* <p>This function is asynchronous.</p>
*
* @param id the OMERO image ID
* @param size the max width and max height the thumbnail should have
* @param size the max width and max height the thumbnail should have
* @return a CompletableFuture with the thumbnail, or an empty Optional if an error occurred
*/
public CompletableFuture<Optional<BufferedImage>> getThumbnail(long id, int size) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,8 @@ public PixelAPI fromString(String string) {
} else {
owner.getItems().addAll(group.getSelectionModel().getSelectedItem().getOwners());
}
owner.getSelectionModel().select(client.getServer().getDefaultOwner().orElse(Owner.getAllMembersOwner()));owner.setConverter(new StringConverter<>() {
owner.getSelectionModel().select(client.getServer().getDefaultOwner().orElse(Owner.getAllMembersOwner()));
owner.setConverter(new StringConverter<>() {
@Override
public String toString(Owner object) {
return object == null ? "" : object.getFullName();
Expand Down Expand Up @@ -475,15 +476,17 @@ private void setUpListeners() {
browserModel.getSelectedGroup().addListener((p, o, n) -> {
owner.getItems().clear();

if (n != null) {
if (n == null) {
owner.getSelectionModel().select(null);
} else {
if (n.equals(Group.getAllGroupsGroup())) {
owner.getItems().addAll(client.getServer().getOwners());
owner.getSelectionModel().select(Owner.getAllMembersOwner());
} else {
owner.getItems().addAll(n.getOwners());
owner.getSelectionModel().selectFirst();
}
}

owner.getSelectionModel().selectFirst();
});
browserModel.getSelectedGroup().bind(group.getSelectionModel().selectedItemProperty());
browserModel.getSelectedOwner().bind(owner.getSelectionModel().selectedItemProperty());
Expand Down
5 changes: 5 additions & 0 deletions src/test/resources/omero-web/installPixelBufferMs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@
cd /
tar -xvkf /tmp/OMERO.tar.gz

# See https://stackoverflow.com/a/78693402
# This should be needed as long as the base image is the deprecated CentOS7
sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*

# Build the pixel buffer microservice
yum install git java-devel -y
git clone https://github.com/glencoesoftware/omero-ms-pixel-buffer
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ docker run -d \
-e ROOTPASS=password \
-p 4064:4064 \
--privileged \
--platform linux/x86_64 \
--mount type=bind,src=$SCRIPT_DIR"/omero-server",target=/resources \
openmicroscopy/omero-server

Expand Down