[Jmol-commits] CVS: Jmol/src/org/openscience/jmol/viewer/datamodel Frame.java,1.37,1.38 FrameRenderer.java,1.30,1.31 CellLineRenderer.java,1.4,NONE

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

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

Modified Files:
	Frame.java FrameRenderer.java 
Removed Files:
	CellLineRenderer.java 
Log Message:
removed deprecated support for cell lines


Index: Frame.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/Frame.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Frame.java	3 Feb 2004 15:43:31 -0000	1.37
+++ Frame.java	4 Feb 2004 21:43:00 -0000	1.38
@@ -315,50 +315,26 @@
     // ... for this we would need to do a Minimal Enclosing Sphere calculation
     float minX, minY, minZ, maxX, maxY, maxZ;
     Point3f point;
-    if (cellLineCount == 0) { // non-crystal, so find extremes of atoms
-      point = atoms[0].getPoint3f();
-      minX = maxX = point.x;
-      minY = maxY = point.y;
-      minZ = maxZ = point.z;
-      
-      for (int i = atomCount; --i > 0; ) {
-        // note that the 0 element was set above
-        point = atoms[i].getPoint3f();
-        float t;
-        t = point.x;
-        if (t < minX) { minX = t; }
-        else if (t > maxX) { maxX = t; }
-        t = point.y;
-        if (t < minY) { minY = t; }
-        else if (t > maxY) { maxY = t; }
-        t = point.z;
-        if (t < minZ) { minZ = t; }
-        else if (t > maxZ) { maxZ = t; }
-      }
-    } else { // a crystal cell, so use center of crystal cell box
-      point = cellLines[0].pointOrigin;
-      minX = maxX = point.x;
-      minY = maxY = point.y;
-      minZ = maxZ = point.z;
-      for (int i = cellLineCount; --i >= 0; ) {
-        point = cellLines[i].pointOrigin;
-        int j = 0;
-        do {
-          float t;
-          t = point.x;
-          if (t < minX) { minX = t; }
-          else if (t > maxX) { maxX = t; }
-          t = point.y;
-          if (t < minY) { minY = t; }
-          else if (t > maxY) { maxY = t; }
-          t = point.z;
-          if (t < minZ) { minZ = t; }
-          else if (t > maxZ) { maxZ = t; }
-          point = cellLines[i].pointEnd;
-        } while (j++ == 0);
-      }
+    point = atoms[0].getPoint3f();
+    minX = maxX = point.x;
+    minY = maxY = point.y;
+    minZ = maxZ = point.z;
+    
+    for (int i = atomCount; --i > 0; ) {
+      // note that the 0 element was set above
+      point = atoms[i].getPoint3f();
+      float t;
+      t = point.x;
+      if (t < minX) { minX = t; }
+      else if (t > maxX) { maxX = t; }
+      t = point.y;
+      if (t < minY) { minY = t; }
+      else if (t > maxY) { maxY = t; }
+      t = point.z;
+      if (t < minZ) { minZ = t; }
+      else if (t > maxZ) { maxZ = t; }
     }
-      
+
     centerBoundingBox = new Point3f((minX + maxX) / 2,
                                     (minY + maxY) / 2,
                                     (minZ + maxZ) / 2);
@@ -400,16 +376,6 @@
       if (distLineEnd > radius)
         radius = distLineEnd;
     }
-    for (int i = cellLineCount; --i >= 0; ) {
-      Line cellLine = cellLines[i];
-      float distLineEnd;
-      distLineEnd = center.distance(cellLine.pointOrigin);
-      if (distLineEnd > radius)
-        radius = distLineEnd;
-      distLineEnd = center.distance(cellLine.pointEnd);
-      if (distLineEnd > radius)
-        radius = distLineEnd;
-    }
     return radius;
   }
 
@@ -428,21 +394,6 @@
     lines[lineCount++] = line;
   }
 
-  int cellLineCount = 0;
-  Line[] cellLines = null;
-
-  public void addCrystalCellLine(Line line) {
-    if (cellLines == null ||
-        cellLineCount == cellLines.length) {
-      Line[] newLines = new Line[cellLineCount + lineGrowthIncrement];
-      if (cellLines != null)
-        System.arraycopy(cellLines, 0, newLines, 0,
-                         cellLineCount);
-      cellLines = newLines;
-    }
-    cellLines[cellLineCount++] = line;
-  }
-
   final static int measurementGrowthIncrement = 16;
   int measurementCount = 0;
   Measurement[] measurements = null;

Index: FrameRenderer.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/viewer/datamodel/FrameRenderer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- FrameRenderer.java	28 Dec 2003 13:31:21 -0000	1.30
+++ FrameRenderer.java	4 Feb 2004 21:43:00 -0000	1.31
@@ -44,7 +44,6 @@
   MeasurementRenderer measurementRenderer;
   DotsRenderer dotsRenderer;
   LineRenderer lineRenderer;
-  CellLineRenderer cellLineRenderer;
 
   Renderer[] renderers;
 
@@ -54,7 +53,7 @@
     bondRenderer = new BondRenderer(viewer, this);
     renderers = new Renderer[JmolConstants.GRAPHIC_MAX];
   }
-  
+
   public void render(Graphics3D g3d, Rectangle rectClip, Frame frame) {
 
     if (frame.atomCount <= 0)
@@ -90,12 +89,6 @@
         lineRenderer = new LineRenderer(viewer, this);
       lineRenderer.render(g3d, rectClip, frame, null);
     }
-
-    if (frame.cellLineCount > 0) {
-      if (cellLineRenderer == null)
-        cellLineRenderer = new CellLineRenderer(viewer, this);
-      cellLineRenderer.render(g3d, rectClip, frame, null);
-    }
   }
 
   Renderer allocateRenderer(int refGraphic) {

--- CellLineRenderer.java DELETED ---