[Jmol-commits] SF.net SVN: jmol:[20452] trunk/Jmol/src/org/jmol

[<ha...@us...>]

Revision: 20452
          http://sourceforge.net/p/jmol/code/20452
Author:   hansonr
Date:     2015-04-22 22:08:40 +0000 (Wed, 22 Apr 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.04.22"

bug fix: loading mmCIF data in-line loses multi-character chain IDs

bug fix: with set picking dragSelected with allowMoveAtoms FALSE and allowRotateSelected TRUE
         rotating the atoms with ALT-left ignores setting of allowMoveAtoms
          
  set allowmoveatoms false; 
  set allowrotateselected true; 
  

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/io/DOMReader.java
    trunk/Jmol/src/org/jmol/modelset/Chain.java
    trunk/Jmol/src/org/jmol/viewer/FileManager.java
    trunk/Jmol/src/org/jmol/viewer/Jmol.properties
    trunk/Jmol/src/org/jmol/viewer/Viewer.java

Modified: trunk/Jmol/src/org/jmol/io/DOMReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/io/DOMReader.java	2015-04-17 21:57:47 UTC (rev 20451)
+++ trunk/Jmol/src/org/jmol/io/DOMReader.java	2015-04-22 22:08:40 UTC (rev 20452)
@@ -52,11 +52,12 @@
     // and we cannot pass [HTMLUnknownObject]
     if (info != null)
       htParams.put("nameSpaceInfo", info);
+    // no append option here
+    vwr.zap(false, true, false);
     atomSetCollection = vwr.getModelAdapter().getAtomSetCollectionFromDOM(
         aDOMNode, htParams);
     if (atomSetCollection instanceof String)
       return;
-    vwr.zap(false, true, false);
     fm.setFileInfo(new String[] { "JSNode" });
   }
 }
\ No newline at end of file

Modified: trunk/Jmol/src/org/jmol/modelset/Chain.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/Chain.java	2015-04-17 21:57:47 UTC (rev 20451)
+++ trunk/Jmol/src/org/jmol/modelset/Chain.java	2015-04-22 22:08:40 UTC (rev 20452)
@@ -78,7 +78,7 @@
    * @return actual string form of the chain identifier
    */
   public String getIDStr() {
-    return (chainID == 0 ? "" : chainID < 256 ? "" + (char) chainID : (String) model.ms.vwr.chainMap.get(Integer.valueOf(chainID)));
+    return (chainID == 0 ? "" : chainID < 256 ? "" + (char) chainID : (String) model.ms.vwr.getChainIDStr(chainID));
   }
 
   /**

Modified: trunk/Jmol/src/org/jmol/viewer/FileManager.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/FileManager.java	2015-04-17 21:57:47 UTC (rev 20451)
+++ trunk/Jmol/src/org/jmol/viewer/FileManager.java	2015-04-22 22:08:40 UTC (rev 20452)
@@ -257,7 +257,9 @@
     if (fnames != null)
       setFileInfo(fnames);
     if (!isAppend && !(fileReader.getAtomSetCollection() instanceof String)) {
-      vwr.zap(false, true, false);
+// zap is unnecessary  - it was done already in FileReader, and it 
+// inappropriately clears the PDB chain name map
+//      vwr.zap(false, true, false);
       setFileInfo(new String[] { strModel == JC.MODELKIT_ZAP_STRING ? JC.MODELKIT_ZAP_TITLE
           : "string"});
     }

Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2015-04-17 21:57:47 UTC (rev 20451)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties	2015-04-22 22:08:40 UTC (rev 20452)
@@ -14,8 +14,18 @@
 
 TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT command for problems)
 
-Jmol.___JmolVersion="14.3.13_2015.04.17"
+Jmol.___JmolVersion="14.3.13_2015.04.22"
 
+bug fix: loading mmCIF data in-line loses multi-character chain IDs
+
+bug fix: with set picking dragSelected with allowMoveAtoms FALSE and allowRotateSelected TRUE
+         rotating the atoms with ALT-left ignores setting of allowMoveAtoms
+          
+  set allowmoveatoms false; 
+  set allowrotateselected true; 
+  
+JmolVersion="14.3.13_2015.04.17"
+
 bug fix: for in/from broken in 14.3.13_2015.04.05
  -- entering a FOR loop with empty has pops {...} context one level too far, exiting functions
 

Modified: trunk/Jmol/src/org/jmol/viewer/Viewer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Viewer.java	2015-04-17 21:57:47 UTC (rev 20451)
+++ trunk/Jmol/src/org/jmol/viewer/Viewer.java	2015-04-22 22:08:40 UTC (rev 20452)
@@ -983,10 +983,12 @@
   }
 
   void rotateSelected(float deltaX, float deltaY, BS bsSelected) {
+    // bsSelected null comes from sync. 
     if (isJmolDataFrame())
       return;
     //if (mouseEnabled) {
-    tm.rotateXYBy(deltaX, deltaY, setMovableBitSet(bsSelected, false));
+    // "true" in setMovableBitSet call is necessary to implement set allowMoveAtoms
+    tm.rotateXYBy(deltaX, deltaY, setMovableBitSet(bsSelected, true));
     refreshMeasures(true);
     //}
     //TODO: note that sync may not work with set allowRotateSelectedAtoms

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.