From db30be563107d2025423a2534db93040596cebdf Mon Sep 17 00:00:00 2001 From: Ezequiel Valencia Date: Wed, 25 Sep 2024 14:42:31 -0400 Subject: [PATCH] Human Readable Passes Dimension Info to its Spec --- .../api/common/events/ExportHumanReadableDataSpec.java | 9 ++++++++- .../vcell/export/server/HumanReadableExportData.java | 9 +++++++-- 2 files changed, 15 insertions(+), 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 index 788178b09a..2d73489cad 100644 --- 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 subVolume; + public int zSlices; + public int tSlices; + public int numChannels; public ExportHumanReadableDataSpec(String bioModelName, String applicationName, String simulationName, ArrayList differentParameterValues, - String serverSavedFileName, String applicationType, boolean nonSpatial, HashMap subVolume){ + String serverSavedFileName, String applicationType, boolean nonSpatial, HashMap 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 index 44d6e15ace..af354136eb 100644 --- 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; } }