From: Fabian D. <fd...@us...> - 2003-06-11 21:19:45
|
Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol In directory sc8-pr-cvs1:/tmp/cvs-serv22853/src/org/openscience/jmol Modified Files: CrystalFrame.java Log Message: Fixed problem reading some abinit files Index: CrystalFrame.java =================================================================== RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/CrystalFrame.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- CrystalFrame.java 2 Jun 2003 13:35:02 -0000 1.13 +++ CrystalFrame.java 11 Jun 2003 21:19:41 -0000 1.14 @@ -66,11 +66,19 @@ } void calcBoundingBox() { + + Vector boxEdges; + if (this.boxEdges.isEmpty()) { + boxEdges = CrystalFile.getSingleBoxEdge(rprimd); + } else { + boxEdges = this.boxEdges; + } + Point3d position = (Point3d) boxEdges.elementAt(0); double minX = position.x, maxX = minX; double minY = position.y, maxY = minY; double minZ = position.z, maxZ = minZ; - + for (int i = 1, size = boxEdges.size(); i < size; ++i) { position = (Point3d) boxEdges.elementAt(i); double x = position.x; @@ -84,12 +92,12 @@ if (z > maxZ) { maxZ = z; } } centerBoundingBox = new Point3d((minX + maxX) / 2, - (minY + maxY) / 2, - (minZ + maxZ) / 2); + (minY + maxY) / 2, + (minZ + maxZ) / 2); cornerBoundingBox = new Point3d(maxX, maxY, maxZ); cornerBoundingBox.sub(centerBoundingBox); } - + // arrowhead size isn't included because it is currently in screen // coordinates .. oh well. public double calcRadius(Point3d center) { |