hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add error & warning dialog for RASAero exporting

Browse Source
This commit is contained in:
SiboVG 2023-03-27 22:31:52 +02:00
parent c5a2fc44df
commit 9667466fdb
18 changed files with 342 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/resources/l10n/messages.properties
View File

@ -89,7 +89,12 @@ BasicFrame.dlg.title = Design not saved
BasicFrame.StageName.Sustainer = Sustainer BasicFrame.StageName.Sustainer = Sustainer
BasicFrame.WarningDialog.txt1 = The following problems were encountered while opening BasicFrame.WarningDialog.txt1 = The following problems were encountered while opening
BasicFrame.WarningDialog.txt2 = Some design features may not have been loaded correctly. BasicFrame.WarningDialog.txt2 = Some design features may not have been loaded correctly.
BasicFrame.WarningDialog.saving.txt1 = The following problems were encountered while saving
BasicFrame.WarningDialog.saving.txt2 = Some design features may not have exported correctly.
BasicFrame.WarningDialog.title = Warnings while opening file BasicFrame.WarningDialog.title = Warnings while opening file
BasicFrame.WarningDialog.saving.title = Warnings while opening file
BasicFrame.ErrorWarningDialog.txt1 = <html>Please <b>correct the errors</b>.</html>
BasicFrame.ErrorWarningDialog.saving.title = Errors/Warnings while saving file
! General error messages used in multiple contexts ! General error messages used in multiple contexts

32
core/src/net/sf/openrocket/file/GeneralRocketSaver.java
View File

@ -21,12 +21,16 @@ import net.sf.openrocket.document.StorageOptions.FileType;
import net.sf.openrocket.file.openrocket.OpenRocketSaver; import net.sf.openrocket.file.openrocket.OpenRocketSaver;
import net.sf.openrocket.file.rasaero.export.RASAeroSaver; import net.sf.openrocket.file.rasaero.export.RASAeroSaver;
import net.sf.openrocket.file.rocksim.export.RockSimSaver; import net.sf.openrocket.file.rocksim.export.RockSimSaver;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.InsideColorComponent; import net.sf.openrocket.rocketcomponent.InsideColorComponent;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.util.DecalNotFoundException; import net.sf.openrocket.util.DecalNotFoundException;
import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.MathUtil;
public class GeneralRocketSaver { public class GeneralRocketSaver {
protected final WarningSet warnings = new WarningSet();
protected final ErrorSet errors = new ErrorSet();
/** /**
* Interface which can be implemented by the caller to receive progress information. * Interface which can be implemented by the caller to receive progress information.
@ -234,16 +238,34 @@ public class GeneralRocketSaver {
private void saveInternal(OutputStream output, OpenRocketDocument document, StorageOptions options) private void saveInternal(OutputStream output, OpenRocketDocument document, StorageOptions options)
throws IOException { throws IOException {
warnings.clear();
errors.clear();
if (options.getFileType() == FileType.ROCKSIM) { if (options.getFileType() == FileType.ROCKSIM) {
new RockSimSaver().save(output, document, options); new RockSimSaver().save(output, document, options, warnings, errors);
} else if (options.getFileType() == FileType.RASAERO) { } else if (options.getFileType() == FileType.RASAERO) {
new RASAeroSaver().save(output, document, options); new RASAeroSaver().save(output, document, options, warnings, errors);
} else { } else {
new OpenRocketSaver().save(output, document, options); new OpenRocketSaver().save(output, document, options, warnings, errors);
} }
} }
/**
* Return a list of warnings generated during the saving process.
* @return a list of warnings generated during the saving process
*/
public WarningSet getWarnings() {
return warnings;
}
/**
* Return a list of errors generated during the saving process.
* @return a list of errors generated during the saving process
*/
public ErrorSet getErrors() {
return errors;
}
private static class ProgressOutputStream extends FilterOutputStream { private static class ProgressOutputStream extends FilterOutputStream {
private final long estimatedSize; private final long estimatedSize;

13
core/src/net/sf/openrocket/file/RocketSaver.java
View File

@ -3,23 +3,24 @@ package net.sf.openrocket.file;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.StorageOptions; import net.sf.openrocket.document.StorageOptions;
public abstract class RocketSaver { public abstract class RocketSaver {
protected final WarningSet warnings = new WarningSet();
/** /**
* Save the document to the specified output stream using the default storage options. * Save the document to the specified output stream using the default storage options.
* *
* @param dest the destination stream. * @param dest the destination stream.
* @param doc the document to save. * @param doc the document to save.
* @param warnings list to store save warnings to
* @param errors list to store save errors to
* @throws IOException in case of an I/O error. * @throws IOException in case of an I/O error.
*/ */
public final void save(OutputStream dest, OpenRocketDocument doc) throws IOException { public final void save(OutputStream dest, OpenRocketDocument doc, WarningSet warnings, ErrorSet errors) throws IOException {
save(dest, doc, doc.getDefaultStorageOptions()); save(dest, doc, doc.getDefaultStorageOptions(), warnings, errors);
} }
/** /**
@ -28,9 +29,11 @@ public abstract class RocketSaver {
* @param dest the destination stream. * @param dest the destination stream.
* @param doc the document to save. * @param doc the document to save.
* @param options the storage options. * @param options the storage options.
* @param warnings list to store save warnings to
* @param errors list to store save errors to
* @throws IOException in case of an I/O error. * @throws IOException in case of an I/O error.
*/ */
public abstract void save(OutputStream dest, OpenRocketDocument doc, StorageOptions options) throws IOException; public abstract void save(OutputStream dest, OpenRocketDocument doc, StorageOptions options, WarningSet warnings, ErrorSet errors) throws IOException;
/** /**
* Provide an estimate of the file size when saving the document with the * Provide an estimate of the file size when saving the document with the

4
core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
View File

@ -8,6 +8,8 @@ import java.io.Writer;
import java.util.*; import java.util.*;
import net.sf.openrocket.file.openrocket.savers.PhotoStudioSaver; import net.sf.openrocket.file.openrocket.savers.PhotoStudioSaver;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -60,7 +62,7 @@ public class OpenRocketSaver extends RocketSaver {
private Writer dest; private Writer dest;
@Override @Override
public void save(OutputStream output, OpenRocketDocument document, StorageOptions options) throws IOException { public void save(OutputStream output, OpenRocketDocument document, StorageOptions options, WarningSet warnings, ErrorSet errors) throws IOException {
log.info("Saving .ork file"); log.info("Saving .ork file");

12
core/src/net/sf/openrocket/file/rasaero/export/BasePartDTO.java
View File

@ -2,6 +2,8 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.CustomDoubleAdapter; import net.sf.openrocket.file.rasaero.CustomDoubleAdapter;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.NoseCone;
@ -43,16 +45,24 @@ public class BasePartDTO {
@XmlTransient @XmlTransient
private final RocketComponent component; private final RocketComponent component;
@XmlTransient
private final WarningSet warnings;
@XmlTransient
private final ErrorSet errors;
/** /**
* We need a default no-args constructor. * We need a default no-args constructor.
*/ */
public BasePartDTO() { public BasePartDTO() {
this.component = null; this.component = null;
this.warnings = null;
this.errors = null;
} }
protected BasePartDTO(RocketComponent component) throws RASAeroExportException { protected BasePartDTO(RocketComponent component, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
this.component = component; this.component = component;
this.warnings = warnings;
this.errors = errors;
if (component instanceof BodyTube) { if (component instanceof BodyTube) {
setPartType(RASAeroCommonConstants.BODY_TUBE); setPartType(RASAeroCommonConstants.BODY_TUBE);

22
core/src/net/sf/openrocket/file/rasaero/export/BodyTubeDTO.java
View File

@ -2,6 +2,8 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.CustomDoubleAdapter; import net.sf.openrocket.file.rasaero.CustomDoubleAdapter;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@ -9,6 +11,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
@ -49,14 +52,25 @@ public class BodyTubeDTO extends BasePartDTO implements BodyTubeDTOAdapter {
@XmlElementRef(name = RASAeroCommonConstants.FIN, type = FinDTO.class) @XmlElementRef(name = RASAeroCommonConstants.FIN, type = FinDTO.class)
private FinDTO fin; private FinDTO fin;
@XmlTransient
private final WarningSet warnings;
@XmlTransient
private final ErrorSet errors;
/** /**
* We need a default no-args constructor. * We need a default no-args constructor.
*/ */
public BodyTubeDTO() { } public BodyTubeDTO() {
this.warnings = null;
this.errors = null;
}
public BodyTubeDTO(BodyTube bodyTube) throws RASAeroExportException { public BodyTubeDTO(BodyTube bodyTube, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
super(bodyTube); super(bodyTube, warnings, errors);
applyBodyTubeSettings(bodyTube); this.warnings = warnings;
this.errors = errors;
applyBodyTubeSettings(bodyTube, warnings, errors);
} }
public Double getLaunchLugDiameter() { public Double getLaunchLugDiameter() {

22
core/src/net/sf/openrocket/file/rasaero/export/BodyTubeDTOAdapter.java
View File

@ -1,6 +1,8 @@
package net.sf.openrocket.file.rasaero.export; package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.LaunchLug; import net.sf.openrocket.rocketcomponent.LaunchLug;
import net.sf.openrocket.rocketcomponent.RailButton; import net.sf.openrocket.rocketcomponent.RailButton;
@ -10,17 +12,17 @@ import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
public interface BodyTubeDTOAdapter { public interface BodyTubeDTOAdapter {
default void applyBodyTubeSettings(BodyTube bodyTube) throws RASAeroExportException { default void applyBodyTubeSettings(BodyTube bodyTube, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
for (RocketComponent child : bodyTube.getChildren()) { for (RocketComponent child : bodyTube.getChildren()) {
if (child instanceof TrapezoidFinSet) { if (child instanceof TrapezoidFinSet) {
setFin(new FinDTO((TrapezoidFinSet) child)); setFin(new FinDTO((TrapezoidFinSet) child));
} else if (child instanceof LaunchLug) { } else if (child instanceof LaunchLug) {
if (!MathUtil.equals(getRailGuideDiameter(), 0) || !MathUtil.equals(getRailGuideHeight(), 0)) { // only one check on diameter or length should be sufficient, but just to be safe if (!MathUtil.equals(getRailGuideDiameter(), 0) || !MathUtil.equals(getRailGuideHeight(), 0)) { // only one check on diameter or length should be sufficient, but just to be safe
//TODO: warning.add(String.format("Already added a rail button, ignoring launch lug '%s'", child.getName()); warnings.add(String.format("Already added a rail button, ignoring launch lug '%s'", child.getName()));
continue; continue;
} }
if (!MathUtil.equals(getLaunchShoeArea(), 0)) { if (!MathUtil.equals(getLaunchShoeArea(), 0)) {
//TODO: warning.add(String.format("Already added a launch shoe, ignoring launch lug '%s'", child.getName()); warnings.add(String.format("Already added a launch shoe, ignoring launch lug '%s'", child.getName()));
continue; continue;
} }
@ -29,17 +31,18 @@ public interface BodyTubeDTOAdapter {
if (lug.getInstanceCount() == 2) { if (lug.getInstanceCount() == 2) {
setLaunchLugLength(lug.getLength() * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setLaunchLugLength(lug.getLength() * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
} else { } else {
//TODO:warnings.add(String.format("Instance count of '%s' not set to 2, defaulting to 2 and adjusting warnings.add(String.format(
// launch lug length accordingly.", lug.getName()") "Instance count of '%s' not set to 2, defaulting to 2 and adjusting launch lug length accordingly.",
lug.getName()));
setLaunchLugLength(lug.getLength() * lug.getInstanceCount() / 2 * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setLaunchLugLength(lug.getLength() * lug.getInstanceCount() / 2 * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
} }
} else if (child instanceof RailButton) { } else if (child instanceof RailButton) {
if (!MathUtil.equals(getLaunchLugDiameter(), 0) || !MathUtil.equals(getLaunchLugLength(), 0)) { // only one check on diameter or length should be sufficient, but just to be safe if (!MathUtil.equals(getLaunchLugDiameter(), 0) || !MathUtil.equals(getLaunchLugLength(), 0)) { // only one check on diameter or length should be sufficient, but just to be safe
// TODO: warning.add(String.format("Already added a launch lug, ignoring rail button '%s'", child.getName())); warnings.add(String.format("Already added a launch lug, ignoring rail button '%s'", child.getName()));
continue; continue;
} }
if (!MathUtil.equals(getLaunchShoeArea(), 0)) { if (!MathUtil.equals(getLaunchShoeArea(), 0)) {
// TODO: warning.add(String.format("Already added a launch shoe, ignoring rail button '%s'", child.getName())); warnings.add(String.format("Already added a launch shoe, ignoring rail button '%s'", child.getName()));
continue; continue;
} }
@ -48,10 +51,11 @@ public interface BodyTubeDTOAdapter {
setRailGuideHeight(button.getTotalHeight() * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setRailGuideHeight(button.getTotalHeight() * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
if (button.getInstanceCount() != 2) { if (button.getInstanceCount() != 2) {
//TODO: warnings.add(String.format("Instance count of '%s' equals %d, defaulting to 2", button.getName(), button.getInstanceCount())); warnings.add(String.format("Instance count of '%s' equals %d, defaulting to 2",
button.getName(), button.getInstanceCount()));
} }
} else { } else {
// TODO: warnings.add(String.format("Unsupported component '%s', ignoring.", child.getComponentName())); warnings.add(String.format("Unsupported component '%s', ignoring.", child.getComponentName()));
} }
} }
} }

41
core/src/net/sf/openrocket/file/rasaero/export/BoosterDTO.java
View File

@ -2,6 +2,8 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.CustomDoubleAdapter; import net.sf.openrocket.file.rasaero.CustomDoubleAdapter;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.NoseCone;
@ -13,6 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException; import net.sf.openrocket.file.rasaero.export.RASAeroSaver.RASAeroExportException;
@ -74,12 +77,28 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
private FinDTO fin; private FinDTO fin;
@XmlTransient
private final RocketComponent component;
@XmlTransient
private final WarningSet warnings;
@XmlTransient
private final ErrorSet errors;
/** /**
* We need a default, no-args constructor. * We need a default, no-args constructor.
*/ */
public BoosterDTO() { } public BoosterDTO() {
this.component = null;
this.warnings = null;
this.errors = null;
}
protected BoosterDTO(Rocket rocket, AxialStage stage, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
this.component = stage;
this.warnings = warnings;
this.errors = errors;
protected BoosterDTO(Rocket rocket, AxialStage stage) throws RASAeroExportException {
int stageNr = rocket.getChildPosition(stage); // Use this instead of stage.getStageNumber() in case there are parallel stages in the design int stageNr = rocket.getChildPosition(stage); // Use this instead of stage.getStageNumber() in case there are parallel stages in the design
if (stageNr != 1 && stageNr != 2) { if (stageNr != 1 && stageNr != 2) {
throw new RASAeroExportException(String.format("Invalid stage number '%d' for booster stage '%s'", stageNr, stage.getName())); throw new RASAeroExportException(String.format("Invalid stage number '%d' for booster stage '%s'", stageNr, stage.getName()));
@ -129,7 +148,7 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
firstTube = (BodyTube) stage.getChild(0); firstTube = (BodyTube) stage.getChild(0);
} }
applyBodyTubeSettings(firstTube); applyBodyTubeSettings(firstTube, warnings, errors);
TrapezoidFinSet finSet = getFinSetFromBodyTube(firstTube); TrapezoidFinSet finSet = getFinSetFromBodyTube(firstTube);
if (finSet == null) { if (finSet == null) {
@ -144,6 +163,8 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
setDiameter(firstTube.getOuterRadius() * 2 * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setDiameter(firstTube.getOuterRadius() * 2 * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
setLocation(firstChild.getAxialOffset(AxialMethod.ABSOLUTE) * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH); setLocation(firstChild.getAxialOffset(AxialMethod.ABSOLUTE) * RASAeroCommonConstants.OPENROCKET_TO_RASAERO_LENGTH);
setColor(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_COLOR(firstTube.getColor())); setColor(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_COLOR(firstTube.getColor()));
// TODO: parse children for body tubes , transtitions etc.
} }
private TrapezoidFinSet getFinSetFromBodyTube(BodyTube bodyTube) { private TrapezoidFinSet getFinSetFromBodyTube(BodyTube bodyTube) {
@ -168,6 +189,10 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
} }
public void setLength(Double length) { public void setLength(Double length) {
if (MathUtil.equals(length, 0)) {
errors.add(String.format("Length of '%s' must be greater than 0", component.getName()));
return;
}
this.length = length; this.length = length;
} }
@ -175,7 +200,10 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
return diameter; return diameter;
} }
public void setDiameter(Double diameter) { public void setDiameter(Double diameter) throws RASAeroExportException {
if (MathUtil.equals(diameter, 0)) {
throw new RASAeroExportException(String.format("Diameter of '%s' must be greater than 0", component.getName()));
}
this.diameter = diameter; this.diameter = diameter;
} }
@ -183,7 +211,10 @@ public class BoosterDTO implements BodyTubeDTOAdapter {
return insideDiameter; return insideDiameter;
} }
public void setInsideDiameter(Double insideDiameter) { public void setInsideDiameter(Double insideDiameter) throws RASAeroExportException {
if (MathUtil.equals(insideDiameter, 0)) {
throw new RASAeroExportException(String.format("Inside diameter of '%s' must be greater than 0", component.getName()));
}
this.insideDiameter = insideDiameter; this.insideDiameter = insideDiameter;
} }

6
core/src/net/sf/openrocket/file/rasaero/export/NoseConeDTO.java
View File

@ -2,6 +2,8 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.CustomDoubleAdapter; import net.sf.openrocket.file.rasaero.CustomDoubleAdapter;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.NoseCone;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
@ -31,8 +33,8 @@ public class NoseConeDTO extends BasePartDTO {
public NoseConeDTO() { public NoseConeDTO() {
} }
public NoseConeDTO(NoseCone noseCone) throws RASAeroExportException { public NoseConeDTO(NoseCone noseCone, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
super(noseCone); super(noseCone, warnings, errors);
NoseConeShapeSettings shapeSettings = NoseConeShapeSettings shapeSettings =
RASAeroCommonConstants.OPENROCKET_TO_RASAERO_SHAPE(noseCone.getShapeType(), noseCone.getShapeParameter()); RASAeroCommonConstants.OPENROCKET_TO_RASAERO_SHAPE(noseCone.getShapeType(), noseCone.getShapeParameter());

26
core/src/net/sf/openrocket/file/rasaero/export/RASAeroSaver.java
View File

@ -3,12 +3,13 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.StorageOptions; import net.sf.openrocket.document.StorageOptions;
import net.sf.openrocket.file.RocketSaver; import net.sf.openrocket.file.RocketSaver;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.Rocket;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller; import javax.xml.bind.Marshaller;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.IOException; import java.io.IOException;
@ -35,7 +36,7 @@ public class RASAeroSaver extends RocketSaver {
* @param doc the OR design * @param doc the OR design
* @return RASAero-compliant XML * @return RASAero-compliant XML
*/ */
public String marshalToRASAero(OpenRocketDocument doc) { public String marshalToRASAero(OpenRocketDocument doc, WarningSet warnings, ErrorSet errors) {
try { try {
JAXBContext binder = JAXBContext.newInstance(RASAeroDocumentDTO.class); JAXBContext binder = JAXBContext.newInstance(RASAeroDocumentDTO.class);
Marshaller marshaller = binder.createMarshaller(); Marshaller marshaller = binder.createMarshaller();
@ -43,10 +44,10 @@ public class RASAeroSaver extends RocketSaver {
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
StringWriter sw = new StringWriter(); StringWriter sw = new StringWriter();
marshaller.marshal(toRASAeroDocumentDTO(doc), sw); marshaller.marshal(toRASAeroDocumentDTO(doc, warnings, errors), sw);
return sw.toString(); return sw.toString();
} catch (RASAeroExportException e) { } catch (RASAeroExportException e) {
throw new RuntimeException(e); errors.add(e.getMessage());
} catch (Exception e) { } catch (Exception e) {
log.error("Could not marshall a design to RASAero format. " + e.getMessage()); log.error("Could not marshall a design to RASAero format. " + e.getMessage());
} }
@ -55,28 +56,30 @@ public class RASAeroSaver extends RocketSaver {
} }
@Override @Override
public void save(OutputStream dest, OpenRocketDocument doc, StorageOptions options) throws IOException { public void save(OutputStream dest, OpenRocketDocument doc, StorageOptions options, WarningSet warnings, ErrorSet errors) throws IOException {
log.info("Saving .CDX1 file"); log.info("Saving .CDX1 file");
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(dest, StandardCharsets.UTF_8)); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(dest, StandardCharsets.UTF_8));
writer.write(marshalToRASAero(doc)); writer.write(marshalToRASAero(doc, warnings, errors));
writer.flush(); writer.flush();
} }
@Override @Override
public long estimateFileSize(OpenRocketDocument doc, StorageOptions options) { public long estimateFileSize(OpenRocketDocument doc, StorageOptions options) {
return marshalToRASAero(doc).length(); return marshalToRASAero(doc, new WarningSet(), new ErrorSet()).length();
} }
/** /**
* Root conversion method. It iterates over all subcomponents. * Root conversion method. It iterates over all subcomponents.
* *
* @param doc the OR design * @param doc the OR design
* @param warnings list to add export warnings to
* @param errors list to add export errors to
* @return a corresponding RASAero representation * @return a corresponding RASAero representation
*/ */
private RASAeroDocumentDTO toRASAeroDocumentDTO(OpenRocketDocument doc) throws RASAeroExportException { private RASAeroDocumentDTO toRASAeroDocumentDTO(OpenRocketDocument doc, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
RASAeroDocumentDTO rad = new RASAeroDocumentDTO(); RASAeroDocumentDTO rad = new RASAeroDocumentDTO();
rad.setDesign(toRocketDesignDTO(doc.getRocket())); rad.setDesign(toRocketDesignDTO(doc.getRocket(), warnings, errors));
return rad; return rad;
} }
@ -86,8 +89,7 @@ public class RASAeroSaver extends RocketSaver {
* @param rocket the OR rocket to export the components from * @param rocket the OR rocket to export the components from
* @return the RASAero rocket design * @return the RASAero rocket design
*/ */
private RocketDesignDTO toRocketDesignDTO(Rocket rocket) throws RASAeroExportException { private RocketDesignDTO toRocketDesignDTO(Rocket rocket, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
RocketDesignDTO result = new RocketDesignDTO(rocket); return new RocketDesignDTO(rocket, warnings, errors);
return result;
} }
} }

54
core/src/net/sf/openrocket/file/rasaero/export/RocketDesignDTO.java
View File

@ -3,6 +3,8 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.CustomBooleanAdapter; import net.sf.openrocket.file.rasaero.CustomBooleanAdapter;
import net.sf.openrocket.file.rasaero.CustomDoubleAdapter; import net.sf.openrocket.file.rasaero.CustomDoubleAdapter;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.rocketcomponent.AxialStage; import net.sf.openrocket.rocketcomponent.AxialStage;
import net.sf.openrocket.rocketcomponent.BodyTube; import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.NoseCone; import net.sf.openrocket.rocketcomponent.NoseCone;
@ -65,10 +67,10 @@ public class RocketDesignDTO {
@XmlElement(name = RASAeroCommonConstants.COMMENTS) @XmlElement(name = RASAeroCommonConstants.COMMENTS)
private String comments = ""; private String comments = "";
public RocketDesignDTO(Rocket rocket) throws RASAeroExportException { public RocketDesignDTO(Rocket rocket, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
setComments(rocket.getComment()); setComments(rocket.getComment());
if (rocket.getChildCount() > 3) { if (rocket.getChildCount() > 3) {
throw new RASAeroExportException("Rocket should have no more then 3 stages (excl. boosters) in total"); warnings.add("Rocket should have no more then 3 stages (excl. boosters) in total.\nIgnoring other stages.");
} }
setUseBooster1(rocket.getStageCount() >= 2); setUseBooster1(rocket.getStageCount() >= 2);
setUseBooster2(rocket.getStageCount() == 3); setUseBooster2(rocket.getStageCount() == 3);
@ -77,30 +79,40 @@ public class RocketDesignDTO {
// Export components from sustainer // Export components from sustainer
for (int i = 0; i < sustainer.getChildCount(); i++) { for (int i = 0; i < sustainer.getChildCount(); i++) {
RocketComponent component = sustainer.getChild(i); try {
if (i == 0 && !(component instanceof NoseCone)) { RocketComponent component = sustainer.getChild(i);
throw new RASAeroExportException("First component of the sustainer must be a nose cone"); if (i == 0 && !(component instanceof NoseCone)) {
} else if (i == 1 && !(component instanceof BodyTube)) { errors.add("First component of the sustainer must be a nose cone");
throw new RASAeroExportException("Second component of the sustainer must be a body tube"); return;
} } else if (i == 1 && !(component instanceof BodyTube)) {
if (component instanceof BodyTube) { errors.add("Second component of the sustainer must be a body tube");
addExternalPart(new BodyTubeDTO((BodyTube) component)); return;
} else if (component instanceof NoseCone) {
if (i != 0) {
throw new RASAeroExportException("A nose cone can only be the first component of the rocket");
} }
addExternalPart(new NoseConeDTO((NoseCone) component)); if (component instanceof BodyTube) {
// Set the global surface finish to that of the first nose cone addExternalPart(new BodyTubeDTO((BodyTube) component, warnings, errors));
setSurface(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_SURFACE(((NoseCone) component).getFinish())); } else if (component instanceof NoseCone) {
} if (i != 0) {
else if (component instanceof Transition) { errors.add("A nose cone can only be the first component of the rocket");
addExternalPart(new TransitionDTO((Transition) component)); return;
}
addExternalPart(new NoseConeDTO((NoseCone) component, warnings, errors));
// Set the global surface finish to that of the first nose cone
setSurface(RASAeroCommonConstants.OPENROCKET_TO_RASAERO_SURFACE(((NoseCone) component).getFinish()));
} else if (component instanceof Transition) {
addExternalPart(new TransitionDTO((Transition) component, warnings, errors));
}
} catch (RASAeroExportException e) {
errors.add(e.getMessage());
} }
} }
// Export components from other stages // Export components from other stages
for (int i = 1; i < rocket.getChildCount(); i++) { for (int i = 1; i < Math.min(rocket.getChildCount(), 3); i++) {
addBooster(new BoosterDTO(rocket, (AxialStage) rocket.getChild(i))); try {
addBooster(new BoosterDTO(rocket, (AxialStage) rocket.getChild(i), warnings, errors));
} catch (RASAeroExportException e) {
errors.add(e.getMessage());
}
} }
} }

7
core/src/net/sf/openrocket/file/rasaero/export/TransitionDTO.java
View File

@ -2,7 +2,8 @@ package net.sf.openrocket.file.rasaero.export;
import net.sf.openrocket.file.rasaero.CustomDoubleAdapter; import net.sf.openrocket.file.rasaero.CustomDoubleAdapter;
import net.sf.openrocket.file.rasaero.RASAeroCommonConstants; import net.sf.openrocket.file.rasaero.RASAeroCommonConstants;
import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
@ -31,8 +32,8 @@ public class TransitionDTO extends BasePartDTO {
public TransitionDTO() { public TransitionDTO() {
} }
public TransitionDTO(Transition transition) throws RASAeroExportException { public TransitionDTO(Transition transition, WarningSet warnings, ErrorSet errors) throws RASAeroExportException {
super(transition); super(transition, warnings, errors);
if (!transition.getShapeType().equals(Transition.Shape.CONICAL)) { if (!transition.getShapeType().equals(Transition.Shape.CONICAL)) {
throw new RASAeroExportException("RASAero only supports conical transitions"); throw new RASAeroExportException("RASAero only supports conical transitions");

4
core/src/net/sf/openrocket/file/rocksim/export/RockSimSaver.java
View File

@ -10,6 +10,8 @@ import java.nio.charset.StandardCharsets;
import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller; import javax.xml.bind.Marshaller;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -58,7 +60,7 @@ public class RockSimSaver extends RocketSaver {
} }
@Override @Override
public void save(OutputStream dest, OpenRocketDocument doc, StorageOptions options) throws IOException { public void save(OutputStream dest, OpenRocketDocument doc, StorageOptions options, WarningSet warnings, ErrorSet errors) throws IOException {
log.info("Saving .rkt file"); log.info("Saving .rkt file");
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(dest, StandardCharsets.UTF_8)); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(dest, StandardCharsets.UTF_8));

4
core/src/net/sf/openrocket/util/TestRockets.java
View File

@ -11,6 +11,8 @@ import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.OpenRocketDocumentFactory; import net.sf.openrocket.document.OpenRocketDocumentFactory;
import net.sf.openrocket.document.Simulation; import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.file.openrocket.OpenRocketSaver; import net.sf.openrocket.file.openrocket.OpenRocketSaver;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.material.Material; import net.sf.openrocket.material.Material;
import net.sf.openrocket.material.Material.Type; import net.sf.openrocket.material.Material.Type;
import net.sf.openrocket.motor.Manufacturer; import net.sf.openrocket.motor.Manufacturer;
@ -1830,7 +1832,7 @@ public class TestRockets {
OpenRocketSaver saver = new OpenRocketSaver(); OpenRocketSaver saver = new OpenRocketSaver();
try { try {
FileOutputStream str = new FileOutputStream(filename); FileOutputStream str = new FileOutputStream(filename);
saver.save(str, doc, null); saver.save(str, doc, null, new WarningSet(), new ErrorSet());
} }
catch (Exception e) { catch (Exception e) {
System.err.println("exception " + e); System.err.println("exception " + e);

4
core/test/net/sf/openrocket/file/openrocket/OpenRocketSaverTest.java
View File

@ -29,6 +29,8 @@ import net.sf.openrocket.file.RocketLoadException;
import net.sf.openrocket.file.motor.GeneralMotorLoader; import net.sf.openrocket.file.motor.GeneralMotorLoader;
import net.sf.openrocket.l10n.DebugTranslator; import net.sf.openrocket.l10n.DebugTranslator;
import net.sf.openrocket.l10n.Translator; import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.motor.Manufacturer; import net.sf.openrocket.motor.Manufacturer;
import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.ThrustCurveMotor; import net.sf.openrocket.motor.ThrustCurveMotor;
@ -363,7 +365,7 @@ public class OpenRocketSaverTest {
try { try {
file = File.createTempFile( TMP_DIR.getName(), ".ork"); file = File.createTempFile( TMP_DIR.getName(), ".ork");
out = new FileOutputStream(file); out = new FileOutputStream(file);
this.saver.save(out, rocketDoc, options); this.saver.save(out, rocketDoc, options, new WarningSet(), new ErrorSet());
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
fail("FileNotFound saving temp file in: " + TMP_DIR.getName() + ": " + e.getMessage()); fail("FileNotFound saving temp file in: " + TMP_DIR.getName() + ": " + e.getMessage());
} catch (IOException e) { } catch (IOException e) {

128
swing/src/net/sf/openrocket/gui/dialogs/ErrorWarningDialog.java Normal file
View File

@ -0,0 +1,128 @@
package net.sf.openrocket.gui.dialogs;
import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.logging.Error;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.Warning;
import net.sf.openrocket.logging.WarningSet;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSeparator;
import javax.swing.JViewport;
import javax.swing.ListSelectionModel;
import java.awt.Color;
import java.awt.Component;
import java.awt.Rectangle;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
/**
* A message dialog displaying errors and warnings.
*/
@SuppressWarnings("serial")
public abstract class ErrorWarningDialog {
public static void showErrorsAndWarnings(Component parent, Object message, String title, ErrorSet errors, WarningSet warnings) {
JPanel content = new JPanel(new MigLayout("ins 0, fillx"));
StyledLabel label = new StyledLabel("Errors");
label.setFontColor(net.sf.openrocket.util.Color.DARK_RED.toAWTColor());
content.add(label, "wrap, gaptop 15lp");
Error[] e = errors.toArray(new Error[0]);
final JList<Error> errorList = new JList<>(e);
errorList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
errorList.setCellRenderer(new ErrorListCellRenderer());
JScrollPane errorPane = new JScrollPane(errorList);
content.add(errorPane, "wrap, growx");
// Deselect items if clicked on blank region
errorList.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
int selectedIndex = errorList.locationToIndex(e.getPoint());
if (selectedIndex < 0 || !errorList.getCellBounds(0, errorList.getLastVisibleIndex()).contains(e.getPoint())) {
errorList.clearSelection();
}
}
});
content.add(new JSeparator(JSeparator.HORIZONTAL), "wrap");
content.add(new JLabel("Warnings:"), "wrap");
Warning[] w = warnings.toArray(new Warning[0]);
final JList<Warning> warningList = new JList<>(w);
warningList.setCellRenderer(new WarningListCellRenderer());
JScrollPane warningPane = new JScrollPane(warningList);
content.add(warningPane, "wrap, growx");
// Deselect items if clicked on blank region
warningList.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
int selectedIndex = warningList.locationToIndex(e.getPoint());
if (selectedIndex < 0 || !warningList.getCellBounds(0, warningList.getLastVisibleIndex()).contains(e.getPoint())) {
warningList.clearSelection();
}
}
});
JOptionPane.showMessageDialog(parent, new Object[] { message, content },
title, JOptionPane.WARNING_MESSAGE);
}
private static class ErrorListCellRenderer extends DefaultListCellRenderer {
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index,
boolean isSelected, boolean cellHasFocus) {
JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
// Alternating row colors
if (!isSelected) {
if (index % 2 == 0) {
label.setBackground(Color.WHITE);
} else {
label.setBackground(new Color(245, 245, 245));
}
}
// Text color
if (isSelected) {
label.setForeground(Color.WHITE);
} else {
label.setForeground(net.sf.openrocket.util.Color.DARK_RED.toAWTColor());
}
return label;
}
}
private static class WarningListCellRenderer extends DefaultListCellRenderer {
@Override
public Component getListCellRendererComponent(JList<?> list, Object value, int index,
boolean isSelected, boolean cellHasFocus) {
JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
// Alternating row colors
if (!isSelected) {
if (index % 2 == 0) {
label.setBackground(Color.WHITE);
} else {
label.setBackground(new Color(245, 245, 245));
}
}
// Text color
if (isSelected) {
label.setForeground(Color.WHITE);
} else {
label.setForeground(Color.BLACK);
}
return label;
}
}
}

2
swing/src/net/sf/openrocket/gui/dialogs/WarningDialog.java
View File

@ -11,7 +11,7 @@ import net.sf.openrocket.logging.Warning;
import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.logging.WarningSet;
@SuppressWarnings("serial") @SuppressWarnings("serial")
public class WarningDialog extends JDialog { public abstract class WarningDialog {
public static void showWarnings(Component parent, Object message, String title, WarningSet warnings) { public static void showWarnings(Component parent, Object message, String title, WarningSet warnings) {

29
swing/src/net/sf/openrocket/gui/main/BasicFrame.java
View File

@ -49,6 +49,8 @@ import javax.swing.tree.DefaultTreeSelectionModel;
import javax.swing.tree.TreePath; import javax.swing.tree.TreePath;
import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreeSelectionModel;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.dialogs.ErrorWarningDialog;
import net.sf.openrocket.logging.ErrorSet;
import net.sf.openrocket.logging.WarningSet; import net.sf.openrocket.logging.WarningSet;
import net.sf.openrocket.appearance.DecalImage; import net.sf.openrocket.appearance.DecalImage;
import net.sf.openrocket.arch.SystemInfo; import net.sf.openrocket.arch.SystemInfo;
@ -1466,8 +1468,33 @@ public class BasicFrame extends JFrame {
private boolean saveRASAeroFile(File file, StorageOptions options) { private boolean saveRASAeroFile(File file, StorageOptions options) {
try { try {
ROCKET_SAVER.save(file, document, options); ROCKET_SAVER.save(file, document, options);
WarningSet warnings = ROCKET_SAVER.getWarnings();
ErrorSet errors = ROCKET_SAVER.getErrors();
if (errors.isEmpty()) {
WarningDialog.showWarnings(this,
new Object[]{
// // The following problems were encountered while saving
trans.get("BasicFrame.WarningDialog.saving.txt1") + " '" + file.getName() + "'.",
// // Some design features may not have been exported correctly.
trans.get("BasicFrame.WarningDialog.saving.txt2")
},
// // Warnings while opening file
trans.get("BasicFrame.WarningDialog.saving.title"), warnings);
} else {
ErrorWarningDialog.showErrorsAndWarnings(this,
new Object[]{
// // The following problems were encountered while saving
trans.get("BasicFrame.WarningDialog.saving.txt1") + " '" + file.getName() + "'.",
// // Please correct the errors.
trans.get("BasicFrame.ErrorWarningDialog.txt1")
},
// // Errors/Warnings while saving file
trans.get("BasicFrame.ErrorWarningDialog.saving.title"), errors, warnings);
}
// Do not update the save state of the document. // Do not update the save state of the document.
return true; return errors.isEmpty();
} catch (IOException e) { } catch (IOException e) {
return false; return false;
} catch (DecalNotFoundException decex) { } catch (DecalNotFoundException decex) {