checkpoint

[anneal.git] / src / edu / berkeley / qfat / MeshViewer.java

diff --git a/src/edu/berkeley/qfat/MeshViewer.java b/src/edu/berkeley/qfat/MeshViewer.java
index c344bca..7a9fcd5 100644 (file)
--- a/src/edu/berkeley/qfat/MeshViewer.java
+++ b/src/edu/berkeley/qfat/MeshViewer.java
@@ -11,26 +11,25 @@ import java.util.*;
 import edu.berkeley.qfat.geom.*;
 import edu.berkeley.qfat.geom.Point;
 
-public class MeshViewer implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener {
+public class MeshViewer extends JPanel implements GLEventListener, MouseListener, MouseMotionListener, KeyListener, MouseWheelListener {
 
-    Mesh.Vertex closest = null;
+    private float tz = 0;
+    private float anglex = 0;
+    private float angley = 0;
 
-    private int      mousex;
-    private int      mousey;
-    private Matrix   projection = null;
-    private Point    clickPoint = null;
-    private GLCanvas glcanvas;
-    private boolean  updateVisibilities = false;
+    private Mesh.Vertex closest = null;
+    private int         mousex;
+    private int         mousey;
+    private Matrix      projection = null;
+    private Point       clickPoint = null;
+    private GLCanvas    glcanvas;
+    private boolean     updateVisibilities = false;
 
     private HashSet<Mesh> meshes = new HashSet<Mesh>();
 
     public synchronized void addMesh(Mesh m) { meshes.add(m); }
     public synchronized void removeMesh(Mesh m) { meshes.remove(m); }
 
-    float tz = 0;
-    float anglex = 0;
-    float angley = 0;
-
     public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { }
     public void displayChanged(GLAutoDrawable drawable, boolean modeChanged, boolean deviceChanged) { }
 
@@ -72,7 +71,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     }
 
     public synchronized final void display(GLAutoDrawable drawable) {
-        glcanvas.setSize(glcanvas.getParent().getWidth(), glcanvas.getParent().getHeight() - 100);
+        glcanvas.setSize(glcanvas.getParent().getWidth(), glcanvas.getParent().getHeight());
 
         GL gl = glcanvas.getGL();//drawable.getGL();
         GLU glu = new GLU();
@@ -221,10 +220,11 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
         mousey = e.getY();
     }
 
-    public MeshViewer(JFrame f) {
+    public MeshViewer() {
         glcanvas = new GLCanvas();
         glcanvas.addGLEventListener(this);
-        f.add(glcanvas, BorderLayout.CENTER);
+        setLayout(new BorderLayout());
+        this.add(glcanvas, BorderLayout.CENTER);
         glcanvas.addMouseListener(this);
         glcanvas.addMouseMotionListener(this);
         glcanvas.addMouseWheelListener(this);
@@ -232,7 +232,7 @@ public class MeshViewer implements GLEventListener, MouseListener, MouseMotionLi
     }
 
     public void repaint() {
-        glcanvas.repaint();
+        if (glcanvas != null) glcanvas.repaint();
     }
 
 }
\ No newline at end of file