Merge pull request #23 from qupath/various-fixes

Various fixes
qupath · Sep 12, 2024 · 876dca6 · 876dca6
2 parents a118e30 + 87702d4
commit 876dca6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/main/java/qupath/ext/omero/core/apis/WebGatewayApi.java b/src/main/java/qupath/ext/omero/core/apis/WebGatewayApi.java
@@ -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) {

diff --git a/src/main/java/qupath/ext/omero/gui/browser/serverbrowser/Browser.java b/src/main/java/qupath/ext/omero/gui/browser/serverbrowser/Browser.java
@@ -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();
@@ -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());

diff --git a/src/test/resources/omero-web/installPixelBufferMs.sh b/src/test/resources/omero-web/installPixelBufferMs.sh
@@ -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

diff --git a/src/test/resources/server.sh b/src/test/resources/server.sh
@@ -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