From: <ha...@us...> - 2006-11-09 23:45:49
|
Revision: 6154 http://svn.sourceforge.net/jmol/?rev=6154&view=rev Author: hansonr Date: 2006-11-09 15:45:44 -0800 (Thu, 09 Nov 2006) Log Message: ----------- 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 2006-11-09 23:24:56 UTC (rev 6153) +++ trunk/Jmol/src/org/jmol/viewer/TransformManager.java 2006-11-09 23:45:44 UTC (rev 6154) @@ -1655,7 +1655,6 @@ rotationCenterDefault = viewer.getBoundBoxCenter(); setFixedRotationCenter(rotationCenterDefault); rotationRadius = rotationRadiusDefault = viewer.calcRotationRadius(rotationCenterDefault); - windowCentered = true; } Point3f getRotationCenter() { Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java =================================================================== --- trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-11-09 23:24:56 UTC (rev 6153) +++ trunk/Jmol/src/org/jmol/viewer/Viewer.java 2006-11-09 23:45:44 UTC (rev 6154) @@ -241,6 +241,7 @@ void reset() { //Eval.reset() //initializeModel + setBooleanProperty("windowCentered", true); transformManager.homePosition(); if (modelManager.modelsHaveSymmetry()) stateManager.setCrystallographicDefaults(); @@ -2967,16 +2968,20 @@ break; } if (key.equalsIgnoreCase("axesWindow")) { - setAxesModeMolecular(false); - break; + setBooleanProperty("axesMolecular", !value); + return; } if (key.equalsIgnoreCase("axesMolecular")) { + if (value) + setBooleanProperty("axesUnitCell", false); setAxesModeMolecular(value); break; } if (key.equalsIgnoreCase("axesUnitCell")) { + if (value) + setBooleanProperty("axesMolecular", false); setAxesModeUnitCell(value); - break; + return; } if (key.equalsIgnoreCase("displayCellParameters")) { setDisplayCellParameters(value); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |