[Jmol-commits] SF.net SVN: jmol: [4782] branches/r4453rollback/Jmol/src/org/jmol/viewer

[<mig...@us...>]

Revision: 4782
Author:   migueljmol
Date:     2006-03-27 08:30:39 -0800 (Mon, 27 Mar 2006)
ViewCVS:  http://svn.sourceforge.net/jmol/?rev=4782&view=rev

Log Message:
-----------
selectively applied patch r4565 for residue number comparisons

Modified Paths:
--------------
    branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java
    branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java
    branches/r4453rollback/Jmol/src/org/jmol/viewer/Group.java
Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java
===================================================================
--- branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java	2006-03-27 16:14:25 UTC (rev 4781)
+++ branches/r4453rollback/Jmol/src/org/jmol/viewer/Atom.java	2006-03-27 16:30:39 UTC (rev 4782)
@@ -373,9 +373,17 @@
   }
 
   int getSeqcode() {
+    if (group == null)
+      return -1;
     return group.seqcode;
   }
 
+  int getResno() {
+    if (group == null)
+      return -1;
+    return group.getResno();   
+  }
+
   boolean isAtomNameMatch(String strPattern) {
     String atomName = getAtomNameOrNull();
     int cchAtomName = atomName == null ? 0 : atomName.length();

Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java
===================================================================
--- branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java	2006-03-27 16:14:25 UTC (rev 4781)
+++ branches/r4453rollback/Jmol/src/org/jmol/viewer/Eval.java	2006-03-27 16:30:39 UTC (rev 4782)
@@ -1294,7 +1294,7 @@
         propertyValue = atom.getPolymerLength();
         break;
       case Token.resno:
-        propertyValue = atom.getSeqcode();
+        propertyValue = atom.getResno();
         if (propertyValue == -1)
           continue;
         break;

Modified: branches/r4453rollback/Jmol/src/org/jmol/viewer/Group.java
===================================================================
--- branches/r4453rollback/Jmol/src/org/jmol/viewer/Group.java	2006-03-27 16:14:25 UTC (rev 4781)
+++ branches/r4453rollback/Jmol/src/org/jmol/viewer/Group.java	2006-03-27 16:30:39 UTC (rev 4782)
@@ -39,6 +39,7 @@
         int firstAtomIndex, int lastAtomIndex) {
     this.chain = chain;
     this.seqcode = seqcode;
+    
     if (group3 == null)
       group3 = "";
     this.groupID = getGroupID(group3);
@@ -64,14 +65,6 @@
     return JmolConstants.predefinedGroup1Names[groupID];
   }
 
-  final int getSeqcode() {
-    return seqcode;
-  }
-
-  final String getSeqcodeString() {
-    return getSeqcodeString(seqcode);
-  }
-
   final short getGroupID() {
     return groupID;
   }
@@ -170,6 +163,18 @@
   // seqcode stuff
   ////////////////////////////////////////////////////////////////
 
+  final int getResno() {
+    return seqcode >> 8; 
+  }
+
+  final int getSeqcode() {
+    return seqcode;
+  }
+
+  final String getSeqcodeString() {
+    return getSeqcodeString(seqcode);
+  }
+
   static int getSeqcode(int sequenceNumber, char insertionCode) {
     if (sequenceNumber == Integer.MIN_VALUE)
       return sequenceNumber;


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