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

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

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

Modified Files:
	DisplayPanel.java 
Log Message:
more debugging code


Index: DisplayPanel.java
===================================================================
RCS file: /cvsroot/jmol/Jmol/src/org/openscience/jmol/DisplayPanel.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** DisplayPanel.java	22 Nov 2002 09:16:56 -0000	1.40
--- DisplayPanel.java	22 Nov 2002 14:29:32 -0000	1.41
***************
*** 128,132 ****
--- 128,140 ----
      antialiasCapable = vers.compareTo("1.2") >= 0;
      (new File("jmolbug.log")).delete();
+       try {
+         out = new PrintStream(new FileOutputStream("jmolbug.log", true));
+       } catch (Exception ex) {
+         System.out.println("error opening jmolbug.log:" + ex.getMessage());
+         out = System.out;
+       }
    }
+   private PrintStream out;
+   private boolean paintDumpState = false;
  
    public void setChemFile(ChemFile cf) {
***************
*** 329,332 ****
--- 337,342 ----
  
          // a change in the x coordinate generates a rotation about the y axis
+         out.println("rotate prevx,prevy x,y" + prevx +"," + prevy +
+                     " " + x + "," + y);
          float ytheta = (float)Math.PI * (x - prevx) / minScreenDimension;
          matrixTemp.rotY(ytheta);
***************
*** 336,339 ****
--- 346,350 ----
          matrixTemp.rotX(xtheta);
          matrixRotate.mul(matrixTemp, matrixRotate);
+         out.println("Rotate matrixRotate=" + matrixRotate);
        }
  
***************
*** 433,436 ****
--- 444,459 ----
  
        Matrix4f matrix = getViewTransformMatrix();
+       if (paintDumpState) {
+         out.println("\npaint after home & transform ----------------");
+         out.println("dimCurrent=" + dimCurrent);
+         out.println("chemframe.getRadius()=" + chemframe.getRadius());
+         out.println("chemframe.getCenter()=" + chemframe.getCenter());
+         out.println("scalePixelsPerAngstrom=" + scalePixelsPerAngstrom);
+         out.println("matrixRotate=" + matrixRotate);
+         out.println("matrixTranslate=" + matrixTranslate);
+         out.println("matrixView=" + getViewTransformMatrix());
+         chemframe.dumpAtoms(out);
+         paintDumpState = false;
+       }
        settings.setAtomZOffset(dimCurrent.width / 2);
  
***************
*** 896,900 ****
          out = System.out;
        }
!       out.println("Before home ---------------");
        out.println("dimCurrent=" + dimCurrent);
        out.println("chemframe.getRadius()=" + chemframe.getRadius());
--- 919,923 ----
          out = System.out;
        }
!       out.println("\nBefore home ---------------");
        out.println("dimCurrent=" + dimCurrent);
        out.println("chemframe.getRadius()=" + chemframe.getRadius());
***************
*** 906,919 ****
        chemframe.dumpAtoms(out);
        homePosition();
!       out.println("After home ----------------");
!       out.println("dimCurrent=" + dimCurrent);
!       out.println("chemframe.getRadius()=" + chemframe.getRadius());
!       out.println("chemframe.getCenter()=" + chemframe.getCenter());
!       out.println("scalePixelsPerAngstrom=" + scalePixelsPerAngstrom);
!       out.println("matrixRotate=" + matrixRotate);
!       out.println("matrixTranslate=" + matrixRotate);
!       out.println("matrixView=" + getViewTransformMatrix());
!       chemframe.dumpAtoms(out);
!       out.println("---------------------------");
        repaint();
      }
--- 929,933 ----
        chemframe.dumpAtoms(out);
        homePosition();
!       paintDumpState = true;
        repaint();
      }