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

[hansonr]

Revision: 18430
          http://sourceforge.net/p/jmol/code/18430
Author:   hansonr
Date:     2013-07-04 21:54:56 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/render/EchoRenderer.java
    trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
    trunk/Jmol/src/org/jmol/shape/Echo.java
    trunk/Jmol/src/org/jmol/viewer/StateCreator.java

Modified: trunk/Jmol/src/org/jmol/render/EchoRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/render/EchoRenderer.java    2013-07-04 21:54:37 UTC 
(rev 18429)
+++ trunk/Jmol/src/org/jmol/render/EchoRenderer.java    2013-07-04 21:54:56 UTC 
(rev 18430)
@@ -26,6 +26,7 @@
 import java.util.Iterator;
 
 
+import org.jmol.modelset.Atom;
 import org.jmol.modelset.Object2d;
 import org.jmol.modelset.Text;
 import org.jmol.script.T;
@@ -49,6 +50,10 @@
       if (!t.visible || t.hidden) {
         continue;
       }
+      if (t.pointerPt instanceof Atom) {
+        if (!((Atom) t.pointerPt).isVisible(-1))
+          continue;
+      }
       if (t.valign == Object2d.VALIGN_XYZ) {
         viewer.transformPtScr(t.xyz, pt0i);
         t.setXYZs(pt0i.x, pt0i.y, pt0i.z, pt0i.z);

Modified: trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-07-04 21:54:37 UTC 
(rev 18429)
+++ trunk/Jmol/src/org/jmol/script/ScriptEvaluator.java 2013-07-04 21:54:56 UTC 
(rev 18430)
@@ -4834,6 +4834,8 @@
     case T.bitset:
     case T.expressionBegin:
       BS bs = atomExpression(st, i, 0, true, false, false, true);
+      if (bs != null && bs.cardinality() == 1)
+        return viewer.getAtomPoint3f(bs.nextSetBit(0));
       if (bs != null)
         return viewer.getAtomSetCenter(bs);
       if (expressionResult instanceof P3)

Modified: trunk/Jmol/src/org/jmol/shape/Echo.java
===================================================================
--- trunk/Jmol/src/org/jmol/shape/Echo.java     2013-07-04 21:54:37 UTC (rev 
18429)
+++ trunk/Jmol/src/org/jmol/shape/Echo.java     2013-07-04 21:54:56 UTC (rev 
18430)
@@ -72,7 +72,7 @@
       if (currentObject == null)
         return;
       Text t = (Text) currentObject;
-      t.pointerPt = (value == null ? null : P3.newP((P3)value));
+      t.pointerPt = (value == null ? null : (P3)value); // could be an atom.
       t.pointer = (value == null ? Object2d.POINTER_NONE : 
Object2d.POINTER_ON);
       return;
     }

Modified: trunk/Jmol/src/org/jmol/viewer/StateCreator.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/StateCreator.java    2013-07-04 21:54:37 UTC 
(rev 18429)
+++ trunk/Jmol/src/org/jmol/viewer/StateCreator.java    2013-07-04 21:54:56 UTC 
(rev 18430)
@@ -1328,7 +1328,8 @@
           viewer.getModelNumberDotted(t.modelIndex)).append(";\n");
     if (t.pointerPt != null) {
       s.append("  ").append(echoCmd).append(" point ").append(
-          Escape.eP(t.pointerPt)).append(";\n");
+          t.pointerPt instanceof Atom ? "({" + ((Atom) t.pointerPt).index + 
"})" 
+              : Escape.eP(t.pointerPt)).append(";\n");
 
     }
     //    }

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