Merge pull request #75 from petebankhead/improved-tostring

Improve Model.toString()
qupath · Sep 10, 2024 · a42f781 · a42f781
2 parents 2c37e2b + cf2ebe4
commit a42f781
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/qupath/ext/instanseg/core/InstanSegModel.java b/src/main/java/qupath/ext/instanseg/core/InstanSegModel.java
@@ -212,11 +212,14 @@ public Optional<Path> getPath() {
 
     @Override
     public String toString() {
-//        var path = getPath().orElse(null);
-//        if (path == null) {
-//            return getName() + " (not downloaded)";
-//        }
-        return getName();
+        String name = getName();
+        String parent = getPath().map(Path::getFileName).map(Path::toString).orElse(null);
+        String version = getModel().map(BioimageIoSpec.BioimageIoModel::getVersion).orElse(null);
+        if (parent != null && !Objects.equals(parent, name))
+            name = parent + "/" + name;
+        if (version != null)
+            name += "-" + version;
+        return name;
     }
 
     /**

diff --git a/src/main/java/qupath/ext/instanseg/ui/InstanSegUtils.java b/src/main/java/qupath/ext/instanseg/ui/InstanSegUtils.java
@@ -17,6 +17,10 @@
  */
 class InstanSegUtils {
 
+    private InstanSegUtils() {
+        // Prevent instantiation
+    }
+
     private static ObjectBinding<Path> modelDirectoryBinding = Bindings.createObjectBinding(
                 () -> tryToGetPath(InstanSegPreferences.modelDirectoryProperty().get()),
                 InstanSegPreferences.modelDirectoryProperty()