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

Make sure image save dialog happens in EDT.

Browse Source
This commit is contained in:
bkuker 2014-01-12 21:07:07 -05:00
parent 78ab978180
commit e2f810d3cd
1 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
swing/src/net/sf/openrocket/gui/figure3d/photo/PhotoFrame.java
View File

@ -23,6 +23,7 @@ import javax.swing.JMenu;
import javax.swing.JMenuBar; import javax.swing.JMenuBar;
import javax.swing.JMenuItem; import javax.swing.JMenuItem;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import javax.swing.SwingUtilities;
import javax.swing.filechooser.FileFilter; import javax.swing.filechooser.FileFilter;
import net.sf.openrocket.database.Databases; import net.sf.openrocket.database.Databases;
@ -151,6 +152,9 @@ public class PhotoFrame extends JFrame {
photoPanel.addImageCallback(new PhotoPanel.ImageCallback() { photoPanel.addImageCallback(new PhotoPanel.ImageCallback() {
@Override @Override
public void performAction(final BufferedImage image) { public void performAction(final BufferedImage image) {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
log.info("Got image {} to save...", image); log.info("Got image {} to save...", image);
final FileFilter png = new SimpleFileFilter("PNG Image", ".png"); // TODO final FileFilter png = new SimpleFileFilter("PNG Image", ".png"); // TODO
@ -192,6 +196,8 @@ public class PhotoFrame extends JFrame {
}); });
} }
}); });
}
});
menu.add(item); menu.add(item);
// // Edit // // Edit
@ -332,7 +338,7 @@ public class PhotoFrame extends JFrame {
pa.setVisible(true); pa.setVisible(true);
GeneralRocketLoader grl = new GeneralRocketLoader(new File( GeneralRocketLoader grl = new GeneralRocketLoader(new File(
"C:/Users/bkuker/git/openrocket/swing/resources/datafiles/examples/A simple model rocket.ork")); "/Users/bkuker/git/openrocket/swing/resources/datafiles/examples/A simple model rocket.ork"));
OpenRocketDocument doc = grl.load(); OpenRocketDocument doc = grl.load();
pa.photoPanel.setDoc(doc); pa.photoPanel.setDoc(doc);
} }