From 141b5ec8458505be062e6945412da3812d36feca Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Thu, 12 Oct 2023 14:37:21 -0600 Subject: [PATCH] Turned out the unpopulated column also affected CSV export; also, I left a line of debug in --- core/src/net/sf/openrocket/simulation/FlightData.java | 1 - .../net/sf/openrocket/file/SimulationTableCSVExport.java | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/src/net/sf/openrocket/simulation/FlightData.java b/core/src/net/sf/openrocket/simulation/FlightData.java index ae47565af..9b1c3ea98 100644 --- a/core/src/net/sf/openrocket/simulation/FlightData.java +++ b/core/src/net/sf/openrocket/simulation/FlightData.java @@ -89,7 +89,6 @@ public class FlightData { this.launchRodVelocity = launchRodVelocity; this.deploymentVelocity = deploymentVelocity; this.optimumDelay = optimumDelay; - System.out.println("optimum delay " + optimumDelay); } diff --git a/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java b/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java index 7eb1efb6b..dbf6493eb 100644 --- a/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java +++ b/swing/src/net/sf/openrocket/file/SimulationTableCSVExport.java @@ -166,10 +166,8 @@ public class SimulationTableCSVExport { } } - // Current "unstable" will have a populated sim table EXCEPT for the optimum delay column on a restart - // after a save. That means any row that WAS simulated will have exactly one null column in it... so we'll - // skip row export for the case where there are MORE than one nulls. Either way the user should run sims. - if (nullCnt > 1) { // ignore rows that have null column fields 1 through 8... + // If there are any null columns, need to run the simulation before we can export it + if (nullCnt > 0) { // ignore rows that have null column fields 1 through 8... continue; }