Revision: 18413
          http://sourceforge.net/p/jmol/code/18413
Author:   hansonr
Date:     2013-07-03 22:46:37 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/adapter/readers/xtal/MagResReader.java

Modified: trunk/Jmol/src/org/jmol/adapter/readers/xtal/MagResReader.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/xtal/MagResReader.java      
2013-07-03 22:42:04 UTC (rev 18412)
+++ trunk/Jmol/src/org/jmol/adapter/readers/xtal/MagResReader.java      
2013-07-03 22:46:37 UTC (rev 18413)
@@ -10,6 +10,7 @@
 import java.util.Hashtable;
 import java.util.Map;
 
+import org.jmol.util.Escape;
 import org.jmol.util.JmolList;
 import org.jmol.util.Logger;
 import org.jmol.util.SB;
@@ -87,13 +88,13 @@
       if (line.startsWith("symmetry"))
         return readSymmetry();
       if (line.startsWith("units"))
-        return setUnits();
+        return setUnits(false);
       if (line.startsWith("atom"))
         return readAtom();
       break;
     case BLOCK_MAGRES:
       if (line.startsWith("units"))
-        return setUnits();
+        return setUnits(true);
       return readTensor();
     }
     return true;
@@ -173,11 +174,19 @@
   /**
    * catalog units
    * 
+   * @param isMagresBlock
+   * 
    * @return true
    */
-  private boolean setUnits() {
+  private boolean setUnits(boolean isMagresBlock) {
     String[] tokens = getTokens();
-    magresUnits.put(tokens[1], tokens[2]);
+    String id = tokens[1];
+    if (isMagresBlock)
+      appendLoadNote("Ellipsoid set " + Escape.eS(id) + ": "
+          + (id.startsWith("ms") ? "Magnetic Shielding"
+              : id.startsWith("efg") ? "Electric Field Gradient" : id
+                  .startsWith("isc") ? "J-Coupling" : "?"));
+    magresUnits.put(id, tokens[2]);
     return true;
   }
 
@@ -288,13 +297,6 @@
       interactionTensors.addLast(t);
     }
     t.setAtomIndexes(index1, index2);
-    String key = ";" + id +";";
-    if (tensorTypes.indexOf(key) < 0) {
-      tensorTypes += key;
-      appendLoadNote("Ellipsoid set \"" + id + "\": "
-          + (id.startsWith("ms") ? "Magnetic Shielding" : 
-            id.startsWith("efg") ? "Electric Field Gradient" : 
id.startsWith("isc") ? "J-Coupling" : "?"));
-    }
     return true;
   }
 }

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


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits

Reply via email to