[Jmol-commits] SF.net SVN: jmol:[14188] trunk/Jmol/src/org/jmol/modelset/AtomCollection. java

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

Revision: 14188
          http://jmol.svn.sourceforge.net/jmol/?rev=14188&view=rev
Author:   hansonr
Date:     2010-08-29 05:34:37 +0000 (Sun, 29 Aug 2010)

Log Message:
-----------
version=12.1.9_dev # new feature: label %[shape]

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/modelset/AtomCollection.java

Modified: trunk/Jmol/src/org/jmol/modelset/AtomCollection.java
===================================================================
--- trunk/Jmol/src/org/jmol/modelset/AtomCollection.java	2010-08-29 04:29:16 UTC (rev 14187)
+++ trunk/Jmol/src/org/jmol/modelset/AtomCollection.java	2010-08-29 05:34:37 UTC (rev 14188)
@@ -1774,36 +1774,39 @@
       // just return geometry
       switch (n) {
       default:
-        return "?";
+        return "";
       case 0:
         return "";// just ignore atoms with only one bond? (atom.getElementNumber() == 1 ? "s" : "");
+      case 1:
+        return "linear";
       case 100:
       case 10:
-      case 1:
         return "bent";
       case 201:
-        return "T-shaped -- AX3E or AX3E2 or AX3E3";
+        return "T-shaped";// -- AX3E or AX3E2 or AX3E3";
       case 30:
-        return "trigonal planar -- AX3";
+        return "trigonal planar";// -- AX3";
       case 120:
+      case 210:
       case 300:
-      case 210:
-        return "trigonal pyramidal -- AX3E";
+        return "trigonal pyramidal";// -- AX3E";
       case 330: 
-        return "uncapped trigonal pyramid -- AX4E";
+        return "uncapped trigonal pyramid";// -- AX4E";
       case 60:
-        return "tetrahedral -- AX4";
+      case 150:
+      case 240:
+        return "tetrahedral";// -- AX4";
       case 402:
-        return "square planar -- AX4E2";
+        return "square planar";// -- AX4E2";
       case 411:
       case 501:
-        return "see-saw -- AX4E";
+        return "see-saw";// -- AX4E";
       case 631:
-        return "trigonal bipyramidal -- AX5";
+        return "trigonal bipyramidal";// -- AX5";
       case 802:
-        return "uncapped square pyramid -- AX5E";
+        return "uncapped square pyramid";// -- AX5E";
       case 1203:
-        return "octahedral -- AX6";
+        return "octahedral";// -- AX6";
       }
     }
 


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