[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/io PovraySaver.java,1.20,1.21 PovrayStyleWriter.java,1.15,1.16

[Michael T H. <mic...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol/io
In directory sc8-pr-cvs1:/tmp/cvs-serv17676/src/org/openscience/jmol/io

Modified Files:
	PovraySaver.java PovrayStyleWriter.java 
Log Message:
switched to JmolFrame ... many changes ... many things somewhat broken


Index: PovraySaver.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/io/PovraySaver.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PovraySaver.java	25 Jul 2003 10:43:05 -0000	1.20
+++ PovraySaver.java	7 Aug 2003 16:42:23 -0000	1.21
@@ -96,7 +96,7 @@
    * @param w the Writer to write it to
    */
   public void writeFrame(ChemFrame cf, BufferedWriter w) throws IOException {
-    edge = cf.getRotationRadius() * 2;
+    edge = cf.getJmolFrame().getRotationRadius() * 2;
     edge *= 1.1; // for some reason I need a little more margin
     edge /= control.getZoomPercent() / 100.0;
 

Index: PovrayStyleWriter.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/io/PovrayStyleWriter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- PovrayStyleWriter.java	25 Jul 2003 10:43:05 -0000	1.15
+++ PovrayStyleWriter.java	7 Aug 2003 16:42:23 -0000	1.16
@@ -302,9 +302,11 @@
 
     double[] pos = cf.getAtomCoords(atomIndex);
 
-    double c_x = cf.getRotationCenter().x;
-    double c_y = cf.getRotationCenter().y;
-    double c_z = cf.getRotationCenter().z;
+    Point3d center = cf.getJmolFrame().getRotationCenter();
+
+    double c_x = center.x;
+    double c_y = center.y;
+    double c_z = center.z;
 
     Matrix4d cmat = new Matrix4d();
 
@@ -338,9 +340,11 @@
       BufferedWriter w, Atom atom1, Atom atom2, ChemFrame cf)
         throws IOException {
 
-    double c_x = cf.getRotationCenter().x;
-    double c_y = cf.getRotationCenter().y;
-    double c_z = cf.getRotationCenter().z;
+    Point3d center = cf.getJmolFrame().getRotationCenter();
+
+    double c_x = center.x;
+    double c_y = center.y;
+    double c_z = center.z;
 
     Matrix4d cmat = new Matrix4d();