- Point labeling support.

vaccovecrana · Mar 31, 2022 · 4486927 · 4486927
1 parent eea96c5
commit 4486927
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/io/vacco/kimaris/impl/KmDetPup.java b/src/main/java/io/vacco/kimaris/impl/KmDetPup.java
@@ -80,7 +80,7 @@ public static KmCoord runCascade(int perturbs, KmCoord pl, KmImageParams img, bo
         (int) detRows[(int) Math.round(perturbs / 2d)],
         (int) detCols[(int) Math.round(perturbs / 2d)],
         detScale[(int) Math.round(perturbs / 2d)]
-    );
+    ).withLabel(String.format("%s%s", plc.id, flipV ? "-flp" : ""));
   }
 
 }
diff --git a/src/main/java/io/vacco/kimaris/io/KmCascades.java b/src/main/java/io/vacco/kimaris/io/KmCascades.java
@@ -4,6 +4,7 @@
 import io.vacco.kimaris.schema.*;
 import java.net.URL;
 import java.nio.*;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 
 import static io.vacco.kimaris.io.KmArrays.*;
@@ -15,6 +16,7 @@ public static KmCascade unpackCascade(URL url) {
     var bb = ByteBuffer.wrap(bytes).order(ByteOrder.LITTLE_ENDIAN);
     var pup = new KmCascade();
 
+    pup.id = Paths.get(url.getFile()).getFileName().toString();
     pup.stages = bb.getInt();
     pup.scales = bb.getFloat();
     pup.trees = bb.getInt();

diff --git a/src/main/java/io/vacco/kimaris/schema/KmCascade.java b/src/main/java/io/vacco/kimaris/schema/KmCascade.java
@@ -1,6 +1,7 @@
 package io.vacco.kimaris.schema;
 
 public class KmCascade {
+  public String id;
   public long stages;       // uint32
   public float scales;
   public long trees;        // uint32

diff --git a/src/main/java/io/vacco/kimaris/schema/KmCoord.java b/src/main/java/io/vacco/kimaris/schema/KmCoord.java
@@ -2,6 +2,7 @@
 
 public class KmCoord {
 
+  public String label;
   public int row;
   public int col;
   public double scale;
@@ -10,6 +11,11 @@ public boolean valid() {
     return row > 0 && col > 0;
   }
 
+  public KmCoord withLabel(String label) {
+    this.label = label;
+    return this;
+  }
+
   public static KmCoord from(int row, int col, double scale) {
     var c = new KmCoord();
     c.col = col;
@@ -19,6 +25,6 @@ public static KmCoord from(int row, int col, double scale) {
   }
 
   @Override public String toString() {
-    return String.format("crd[r: %d, c: %d, s: %.3f]", row, col, scale);
+    return String.format("crd[l: %s, r: %d, c: %d, s: %.3f]", label, row, col, scale);
   }
 }