Merge pull request #1358 from virtualcell/quick-n5-fix

Human Readable Passes Dimension Info to its Spec
virtualcell · Sep 25, 2024 · a4e4bdb · a4e4bdb
2 parents 3fe68ce + db30be5
commit a4e4bdb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/vcell-apiclient/src/main/java/org/vcell/api/common/events/ExportHumanReadableDataSpec.java b/vcell-apiclient/src/main/java/org/vcell/api/common/events/ExportHumanReadableDataSpec.java
@@ -12,10 +12,14 @@ public class ExportHumanReadableDataSpec {
     public String applicationType;
     public boolean nonSpatial;
     public HashMap<Integer, String> subVolume;
+    public int zSlices;
+    public int tSlices;
+    public int numChannels;
 
     public ExportHumanReadableDataSpec(String bioModelName, String applicationName, String simulationName,
                                        ArrayList<String> differentParameterValues,
-                                       String serverSavedFileName, String applicationType, boolean nonSpatial, HashMap<Integer, String> subVolume){
+                                       String serverSavedFileName, String applicationType, boolean nonSpatial, HashMap<Integer, String> subVolume,
+                                       int zSlices, int tSlices, int numChannels){
         this.bioModelName = bioModelName;
         this.applicationName = applicationName;
         this.simulationName = simulationName;
@@ -24,6 +28,9 @@ public ExportHumanReadableDataSpec(String bioModelName, String applicationName,
         this.applicationType = applicationType;
         this.nonSpatial = nonSpatial;
         this.subVolume = subVolume;
+        this.zSlices = zSlices;
+        this.tSlices = tSlices;
+        this.numChannels = numChannels;
     }
 
 

diff --git a/vcell-core/src/main/java/cbit/vcell/export/server/HumanReadableExportData.java b/vcell-core/src/main/java/cbit/vcell/export/server/HumanReadableExportData.java
@@ -34,10 +34,15 @@ public HumanReadableExportData(String simulationName, String applicationName, St
     }
 
     public ExportHumanReadableDataSpec toJsonRep() {
-        return new ExportHumanReadableDataSpec(biomodelName, applicationName, simulationName, differentParameterValues, serverSavedFileName, applicationType, nonSpatial, subVolume);
+        return new ExportHumanReadableDataSpec(biomodelName, applicationName, simulationName, differentParameterValues, serverSavedFileName, applicationType, nonSpatial, subVolume,
+                zSlices, tSlices, numChannels);
     }
     public static HumanReadableExportData fromJsonRep(ExportHumanReadableDataSpec rep) {
-        return new HumanReadableExportData(rep.simulationName, rep.applicationName, rep.bioModelName, rep.differentParameterValues,
+        HumanReadableExportData hre = new HumanReadableExportData(rep.simulationName, rep.applicationName, rep.bioModelName, rep.differentParameterValues,
                 rep.serverSavedFileName, rep.applicationType, rep.nonSpatial, rep.subVolume);
+        hre.zSlices = rep.zSlices;
+        hre.tSlices = rep.tSlices;
+        hre.numChannels = rep.numChannels;
+        return hre;
     }
 }