Added omero server address in settings window

Author: Rylern

src/main/java/qupath/ext/omero/core/pixelapis/ice/IceAPI.java

@@ -1,9 +1,7 @@
 package qupath.ext.omero.core.pixelapis.ice;
 
 import com.drew.lang.annotations.Nullable;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.beans.value.ObservableBooleanValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -132,6 +130,14 @@ public String toString() {
         return String.format("Ice API of %s", apisHandler.getWebServerURI());
     }
 
+    /**
+     * @return the address used to communicate with the OMERO server.
+     * This property may be updated from any thread
+     */
+    public ReadOnlyStringProperty getServerAddress() {
+        return serverAddress;
+    }
+
     /**
      * Set the address used to communicate with the OMERO server.
      *

src/main/java/qupath/ext/omero/gui/browser/serverbrowser/settings/Settings.java

@@ -9,6 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import qupath.ext.omero.core.WebClient;
+import qupath.ext.omero.core.pixelapis.ice.IceAPI;
 import qupath.ext.omero.core.pixelapis.mspixelbuffer.MsPixelBufferAPI;
 import qupath.ext.omero.core.pixelapis.web.WebAPI;
 import qupath.ext.omero.gui.UiUtilities;
@@ -27,10 +28,13 @@ public class Settings extends Stage {
     private static final ResourceBundle resources = UiUtilities.getResources();
     private final MsPixelBufferAPI msPixelBufferAPI;
     private final WebAPI webAPI;
+    private final IceAPI iceAPI;
     @FXML
     private TextField msPixelBufferAPIPort;
     @FXML
     private TextField webJpegQuality;
+    @FXML
+    private TextField omeroAddress;
 
     /**
      * Creates the settings window.
@@ -42,6 +46,7 @@ public class Settings extends Stage {
     public Settings(Stage ownerWindow, WebClient client) throws IOException {
         this.msPixelBufferAPI = client.getPixelAPI(MsPixelBufferAPI.class);
         this.webAPI = client.getPixelAPI(WebAPI.class);
+        this.iceAPI = client.getPixelAPI(IceAPI.class);
 
         initUI(ownerWindow);
         setUpListeners();
@@ -67,7 +72,6 @@ private void onApplyClicked(ActionEvent ignoredEvent) {
     private void initUI(Stage ownerWindow) throws IOException {
         UiUtilities.loadFXML(this, Settings.class.getResource("settings.fxml"));
 
-
         TextFormatter<String> integerFormatter = new TextFormatter<>(change ->
                 Pattern.matches("^\\d*$", change.getControlNewText()) ? change : null
         );
@@ -80,6 +84,7 @@ private void initUI(Stage ownerWindow) throws IOException {
 
         msPixelBufferAPIPort.setText(String.valueOf(msPixelBufferAPI.getPort().get()));
         webJpegQuality.setText(String.valueOf(webAPI.getJpegQuality().get()));
+        omeroAddress.setText(iceAPI.getServerAddress().get());
 
         initOwner(ownerWindow);
         show();
@@ -92,16 +97,21 @@ private void setUpListeners() {
         webAPI.getJpegQuality().addListener((p, o, n) -> Platform.runLater(() ->
                 webJpegQuality.setText(String.valueOf(n))
         ));
+        iceAPI.getServerAddress().addListener((p, o, n) -> Platform.runLater(() ->
+                omeroAddress.setText(n)
+        ));
     }
 
     private boolean save() {
         try {
             msPixelBufferAPI.setPort(Integer.parseInt(msPixelBufferAPIPort.getText()), false);
             webAPI.setJpegQuality(Float.parseFloat(webJpegQuality.getText()));
+            iceAPI.setServerAddress(omeroAddress.getText());
 
             // Reset the texts, as the user input may have had incorrect values and been ignored
             msPixelBufferAPIPort.setText(String.valueOf(msPixelBufferAPI.getPort().get()));
             webJpegQuality.setText(String.valueOf(webAPI.getJpegQuality().get()));
+            omeroAddress.setText(iceAPI.getServerAddress().get());
 
             Dialogs.showInfoNotification(
                     resources.getString("Browser.ServerBrowser.Settings.saved"),

src/main/resources/qupath/ext/omero/gui/browser/serverbrowser/settings/settings.fxml

@@ -23,6 +23,7 @@
                 <rowConstraints>
                     <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                     <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+               <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                 </rowConstraints>
                 <padding>
@@ -48,7 +49,17 @@
                   <Tooltip text="%Browser.ServerBrowser.Settings.webJpegQualityDescription" />
                </tooltip>
             </TextField>
-                <HBox alignment="CENTER_RIGHT" spacing="10.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="2">
+            <Label text="%Browser.ServerBrowser.Settings.omeroServerAddress" GridPane.rowIndex="2">
+               <tooltip>
+                  <Tooltip text="%Browser.ServerBrowser.Settings.omeroServerAddressDescription" />
+               </tooltip>
+            </Label>
+            <TextField fx:id="omeroAddress" GridPane.columnIndex="1" GridPane.rowIndex="2">
+               <tooltip>
+                  <Tooltip text="%Browser.ServerBrowser.Settings.omeroServerAddressDescription" />
+               </tooltip>
+            </TextField>
+                <HBox alignment="CENTER_RIGHT" spacing="10.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="3">
                     <Button mnemonicParsing="false" onAction="#onOKClicked" text="%Browser.ServerBrowser.Settings.ok" />
                     <Button mnemonicParsing="false" onAction="#onCancelClicked" text="%Browser.ServerBrowser.Settings.cancel" />
                     <Button mnemonicParsing="false" onAction="#onApplyClicked" text="%Browser.ServerBrowser.Settings.apply" />

src/main/resources/qupath/ext/omero/strings.properties

@@ -154,6 +154,8 @@ Browser.ServerBrowser.Settings.mxPixelBufferAPIPort = Pixel Buffer microservice
 Browser.ServerBrowser.Settings.mxPixelBufferAPIPortDescription = The OMERO server port used by the pixel buffer microservice (default: 8082).
 Browser.ServerBrowser.Settings.webJpegQuality = Web pixel API JPEG quality
 Browser.ServerBrowser.Settings.webJpegQualityDescription = The JPEG quality used by the Web pixel API (from 0 to 1, default: 0.9).
+Browser.ServerBrowser.Settings.omeroServerAddress = OMERO (ICE) server address
+Browser.ServerBrowser.Settings.omeroServerAddressDescription = The address of the omero.server (ICE) instance (which can be different from the omero.web instance). This parameter should only be specified if importing an image with the Ice API doesn't work.
 Browser.ServerBrowser.Settings.ok = OK
 Browser.ServerBrowser.Settings.cancel = Cancel
 Browser.ServerBrowser.Settings.apply = Apply

src/main/resources/qupath/ext/omero/strings_fr.properties

@@ -154,6 +154,8 @@ Browser.ServerBrowser.Settings.mxPixelBufferAPIPort = Ms Pixel Buffer API port
 Browser.ServerBrowser.Settings.mxPixelBufferAPIPortDescription = Le port du serveur OMERO utilisé par le microservice Pixel Buffer (8082 par défaut).
 Browser.ServerBrowser.Settings.webJpegQuality =  Qualité JPEG de la Web pixel API
 Browser.ServerBrowser.Settings.webJpegQualityDescription = La qualité JPEG utilisée par la Web pixel API (de 0 à 1, 0.9 par défaut).
+Browser.ServerBrowser.Settings.omeroServerAddress = Adresse du serveur OMERO (ICE)
+Browser.ServerBrowser.Settings.omeroServerAddressDescription = L'adresse de l'instance omero.server (ICE) (qui peut être différente de l'instance omero.web). Ce paramètre ne doit être spécifié que si l'importation d'une image avec l'Ice API ne fonctionne pas.
 Browser.ServerBrowser.Settings.ok = OK
 Browser.ServerBrowser.Settings.cancel = Annuler
 Browser.ServerBrowser.Settings.apply = Appliquer