Author: ruschein
Date: 2010-02-01 14:19:06 -0800 (Mon, 01 Feb 2010)
New Revision: 19099
Modified:
corelibs/trunk/ding/src/ding/view/DGraphView.java
Log:
Removed instrumentation to print out image compression ratios.
Modified: corelibs/trunk/ding/src/ding/view/DGraphView.java
===================================================================
--- corelibs/trunk/ding/src/ding/view/DGraphView.java 2010-02-01 22:17:27 UTC
(rev 19098)
+++ corelibs/trunk/ding/src/ding/view/DGraphView.java 2010-02-01 22:19:06 UTC
(rev 19099)
@@ -99,10 +99,6 @@
// Size of snapshot image
private static final int DEF_SNAPSHOT_SIZE = 400;
- private static double minComprFactorSoFar = Double.MAX_VALUE;
- private static double maxComprFactorSoFar = Double.MIN_VALUE;
- private static double compressionFactors[] = new double[10000];
- private static int compressionFactorCount = 0;
static final float DEFAULT_ANCHOR_SIZE = 9.0f;
static final Paint DEFAULT_ANCHOR_SELECTED_PAINT = Color.red;
@@ -2633,31 +2629,13 @@
* Converts a BufferedImage to a lossless PNG.
*/
private byte[] convertToCompressedImage(final BufferedImage
bufferedImage) {
- System.err.println("Entering convertToCompressedImage()");
try {
final ByteArrayOutputStream baos = new
ByteArrayOutputStream(100000);
- ImageIO.write(bufferedImage, "jpeg", baos);
+ ImageIO.write(bufferedImage, "png", baos);
final byte[] retval = baos.toByteArray();
- final double compressionFactor = (DEF_SNAPSHOT_SIZE *
DEF_SNAPSHOT_SIZE * 4.0) / retval.length;
- if (compressionFactor < minComprFactorSoFar)
- minComprFactorSoFar = compressionFactor;
- if (compressionFactor > maxComprFactorSoFar)
- maxComprFactorSoFar = compressionFactor;
- System.err.println("About to exit
convertToCompressedImage(), compr. factor = " + compressionFactor);
- System.err.println("Min. compr. factor so far = " +
minComprFactorSoFar);
- System.err.println("Max. compr. factor so far = " +
maxComprFactorSoFar);
-
- compressionFactors[compressionFactorCount++] =
compressionFactor;
- // Calc avg.
- double sum = 0.0;
- for (int i = 0; i < compressionFactorCount; ++i)
- sum += compressionFactors[i];
- final double comprFactorAvg = sum /
compressionFactorCount;
- System.err.println("Avg. compr. factor so far = " +
comprFactorAvg);
return retval;
} catch (final IOException e) {
System.err.println("Failed to convert a BufferedImage
to a PNG! (" + e + ")");
- System.exit(-1);
return null;
}
}
@@ -2667,15 +2645,12 @@
* Converts a PNG to a BufferedImage.
*/
private BufferedImage convertToBufferedImage(final byte[]
compressedImage) {
- System.err.println("Entering convertToBufferedImage()");
try {
final ByteArrayInputStream is = new
ByteArrayInputStream(compressedImage);
final BufferedImage retval =
(BufferedImage)ImageIO.read(is);
- System.err.println("About to exit
convertToBufferedImage()");
return retval;
} catch (final IOException e) {
System.err.println("Failed to convert a PNG to a
BufferedImage! (" + e + ")");
- System.exit(-1);
return null;
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
