[Jmol-commits] SF.net SVN: jmol: [5563] trunk/Jmol/src/org/openscience/jmol/app/ PovraySaver.java

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

Revision: 5563
          http://svn.sourceforge.net/jmol/?rev=5563&view=rev
Author:   hansonr
Date:     2006-09-16 07:55:35 -0700 (Sat, 16 Sep 2006)

Log Message:
-----------
povray fix for backgroundModel; 
some optimization of code in loops

Modified Paths:
--------------
    trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java

Modified: trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java
===================================================================
--- trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java	2006-09-16 14:54:22 UTC (rev 5562)
+++ trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java	2006-09-16 14:55:35 UTC (rev 5563)
@@ -149,8 +149,12 @@
       }
       out("#end\n");
     } else {
-      for (int i = 0; i < viewer.getAtomCount(); i++)
-        writeAtom(viewer.getDisplayModelIndex(), i);
+      int modelIndex = viewer.getDisplayModelIndex();
+      if (modelIndex < -1)
+        modelIndex = -2 - modelIndex;
+      int n = viewer.getAtomCount();
+      for (int i = 0; i < n; i++)
+        writeAtom(modelIndex, i);
     }
     out("#end\n");
     
@@ -172,8 +176,12 @@
       }
       out("#end\n");
     } else {
-      for (int i = 0; i < viewer.getBondCount(); ++i)
-        writeBond(viewer.getDisplayModelIndex(), i);
+      int modelIndex = viewer.getDisplayModelIndex();
+      if (modelIndex < -1)
+        modelIndex = -2 - modelIndex;
+      int n = viewer.getBondCount();
+      for (int i = 0; i < n; ++i)
+        writeBond(modelIndex, i);
     }
     out("#end\n");
     
@@ -195,8 +203,12 @@
       }
       out("#end\n");
     } else {
-      for (int i = 0; i < viewer.getPolymerCountInModel(viewer.getDisplayModelIndex()); i++) {
-        writePolymer(viewer.getDisplayModelIndex(), i);
+      int modelIndex = viewer.getDisplayModelIndex();
+      if (modelIndex < -1)
+        modelIndex = -2 - modelIndex;
+      int n = viewer.getPolymerCountInModel(modelIndex);
+      for (int i = 0; i < n; i++) {
+        writePolymer(modelIndex, i);
       }
     }
     out("#end\n");


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