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

Merge pull request #1017 from SiboVG/issue-987

Browse Source 
[fixes #987] Use warning dialog for thrust curve import issues
This commit is contained in:
Joe Pfeiffer 2021-10-21 15:33:55 -06:00 committed by GitHub
commit ff523003c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -795,6 +795,11 @@ FinSetConfig.lbl.relativeto = relative to
!FinMarkingGuide !FinMarkingGuide
FinMarkingGuide.lbl.Front = Front FinMarkingGuide.lbl.Front = Front
! MotorDatabaseLoaderDialog
MotorDbLoaderDlg.title = Error upon thrust curve import
MotorDbLoaderDlg.message1 = Thrust curve '<b>'{0}'</b>' will be ignored during import.
MotorDbLoaderDlg.message2 = You can try replacing, deleting or manually editing the thrust curve file to fix this issue.
! MotorDatabaseLoadingDialog ! MotorDatabaseLoadingDialog
MotorDbLoadDlg.title = Loading motors MotorDbLoadDlg.title = Loading motors
MotorDbLoadDlg.Loadingmotors = Loading motors... MotorDbLoadDlg.Loadingmotors = Loading motors...

14
swing/src/net/sf/openrocket/database/MotorDatabaseLoader.java
View File

@ -6,8 +6,10 @@ import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.text.MessageFormat;
import java.util.List; import java.util.List;
import net.sf.openrocket.l10n.Translator;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -22,6 +24,8 @@ import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.BugException;
import net.sf.openrocket.util.Pair; import net.sf.openrocket.util.Pair;
import javax.swing.JOptionPane;
/** /**
* An asynchronous database loader that loads the internal thrust curves * An asynchronous database loader that loads the internal thrust curves
* and external user-supplied thrust curves to a ThrustCurveMotorSetDatabase. * and external user-supplied thrust curves to a ThrustCurveMotorSetDatabase.
@ -135,7 +139,17 @@ public class MotorDatabaseLoader extends AsynchronousDatabaseLoader {
private void loadFile(GeneralMotorLoader loader, Pair<String, InputStream> f) { private void loadFile(GeneralMotorLoader loader, Pair<String, InputStream> f) {
try { try {
List<ThrustCurveMotor.Builder> motors = loader.load(f.getV(), f.getU()); List<ThrustCurveMotor.Builder> motors = loader.load(f.getV(), f.getU());
try {
addMotorsFromBuilders(motors); addMotorsFromBuilders(motors);
}
catch (IllegalArgumentException e) {
Translator trans = Application.getTranslator();
String message = "<html><body><p style='width: 400px;'><i>" + e.getMessage() +
"</i>.<br><br>" + MessageFormat.format( trans.get("MotorDbLoaderDlg.message1"), f.getU()) +
"<br>" + trans.get("MotorDbLoaderDlg.message2") + "</p></body></html>";
JOptionPane.showMessageDialog(null,
message, trans.get("MotorDbLoaderDlg.title"), JOptionPane.WARNING_MESSAGE);
}
f.getV().close(); f.getV().close();
} catch (IOException e) { } catch (IOException e) {
log.warn("IOException while loading file " + f.getU() + ": " + e, e); log.warn("IOException while loading file " + f.getU() + ": " + e, e);

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

@ -57,7 +57,7 @@ public class SwingWorkerDialog extends JDialog implements PropertyChangeListener
private SwingWorkerDialog(Window parent, String title, String label, SwingWorker<?, ?> w) { private SwingWorkerDialog(Window parent, String title, String label, SwingWorker<?, ?> w) {
super(parent, title, ModalityType.APPLICATION_MODAL); super(parent, title, ModalityType.DOCUMENT_MODAL);
this.worker = w; this.worker = w;
w.addPropertyChangeListener(this); w.addPropertyChangeListener(this);

2
swing/src/net/sf/openrocket/startup/providers/BlockingMotorDatabaseProvider.java
View File

@ -99,7 +99,7 @@ public class BlockingMotorDatabaseProvider implements Provider<ThrustCurveMotorS
private class LoadingDialog extends JDialog { private class LoadingDialog extends JDialog {
private LoadingDialog() { private LoadingDialog() {
super(null, trans.get("MotorDbLoadDlg.title"), ModalityType.APPLICATION_MODAL); super(null, trans.get("MotorDbLoadDlg.title"), ModalityType.DOCUMENT_MODAL);
JPanel panel = new JPanel(new MigLayout("fill")); JPanel panel = new JPanel(new MigLayout("fill"));
panel.add(new JLabel(trans.get("MotorDbLoadDlg.Loadingmotors")), "wrap para"); panel.add(new JLabel(trans.get("MotorDbLoadDlg.Loadingmotors")), "wrap para");