[Jmol-commits] CVS: Jmol/src/org/openscience/jmol DisplayPanel.java,1.15,1.16

[Bradley S. <ye...@us...>]

Update of /cvsroot/jmol/Jmol/src/org/openscience/jmol
In directory usw-pr-cvs1:/tmp/cvs-serv17338/src/org/openscience/jmol

Modified Files:
	DisplayPanel.java 
Log Message:
Fixed NullPointerException in HomeAction when molecule not loaded.

Index: DisplayPanel.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayPanel.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** DisplayPanel.java	16 May 2002 15:01:03 -0000	1.15
--- DisplayPanel.java	23 May 2002 04:46:09 -0000	1.16
***************
*** 951,981 ****
        tmat.setIdentity();
        zmat.setIdentity();
!       md.findBB();
!       xmin = md.getXMin();
!       xmax = md.getXMax();
!       ymin = md.getYMin();
!       ymax = md.getYMax();
!       zmin = md.getZMin();
!       zmax = md.getZMax();
!       float xw = xmax - xmin;
!       float yw = ymax - ymin;
!       float zw = zmax - zmin;
!       if (yw > xw) {
!         xw = yw;
        }
-       if (zw > xw) {
-         xw = zw;
-       }
-       float f1 = getSize().width / xw;
-       float f2 = getSize().height / xw;
-       if (f1 < f2) {
-         xfac = f1;
-       } else {
-         xfac = f2;
-       }
-       xfac *= 0.7f * scalefudge;
-       settings.setAtomScreenScale(xfac);
-       settings.setBondScreenScale(xfac);
-       settings.setVectorScreenScale(xfac);
        repaint();
      }
--- 951,983 ----
        tmat.setIdentity();
        zmat.setIdentity();
!       if (md != null) {
!         md.findBB();
!         xmin = md.getXMin();
!         xmax = md.getXMax();
!         ymin = md.getYMin();
!         ymax = md.getYMax();
!         zmin = md.getZMin();
!         zmax = md.getZMax();
!         float xw = xmax - xmin;
!         float yw = ymax - ymin;
!         float zw = zmax - zmin;
!         if (yw > xw) {
!           xw = yw;
!         }
!         if (zw > xw) {
!           xw = zw;
!         }
!         float f1 = getSize().width / xw;
!         float f2 = getSize().height / xw;
!         if (f1 < f2) {
!           xfac = f1;
!         } else {
!           xfac = f2;
!         }
!         xfac *= 0.7f * scalefudge;
!         settings.setAtomScreenScale(xfac);
!         settings.setBondScreenScale(xfac);
!         settings.setVectorScreenScale(xfac);
        }
        repaint();
      }