From 49c9329fde5e171aafa8d6a9259734ee185fd31a Mon Sep 17 00:00:00 2001 From: Kevin Ruland Date: Thu, 19 Jul 2012 21:21:09 +0000 Subject: [PATCH] Added option to include decals when saving a file. --- core/src/net/sf/openrocket/document/StorageOptions.java | 9 +++++++++ core/src/net/sf/openrocket/gui/StorageOptionChooser.java | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/core/src/net/sf/openrocket/document/StorageOptions.java b/core/src/net/sf/openrocket/document/StorageOptions.java index 7e1186c1e..079c5310d 100644 --- a/core/src/net/sf/openrocket/document/StorageOptions.java +++ b/core/src/net/sf/openrocket/document/StorageOptions.java @@ -7,12 +7,21 @@ public class StorageOptions implements Cloneable { public static final double SIMULATION_DATA_NONE = Double.POSITIVE_INFINITY; public static final double SIMULATION_DATA_ALL = 0; + private boolean includeDecals = false; + private boolean compressionEnabled = true; private double simulationTimeSkip = SIMULATION_DATA_NONE; private boolean explicitlySet = false; + public boolean isIncludeDecals() { + return includeDecals; + } + + public void setIncludeDecals(boolean includeDecals) { + this.includeDecals = includeDecals; + } public boolean isCompressionEnabled() { return compressionEnabled; diff --git a/core/src/net/sf/openrocket/gui/StorageOptionChooser.java b/core/src/net/sf/openrocket/gui/StorageOptionChooser.java index 49b21974c..0f6c18657 100644 --- a/core/src/net/sf/openrocket/gui/StorageOptionChooser.java +++ b/core/src/net/sf/openrocket/gui/StorageOptionChooser.java @@ -40,6 +40,7 @@ public class StorageOptionChooser extends JPanel { private JSpinner timeSpinner; private JCheckBox compressButton; + private JCheckBox decalButton; private JLabel estimateLabel; @@ -122,6 +123,11 @@ public class StorageOptionChooser extends JPanel { noneButton.addActionListener(actionUpdater); this.add(noneButton, "spanx, wrap 20lp"); + //// Save decals + decalButton = new JCheckBox(trans.get("StorageOptChooser.checkbox.IncludeDecals")); + decalButton.setToolTipText(trans.get("StorageOptChooser.lbl.IncludeDecals")); + decalButton.addActionListener(actionUpdater); + this.add(decalButton, "spanx, wrap para"); //// Compress file compressButton = new JCheckBox(trans.get("StorageOptChooser.checkbox.Compfile")); @@ -188,6 +194,7 @@ public class StorageOptionChooser extends JPanel { opts.setSimulationTimeSkip(t); + opts.setIncludeDecals(decalButton.isSelected()); opts.setCompressionEnabled(compressButton.isSelected()); opts.setExplicitlySet(true);