From: <ha...@us...> - 2008-02-05 12:24:45
|
Revision: 8952 http://jmol.svn.sourceforge.net/jmol/?rev=8952&view=rev Author: hansonr Date: 2008-02-05 04:24:43 -0800 (Tue, 05 Feb 2008) Log Message: ----------- debug comments out Modified Paths: -------------- trunk/Jmol/src/org/jmol/shape/Labels.java trunk/Jmol/src/org/jmol/shape/LabelsRenderer.java trunk/Jmol/src/org/jmol/shape/Text.java trunk/Jmol/src/org/jmol/viewer/TransformManager.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/shape/Labels.java =================================================================== --- trunk/Jmol/src/org/jmol/shape/Labels.java 2008-02-05 06:38:50 UTC (rev 8951) +++ trunk/Jmol/src/org/jmol/shape/Labels.java 2008-02-05 12:24:43 UTC (rev 8952) @@ -109,7 +109,6 @@ } if ("label" == propertyName) { - System.out.println("Label: sppa =" + viewer.getScalePixelsPerAngstrom()); isActive = true; if (bsSizeSet == null) bsSizeSet = new BitSet(); Modified: trunk/Jmol/src/org/jmol/shape/LabelsRenderer.java =================================================================== --- trunk/Jmol/src/org/jmol/shape/LabelsRenderer.java 2008-02-05 06:38:50 UTC (rev 8951) +++ trunk/Jmol/src/org/jmol/shape/LabelsRenderer.java 2008-02-05 12:24:43 UTC (rev 8952) @@ -55,7 +55,6 @@ int backgroundColor = viewer.getBackgroundArgb(); float scalePixelsPerMicron = (viewer.getFontScaling() ? viewer.getScalePixelsPerAngstrom() * 10000 : 0); float imageFontScaling = viewer.getImageFontScaling(); - System.out.println("LabelsRenderer imageFontScaling=" + imageFontScaling + " sppm=" + (viewer.getScalePixelsPerAngstrom()*10000)); for (int i = labelStrings.length; --i >= 0;) { Atom atom = atoms[i]; Modified: trunk/Jmol/src/org/jmol/shape/Text.java =================================================================== --- trunk/Jmol/src/org/jmol/shape/Text.java 2008-02-05 06:38:50 UTC (rev 8951) +++ trunk/Jmol/src/org/jmol/shape/Text.java 2008-02-05 12:24:43 UTC (rev 8952) @@ -115,7 +115,7 @@ short bgcolix, int offsetX, int offsetY, int z, int zSlab, int textAlign, float scalePixelsPerMicron) { this.scalePixelsPerMicron = scalePixelsPerMicron; - System.out.println("Text scalePixelsPerMicron=" + scalePixelsPerMicron); + //System.out.println("Text scalePixelsPerMicron=" + scalePixelsPerMicron); this.viewer = null; this.g3d = g3d; atomBased = true; @@ -306,7 +306,7 @@ private void setFontScale(float scale) { if (fontScale == scale) return; - System.out.println(fontSize + " " + scale + " " + (fontSize * scale)); + //System.out.println(fontSize + " " + scale + " " + (fontSize * scale)); float fs = fontSize; fontScale = scale; setFont(g3d.getFont3D(font.idFontFace, font.idFontStyle, fs * scale)); @@ -382,7 +382,7 @@ float imageFontScaling) { if (text == null) return; - System.out.println("render scalePixelsPerMicron=" + scalePixelsPerMicron); + //System.out.println("render scalePixelsPerMicron=" + scalePixelsPerMicron); windowWidth = g3d.getRenderWidth(); windowHeight = g3d.getRenderHeight(); if (this.scalePixelsPerMicron < 0 && scalePixelsPerMicron != 0) @@ -426,9 +426,9 @@ float x = x0; float y = boxY + ascent + adj; - System.out.println("scale=" + fontScale + " boxwidth/height=" + boxWidth - + "/" + boxHeight + " ascent=" + ascent + " lineheight=" + lineHeight - + " boxY=" + boxY + " adj=" + adj); + //System.out.println("scale=" + fontScale + " boxwidth/height=" + boxWidth + // + "/" + boxHeight + " ascent=" + ascent + " lineheight=" + lineHeight + //+ " boxY=" + boxY + " adj=" + adj); offset = lineHeight; for (int i = 0; i < lines.length; i++) { switch (align) { @@ -466,7 +466,7 @@ * windowWidth / 100 : is3dEcho ? movableX : movableX * fontScale); float offsetX = this.offsetX * fontScale; xLeft = xRight = xCenter = x + offsetX; - System.out.print("movableX = " + movableX + " offsetX = " + offsetX); + //System.out.print("movableX = " + movableX + " offsetX = " + offsetX); } else { xLeft = 5 * fontScale; xCenter = windowWidth / 2; @@ -501,14 +501,14 @@ * windowHeight / 100 : is3dEcho? movableY : movableY * fontScale); float offsetY = this.offsetY * fontScale; boxY = (is3dEcho ? y : (windowHeight - y)) + offsetY; - System.out.println(" movableY = " + movableY + " offsetY = " + offsetY + " boxY=" + boxY); + //System.out.println(" movableY = " + movableY + " offsetY = " + offsetY + " boxY=" + boxY); } } void setBoxOffsetsInWindow() { float xAdj = 0; float yAdj = 0; - System.out.println("lineHeight="+lineHeight); + //System.out.println("lineHeight="+lineHeight); //boolean is3dEcho = (atomBased || xyz != null); if (!adjustForWindow) yAdj -= lineHeight; Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2008-02-05 06:38:50 UTC (rev 8951) +++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2008-02-05 12:24:43 UTC (rev 8952) @@ -1018,9 +1018,9 @@ height = (antialias ? screenHeight * 2 : screenHeight); scaleFitToScreen(false, useZoomLarge, resetSlab, resetZoom); finalizeTransformParameters(); - System.out.println("transformManager setScreenParameters sppa=" + scalePixelsPerAngstrom - + " screenWidth,Height, useZoomLarge, antialias, resetSlab, resetZoom " - + useZoomLarge + ","+antialias + "," + resetSlab + "," + resetZoom); + //System.out.println("transformManager setScreenParameters sppa=" + scalePixelsPerAngstrom + // + " screenWidth,Height, useZoomLarge, antialias, resetSlab, resetZoom " + //+ useZoomLarge + ","+antialias + "," + resetSlab + "," + resetZoom); } void setAntialias(boolean TF) { @@ -1088,7 +1088,7 @@ if (screenPixelCount > 2) screenPixelCount -= 2; scaleDefaultPixelsPerAngstrom = defaultScaleToScreen(modelRadius); - System.out.println("transformman -- setScreenParameters modelRadius " + modelRadius + " " + screenPixelCount + " " + scaleDefaultPixelsPerAngstrom); + //System.out.println("transformman -- setScreenParameters modelRadius " + modelRadius + " " + screenPixelCount + " " + scaleDefaultPixelsPerAngstrom); } short scaleToScreen(int z, int milliAngstroms) { Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2008-02-05 06:38:50 UTC (rev 8951) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2008-02-05 12:24:43 UTC (rev 8952) @@ -806,8 +806,7 @@ void finalizeTransformParameters() { //FrameRenderer //InitializeModel - System.out.println("viewer finalizeTP"); - + transformManager.finalizeTransformParameters(); g3d.setSlabAndDepthValues(transformManager.slabValue, transformManager.depthValue, global.zShade); @@ -2900,7 +2899,7 @@ boolean isImageWrite, boolean isGenerator, boolean isReset) { - System.out.println("Viewer-resizeImage: isImageWrite/reset " + isImageWrite + " " + isReset); + //System.out.println("Viewer-resizeImage: isImageWrite/reset " + isImageWrite + " " + isReset); if (width > 0) { if (isImageWrite && !isReset) setImageFontScaling(width, height); @@ -2917,7 +2916,7 @@ } if (antialiasDisplay) imageFontScaling *= 2; - System.out.println("viewer:setImageFontScaling " + imageFontScaling); + //System.out.println("viewer:setImageFontScaling " + imageFontScaling); if (width > 0 && !isImageWrite) { global.setParameterValue("_width", width); global.setParameterValue("_height", height); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |