Skip to content

Fix Math Model Export Error #1594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ezequiel-Valencia merged 1 commit into from
Oct 3, 2025
Merged

Fix Math Model Export Error #1594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions vcell-client/src/main/java/cbit/vcell/client/data/PDEExportDataPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import cbit.vcell.client.task.ClientTaskDispatcher;
import cbit.vcell.export.server.*;
import cbit.vcell.export.server.ExportSpecs.SimNameSimDataID;
import cbit.vcell.geometry.GeometrySpec;
import cbit.vcell.geometry.SubVolume;
import cbit.vcell.mapping.SimulationContext;
import cbit.vcell.math.VariableType;
Expand Down Expand Up @@ -647,7 +648,6 @@ private ExportSpecs getExportSpecs() {
for (int i = 0; i < selections.length; i++) {
selections[i] = (SpatialSelection)selectionsArr[i];
}
SimulationContext sc = (SimulationContext) getSimulation().getSimulationOwner();
MathOverrides mathOverrides = getSimulation().getMathOverrides();

String[] filteredConstants = mathOverrides.getFilteredConstantNames();
Expand All @@ -667,14 +667,25 @@ private ExportSpecs getExportSpecs() {

String serverSavedFileName = getExportSettings1().getFormatSpecificSpecs() instanceof N5Specs ? ((N5Specs) getExportSettings1().getFormatSpecificSpecs()).dataSetName : "";

boolean nonSpatial = sc.getGeometry().getDimension() == 0;
SimulationOwner simulationOwner = getSimulation().getSimulationOwner();
boolean nonSpatial = simulationOwner.getGeometry().getDimension() == 0;
HashMap<Integer, String> subVolumes = new HashMap<>();
for(SubVolume subVolume: sc.getGeometry().getGeometrySpec().getSubVolumes()){
for(SubVolume subVolume: simulationOwner.getGeometry().getGeometrySpec().getSubVolumes()){
subVolumes.put(subVolume.getHandle(), subVolume.getName());
}
HumanReadableExportData humanReadableExportData = new HumanReadableExportData(getSimulation().getName(), sc.getName(), sc.getBioModel().getName(),
differentParameterValues, serverSavedFileName, sc.getApplicationType().name(), nonSpatial, subVolumes);
GeometrySpecs geometrySpecs = new GeometrySpecs(selections, getNormalAxis(), getSlice(), geoMode);

HumanReadableExportData humanReadableExportData;
if (simulationOwner instanceof SimulationContext sc){
humanReadableExportData = new HumanReadableExportData(getSimulation().getName(), sc.getName(), sc.getBioModel().getName(),
differentParameterValues, serverSavedFileName, sc.getApplicationType().name(), nonSpatial, subVolumes);
} else if (simulationOwner instanceof MathModel mathModel){
humanReadableExportData = new HumanReadableExportData(getSimulation().getName(), mathModel.getName(), mathModel.getName(),
differentParameterValues, serverSavedFileName, mathModel.getDocumentType().name(), nonSpatial, subVolumes);
} else {
throw new IllegalArgumentException("Expected " + SimulationContext.class.getName() + " or " + MathModel.class.getName());
}

ExportSpecs exportSpecs = new ExportSpecs(
vcDataIdentifier,
getExportSettings1().getSelectedFormat(),
Expand Down