From: <ha...@us...> - 2011-09-08 15:09:07
|
Revision: 16045 http://jmol.svn.sourceforge.net/jmol/?rev=16045&view=rev Author: hansonr Date: 2011-09-08 15:09:01 +0000 (Thu, 08 Sep 2011) Log Message: ----------- version=12.0.50_dev # bug fix: AtomSetChooser set up too late -- can override embedded jmolScript vibration/vector scale commands Modified Paths: -------------- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties branches/v12_0/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java Modified: branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties =================================================================== --- branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-09-08 15:07:15 UTC (rev 16044) +++ branches/v12_0/Jmol/src/org/jmol/viewer/Jmol.properties 2011-09-08 15:09:01 UTC (rev 16045) @@ -4,6 +4,8 @@ version=12.0.50_dev +# bug fix: AtomSetChooser set up too late -- can override embedded jmolScript vibration/vector scale commands + # -------------------------------------------------------------- #version=12.0.49 Modified: branches/v12_0/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java =================================================================== --- branches/v12_0/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java 2011-09-08 15:07:15 UTC (rev 16044) +++ branches/v12_0/Jmol/src/org/openscience/jmol/app/jmolpanel/JmolPanel.java 2011-09-08 15:09:01 UTC (rev 16045) @@ -258,6 +258,13 @@ //if (c != null) //historyFile.repositionWindow(EDITOR_WINDOW_NAME, c, 150, 50); + // it's important to set this up first, even though it consumes some memory + // otherwise, loading a new model in a script that sets the vibration or vector parameters + // can appear to skip those -- they aren't skipped, but creating the atomSetChooser + // will run scripts as it loads. + atomSetChooser = new AtomSetChooser(viewer, frame); + pcs.addPropertyChangeListener(chemFileProperty, atomSetChooser); + say(GT._("Setting up Drag-and-Drop...")); new JmolFileDropper(viewer); say(GT._("Launching main frame...")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |