From: <ha...@us...> - 2013-04-02 05:14:18
|
Revision: 18057 http://sourceforge.net/p/jmol/code/18057 Author: hansonr Date: 2013-04-02 05:14:13 +0000 (Tue, 02 Apr 2013) Log Message: ----------- ___JmolVersion="13.1.15_dev_01.04.2013c" new feature: Jmol or JmolData with -g0x0 and load filter "DORESIZE" will automatically resize the image: JmolData -ns "load t.pse filter 'DORESIZE'" -g0x0 -w "PNGJ:t.png" bug fix: JmolData broken Modified Paths: -------------- trunk/Jmol/src/org/jmol/viewer/AnimationManager.java trunk/Jmol/src/org/jmol/viewer/Jmol.properties trunk/Jmol/src/org/jmol/viewer/Viewer.java Modified: trunk/Jmol/src/org/jmol/viewer/AnimationManager.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/AnimationManager.java 2013-04-02 03:21:37 UTC (rev 18056) +++ trunk/Jmol/src/org/jmol/viewer/AnimationManager.java 2013-04-02 05:14:13 UTC (rev 18057) @@ -52,9 +52,11 @@ int animationDirection = 1; int currentDirection = 1; public int currentModelIndex; + private int currentFrameIndex; int firstFrameIndex; int lastFrameIndex; int frameStep; + float currentMorphFrame; public int morphCount; public int firstFrameDelayMs; @@ -72,9 +74,6 @@ private Map<String, Object> movie; - private int currentFrameIndex; - float currentMorphFrame; - void clear() { setMovie(null); initializePointers(0); @@ -499,7 +498,7 @@ case 0: if (morphCount > 0) return "-" + (1 + currentMorphFrame); - i = currentFrameIndex; + i = getCurrentFrame(); break; case 1: i = lastFrameIndex; Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-04-02 03:21:37 UTC (rev 18056) +++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2013-04-02 05:14:13 UTC (rev 18057) @@ -9,8 +9,14 @@ # The quotes above look odd for a parameter file, but they are # important for the JavaScript version of Jmol. -___JmolVersion="13.1.15_dev_01.04.2013b" +___JmolVersion="13.1.15_dev_01.04.2013c" +new feature: Jmol or JmolData with -g0x0 and load filter "DORESIZE" will automatically + resize the image: + + JmolData -ns "load t.pse filter 'DORESIZE'" -g0x0 -w "PNGJ:t.png" + +bug fix: JmolData broken bug fix: PyMOL reader: cartoon_ladder_mode approximation as cartoons bug fix: PyMOL reader: includes cartoon type 1,4,7 -> trace Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-04-02 03:21:37 UTC (rev 18056) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2013-04-02 05:14:13 UTC (rev 18057) @@ -4152,9 +4152,9 @@ setStatusResized(width, height); } } else { - width = dimScreen.width; - height = dimScreen.height; - } + width = (dimScreen.width == 0 ? dimScreen.width = 500 : dimScreen.width); + height = (dimScreen.height == 0 ? dimScreen.height = 500 : dimScreen.height); + } transformManager.setScreenParameters(width, height, isImageWrite || isReset ? global.zoomLarge : false, antialiasDisplay, false, false); @@ -5014,7 +5014,7 @@ } JmolList<JmolList<JmolList<Object>>> getStatusChanged(String statusNameList) { - return statusManager.getStatusChanged(statusNameList); + return (statusNameList == null ? null : statusManager.getStatusChanged(statusNameList)); } public boolean menuEnabled() { @@ -10028,7 +10028,11 @@ @Override public void resizeInnerPanel(int width, int height) { - statusManager.resizeInnerPanel(width, height); + if (autoExit || !haveDisplay) { + setScreenDimension(width, height); + } else { + statusManager.resizeInnerPanel(width, height); + } } public String getFontLineShapeState(String s, String myType, TickInfo[] tickInfos) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |