minor tweaks to Forrest's stack channel names solution

saalfeldlab · Oct 25, 2017 · eb66b5f · eb66b5f
1 parent 60d66f5
commit eb66b5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 30 deletions.
diff --git a/render-app/src/main/java/org/janelia/alignment/spec/stack/StackStats.java b/render-app/src/main/java/org/janelia/alignment/spec/stack/StackStats.java
@@ -1,10 +1,10 @@
 package org.janelia.alignment.spec.stack;
 
 import java.io.Serializable;
+import java.util.Set;
 
 import org.janelia.alignment.json.JsonUtils;
 import org.janelia.alignment.spec.Bounds;
-import java.util.ArrayList;
 
 /**
  * Derived stats for a stack.
@@ -23,7 +23,7 @@ public class StackStats
     private final Integer maxTileWidth;
     private final Integer minTileHeight;
     private final Integer maxTileHeight;
-    private final ArrayList channels;
+    private final Set<String> channelNames;
 
     // no-arg constructor needed for JSON deserialization
     @SuppressWarnings("unused")
@@ -37,28 +37,9 @@ private StackStats() {
         this.maxTileWidth = null;
         this.minTileHeight = null;
         this.maxTileHeight = null;
-        this.channels = null;
-    }
-    public StackStats(final Bounds stackBounds,
-            final Long sectionCount,
-            final Long nonIntegralSectionCount,
-            final Long tileCount,
-            final Long transformCount,
-            final Integer minTileWidth,
-            final Integer maxTileWidth,
-            final Integer minTileHeight,
-            final Integer maxTileHeight) {
-        this.stackBounds = stackBounds;
-        this.sectionCount = sectionCount;
-        this.nonIntegralSectionCount = nonIntegralSectionCount;
-        this.tileCount = tileCount;
-        this.transformCount = transformCount;
-        this.minTileWidth = minTileWidth;
-        this.maxTileWidth = maxTileWidth;
-        this.minTileHeight = minTileHeight;
-        this.maxTileHeight = maxTileHeight;
-        this.channels = null;
+        this.channelNames = null;
     }
+
     public StackStats(final Bounds stackBounds,
                       final Long sectionCount,
                       final Long nonIntegralSectionCount,
@@ -68,7 +49,7 @@ public StackStats(final Bounds stackBounds,
                       final Integer maxTileWidth,
                       final Integer minTileHeight,
                       final Integer maxTileHeight,
-                      final ArrayList channels) {
+                      final Set<String> channelNames) {
         this.stackBounds = stackBounds;
         this.sectionCount = sectionCount;
         this.nonIntegralSectionCount = nonIntegralSectionCount;
@@ -78,7 +59,7 @@ public StackStats(final Bounds stackBounds,
         this.maxTileWidth = maxTileWidth;
         this.minTileHeight = minTileHeight;
         this.maxTileHeight = maxTileHeight;
-        this.channels = channels;
+        this.channelNames = channelNames;
     }
 
     public Bounds getStackBounds() {
@@ -116,9 +97,11 @@ public Integer getMinTileHeight() {
     public Integer getMaxTileHeight() {
         return maxTileHeight;
     }
-    public ArrayList getChannels() {
-        return channels;
+
+    public Set<String> getChannelNames() {
+        return channelNames;
     }
+
     @Override
     public String toString() {
         return toJson();

diff --git a/render-ws/src/main/java/org/janelia/render/service/dao/RenderDao.java b/render-ws/src/main/java/org/janelia/render/service/dao/RenderDao.java
@@ -25,6 +25,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -1115,9 +1116,9 @@ public StackMetaData ensureIndexesAndDeriveStats(final StackMetaData stackMetaDa
                                             "The aggregation query was " + MongoUtil.fullName(tileCollection) +
                                             ".aggregate(" + pipeline + ") .");
         }
-        ArrayList<String> channels = tileCollection.distinct("channels.name",String.class).into(new ArrayList<String>());
-
 
+        final List<String> channelNames = tileCollection.distinct("channels.name", String.class).into(new ArrayList<>());
+        Collections.sort(channelNames);
 
         final Bounds stackBounds = new Bounds(aggregateResult.get(minXKey, Double.class),
                                               aggregateResult.get(minYKey, Double.class),
@@ -1140,7 +1141,7 @@ public StackMetaData ensureIndexesAndDeriveStats(final StackMetaData stackMetaDa
                                                 maxTileWidth,
                                                 minTileHeight,
                                                 maxTileHeight,
-                                                channels);
+                                                new LinkedHashSet<>(channelNames));
         stackMetaData.setStats(stats);
 
         LOG.debug("ensureIndexesAndDeriveStats: completed stat derivation for {}, stats={}", stackId, stats);