From: Michael T H. <mic...@us...> - 2002-12-02 12:04:22
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/render In directory sc8-pr-cvs1:/tmp/cvs-serv25496/render Modified Files: ChemFrameRenderer.java Log Message: no longer using DisplaySettings. everything is under DisplayControl. improvements to PreferencesDialog Index: ChemFrameRenderer.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/render/ChemFrameRenderer.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** ChemFrameRenderer.java 1 Dec 2002 23:08:13 -0000 1.11 --- ChemFrameRenderer.java 2 Dec 2002 12:04:19 -0000 1.12 *************** *** 47,51 **** DisplayControl control) { ChemFrame frame = control.getFrame(); - DisplaySettings settings = control.getSettings(); int numAtoms = frame.getNumberOfAtoms(); if (numAtoms <= 0) { --- 47,50 ---- *************** *** 53,64 **** } int hcFrame = frame.hashCode(); - int hcSettings = settings.hashCode(); if (shapes == null || // did not do shapes yet hcFrame != previousFrameHashCode || // frame itself is changed - hcSettings != previousSettingsHashCode || // settings have changed numAtoms != previousNumberAtoms // #atoms changed (e.g. a delete) ) { previousFrameHashCode = hcFrame; - previousSettingsHashCode = hcSettings; previousNumberAtoms = numAtoms; shapesList.clear(); --- 52,63 ---- } int hcFrame = frame.hashCode(); if (shapes == null || // did not do shapes yet + control.hasStructuralChange() || + // FIXME -- these should be part of hasStructuralChange hcFrame != previousFrameHashCode || // frame itself is changed numAtoms != previousNumberAtoms // #atoms changed (e.g. a delete) ) { + control.resetStructuralChange(); previousFrameHashCode = hcFrame; previousNumberAtoms = numAtoms; shapesList.clear(); *************** *** 130,134 **** private int previousFrameHashCode; - private int previousSettingsHashCode; private int previousNumberAtoms; --- 129,132 ---- |