[Jmol-commits] CVS: Jmol/src/org/jmol/viewer Eval.java,1.7,1.8 JmolConstants.java,1.40,1.41 Token.java,1.5,1.6

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

Update of /cvsroot/jmol/Jmol/src/org/jmol/viewer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv428/src/org/jmol/viewer

Modified Files:
	Eval.java JmolConstants.java Token.java 
Log Message:
changed mesh to meshRibbon


Index: Eval.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Eval.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Eval.java	14 Dec 2004 03:07:21 -0000	1.7
+++ Eval.java	14 Dec 2004 16:00:36 -0000	1.8
@@ -418,8 +418,8 @@
       case Token.strands:
         proteinShape(JmolConstants.SHAPE_STRANDS);
         break;
-      case Token.mesh:
-        proteinShape(JmolConstants.SHAPE_MESH);
+      case Token.meshRibbon:
+        proteinShape(JmolConstants.SHAPE_MESHRIBBON);
         break;
       case Token.ribbon:
         proteinShape(JmolConstants.SHAPE_RIBBONS);
@@ -1455,7 +1455,7 @@
     case Token.hbonds:
     case Token.trace:
     case Token.backbone:
-    case Token.mesh:
+    case Token.meshRibbon:
     case Token.strands:
     case Token.ribbon:
     case Token.prueba:
@@ -2389,7 +2389,7 @@
   {Token.atom, Token.bonds, Token.hbonds, Token.ssbonds,
    Token.label, Token.vector,
    Token.monitor, Token.dots, Token.backbone,
-   Token.trace, Token.cartoon, Token.strands, Token.mesh, Token.ribbon,
+   Token.trace, Token.cartoon, Token.strands, Token.meshRibbon, Token.ribbon,
    Token.rocket,
    Token.axes, Token.boundbox, Token.unitcell, Token.frank, Token.echo,
    Token.hover,

Index: JmolConstants.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/JmolConstants.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- JmolConstants.java	14 Dec 2004 03:07:21 -0000	1.40
+++ JmolConstants.java	14 Dec 2004 16:00:36 -0000	1.41
@@ -2100,32 +2100,32 @@
   // conversion from tokens to shapes
   ////////////////////////////////////////////////////////////////
 
-  public final static int SHAPE_BALLS    = 0;
-  public final static int SHAPE_STICKS   = 1;
-  public final static int SHAPE_HSTICKS  = 2;
-  public final static int SHAPE_SSSTICKS = 3;
-  public final static int SHAPE_LABELS   = 4;
-  public final static int SHAPE_VECTORS  = 5;
-  public final static int SHAPE_MEASURES = 6;
-  public final static int SHAPE_DOTS     = 7;
-  public final static int SHAPE_BACKBONE = 8;
-  public final static int SHAPE_TRACE    = 9;
-  public final static int SHAPE_CARTOON  = 10;
-  public final static int SHAPE_STRANDS  = 11;
-  public final static int SHAPE_MESH     = 12;
-  public final static int SHAPE_RIBBONS  = 13;
-  public final static int SHAPE_ROCKETS  = 14;
+  public final static int SHAPE_BALLS      = 0;
+  public final static int SHAPE_STICKS     = 1;
+  public final static int SHAPE_HSTICKS    = 2;
+  public final static int SHAPE_SSSTICKS   = 3;
+  public final static int SHAPE_LABELS     = 4;
+  public final static int SHAPE_VECTORS    = 5;
+  public final static int SHAPE_MEASURES   = 6;
+  public final static int SHAPE_DOTS       = 7;
+  public final static int SHAPE_BACKBONE   = 8;
+  public final static int SHAPE_TRACE      = 9;
+  public final static int SHAPE_CARTOON    = 10;
+  public final static int SHAPE_STRANDS    = 11;
+  public final static int SHAPE_MESHRIBBON = 12;
+  public final static int SHAPE_RIBBONS    = 13;
+  public final static int SHAPE_ROCKETS    = 14;
     
 
   public final static int SHAPE_MIN_SELECTION_INDEPENDENT = 15;
-  public final static int SHAPE_AXES     = 15;
-  public final static int SHAPE_BBCAGE   = 16;
-  public final static int SHAPE_UCCAGE   = 17;
-  public final static int SHAPE_FRANK    = 18;
-  public final static int SHAPE_ECHO     = 19;
-  public final static int SHAPE_HOVER    = 20;
-  public final static int SHAPE_PRUEBA   = 21;
-  public final static int SHAPE_MAX      = 22;
+  public final static int SHAPE_AXES       = 15;
+  public final static int SHAPE_BBCAGE     = 16;
+  public final static int SHAPE_UCCAGE     = 17;
+  public final static int SHAPE_FRANK      = 18;
+  public final static int SHAPE_ECHO       = 19;
+  public final static int SHAPE_HOVER      = 20;
+  public final static int SHAPE_PRUEBA     = 21;
+  public final static int SHAPE_MAX        = 22;
 
   public final static String[] shapeClassBases = {
     "Balls", "Sticks", "Hsticks", "Sssticks",
@@ -2133,7 +2133,7 @@
     "Dots",
     "Backbone", "Trace",
     "Cartoon",
-    "Strands", "Mesh", "Ribbons",
+    "Strands", "MeshRibbon", "Ribbons",
     "Rockets",
     "Axes", "Bbcage", "Uccage", "Frank", "Echo", "Hover",
     "Prueba"

Index: Token.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/jmol/viewer/Token.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Token.java	14 Dec 2004 03:07:22 -0000	1.5
+++ Token.java	14 Dec 2004 16:00:36 -0000	1.6
@@ -160,7 +160,7 @@
   final static int hover        = command | 81 | specialstring;
   final static int vibration    = command | 82;
   final static int vector       = command | 83;
-  final static int mesh         = command | 84;
+  final static int meshRibbon   = command | 84;
   final static int prueba       = command | 85;
   final static int rocket       = command | 86;
   final static int surface      = command | predefinedset | 87;
@@ -438,7 +438,7 @@
     "vibration",         new Token(vibration,  "vibration"),
     "vector",            new Token(vector,   varArgCount, "vector"),
     "vectors",           null,
-    "mesh",              new Token(mesh,      onDefault1, "mesh"),
+    "meshribbon",        new Token(meshRibbon,onDefault1, "meshribbon"),
     "prueba",            new Token(prueba,    onDefault1, "prueba"),
     "rocket",            new Token(rocket,    onDefault1, "rocket"),
     "rockets",           null,