git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a3b4ec9
)
house-keeping
author
Charles Ofoegbu
<tcnofoegbu@dundee.ac.uk>
Wed, 12 Nov 2014 20:07:58 +0000
(20:07 +0000)
committer
Charles Ofoegbu
<tcnofoegbu@dundee.ac.uk>
Wed, 12 Nov 2014 20:07:58 +0000
(20:07 +0000)
src/jalview/util/ImageMaker.java
patch
|
blob
|
history
diff --git
a/src/jalview/util/ImageMaker.java
b/src/jalview/util/ImageMaker.java
index
1953a60
..
61ef34f
100755
(executable)
--- a/
src/jalview/util/ImageMaker.java
+++ b/
src/jalview/util/ImageMaker.java
@@
-38,14
+38,6
@@
import org.jibble.epsgraphics.EpsGraphics2D;
public class ImageMaker
{
public class ImageMaker
{
- // public static final int EPS = 0;
- //
- // public static final int PNG = 1;
- //
- // public static final int SVG = 2;
- //
- // int type = -1;
-
EpsGraphics2D pg;
SVGGraphics2D g2;
EpsGraphics2D pg;
SVGGraphics2D g2;
@@
-103,20
+95,16
@@
public class ImageMaker
if (file == null)
{
JalviewFileChooser chooser;
if (file == null)
{
JalviewFileChooser chooser;
- // chooser = type == EPS ? getEPSChooser() : getPNGChooser();
chooser = type.getChooser();
chooser = type.getChooser();
-
chooser.setFileView(new jalview.io.JalviewFileView());
chooser.setDialogTitle(title);
chooser.setToolTipText(MessageManager.getString("action.save"));
chooser.setFileView(new jalview.io.JalviewFileView());
chooser.setDialogTitle(title);
chooser.setToolTipText(MessageManager.getString("action.save"));
-
int value = chooser.showSaveDialog(parent);
if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION)
{
jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
.getSelectedFile().getParent());
int value = chooser.showSaveDialog(parent);
if (value == jalview.io.JalviewFileChooser.APPROVE_OPTION)
{
jalview.bin.Cache.setProperty("LAST_DIRECTORY", chooser
.getSelectedFile().getParent());
-
file = chooser.getSelectedFile();
}
}
file = chooser.getSelectedFile();
}
}
@@
-165,12
+153,14
@@
public class ImageMaker
pg.close();
break;
case SVG:
pg.close();
break;
case SVG:
- String svg = ((SVGGraphics2D) getGraphics()).getSVGDocument();
- out.write(svg.getBytes());
+ String svgData = ((SVGGraphics2D) getGraphics()).getSVGDocument();
+ out.write(svgData.getBytes());
+ out.flush();
out.close();
break;
case PNG:
ImageIO.write(bi, "png", out);
out.close();
break;
case PNG:
ImageIO.write(bi, "png", out);
+ out.flush();
out.close();
break;
}
out.close();
break;
}