[Jmol-commits] SF.net SVN: jmol: [5826] trunk/Jmol/src/org/jmol/viewer/CartoonRenderer. java

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

Revision: 5826
          http://svn.sourceforge.net/jmol/?rev=5826&view=rev
Author:   hansonr
Date:     2006-10-04 16:27:57 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
10.9.71  bug fix for cartoons with mix of helix/nucleic

Modified Paths:
--------------
    trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java

Modified: trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java	2006-10-04 20:10:28 UTC (rev 5825)
+++ trunk/Jmol/src/org/jmol/viewer/CartoonRenderer.java	2006-10-04 23:27:57 UTC (rev 5826)
@@ -126,7 +126,6 @@
         isNucleicPolymer ? 0f : -0.5f / 1000);
     if (!isNucleicPolymer)
       calcRopeMidPoints(polymer, newRockets);
-    getScreens();
     clearPending();
     return true;
   }
@@ -160,13 +159,9 @@
       point.set(proteinstructurePrev.getAxisEndPoint());
     else
       polymer.getLeadMidPoint(monomerCount, point);
-  }
-
-  void getScreens() {
-    int count = monomerCount + 1;
-    screens = viewer.allocTempScreens(count);
-    screensf = viewer.allocTempPoints(count);
-    for (int i = count; --i >= 0; ) {
+    screens = viewer.allocTempScreens(midPointCount);
+    screensf = viewer.allocTempPoints(midPointCount);
+    for (int i = midPointCount; --i >= 0; ) {
       viewer.transformPoint(cordMidPoints[i], screensf[i]);
       screens[i].x = (int)Math.floor(screensf[i].x);
       screens[i].y = (int)Math.floor(screensf[i].y);
@@ -174,7 +169,6 @@
     }
   }
 
-
   boolean tPending;
   ProteinStructure proteinstructurePending;
   int startIndexPending;


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