From: <ha...@us...> - 2007-10-22 06:48:25
|
Revision: 8489 http://jmol.svn.sourceforge.net/jmol/?rev=8489&view=rev Author: hansonr Date: 2007-10-21 23:48:23 -0700 (Sun, 21 Oct 2007) Log Message: ----------- version=11.3.36_dev # antialias better dots Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/TransformManager.java trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/TransformManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2007-10-22 06:48:09 UTC (rev 8488) +++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2007-10-22 06:48:23 UTC (rev 8489) @@ -92,7 +92,7 @@ private void setViewer(Viewer viewer, int width, int height) { this.viewer = viewer; - setScreenDimension(width, height, true, false); + setScreenDimension(width, height, true, false, true); } boolean checkedForNavigation = false; @@ -1100,10 +1100,10 @@ float scaleDefaultPixelsPerAngstrom; void setScreenDimension(int width, int height, boolean useZoomLarge, - boolean antialias) { + boolean antialias, boolean resetSlab) { this.width = (antialias ? width * 2 : width); this.height = (antialias ? height * 2 : height); - scaleFitToScreen(false, useZoomLarge); + scaleFitToScreen(false, useZoomLarge, resetSlab); } private float defaultScaleToScreen(float radius) { @@ -1123,17 +1123,18 @@ } void scaleFitToScreen(boolean andCenter) { - scaleFitToScreen(andCenter, viewer.getZoomLarge()); + scaleFitToScreen(andCenter, viewer.getZoomLarge(), true); } - void scaleFitToScreen(boolean andCenter, boolean zoomLarge) { + void scaleFitToScreen(boolean andCenter, boolean zoomLarge, + boolean resetSlab) { if (width == 0 || height == 0) return; // translate to the middle of the screen fixedTranslation.set(width * (andCenter ? 0.5f : xTranslationFraction), height * (andCenter ? 0.5f : yTranslationFraction), 0); setTranslationFractions(); - resetNavigationPoint(true); + resetNavigationPoint(resetSlab); // 2005 02 22 // switch to finding larger screen dimension // find smaller screen dimension Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2007-10-22 06:48:09 UTC (rev 8488) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2007-10-22 06:48:23 UTC (rev 8489) @@ -2714,7 +2714,7 @@ // Logger.debug("viewer.setInMotion("+inMotion+")"); if (wasInMotion ^ inMotion) { repaintManager.setInMotion(inMotion); - resizeImage(dimScreen.width, dimScreen.height, false, false, true); + //resizeImage(dimScreen.width, dimScreen.height, false, false, true); if (inMotion) { ++motionEventNumber; } else { @@ -2835,7 +2835,8 @@ } transformManager.setScreenDimension(width, height, - isImageWrite || isReset? global.zoomLarge : false, antialias); + isImageWrite || isReset? global.zoomLarge : false, + antialias, false); g3d.setWindowSize(width, height, antialias); } @@ -4950,7 +4951,7 @@ private void setZoomLarge(boolean TF) { global.zoomLarge = TF; - transformManager.scaleFitToScreen(false, global.zoomLarge); + transformManager.scaleFitToScreen(false, global.zoomLarge, false); } boolean getZoomLarge() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |