updates that were lying around but never got checked in; includes reorg of gui

[slipway.git] / src / edu / berkeley / slipway / gui / ZoomingPanel.java

diff --git a/src/edu/berkeley/slipway/gui/ZoomingPanel.java b/src/edu/berkeley/slipway/gui/ZoomingPanel.java
index fc51932..14e73c0 100644 (file)
--- a/src/edu/berkeley/slipway/gui/ZoomingPanel.java
+++ b/src/edu/berkeley/slipway/gui/ZoomingPanel.java
@@ -2,7 +2,6 @@ package edu.berkeley.slipway.gui;
 
 import com.atmel.fpslic.*;
 import static com.atmel.fpslic.FpslicConstants.*;
-import static com.atmel.fpslic.FpslicUtil.*;
 import edu.berkeley.slipway.*;
 import java.awt.*;
 import java.awt.geom.*;
@@ -27,9 +26,9 @@ public abstract class ZoomingPanel extends JComponent implements KeyListener, Mo
     private   Point2D recenter = new Point2D.Double(-100, 2500);
     private   Point2D recenter2;
 
-    private FtdiBoard ftdiboard;
+    private SlipwayBoard ftdiboard;
 
-    public ZoomingPanel(FtdiBoard ftdiboard) {
+    public ZoomingPanel(SlipwayBoard ftdiboard) {
         this.ftdiboard = ftdiboard;
         setDoubleBuffered(true);
         addKeyListener(this);
@@ -111,7 +110,7 @@ public abstract class ZoomingPanel extends JComponent implements KeyListener, Mo
             }
         }
         Gui.Cell cell = whichCell(mousex, mousey);
-        Fpslic.Cell c = cell == null ? null : cell.cell;
+        FpslicDevice.Cell c = cell == null ? null : cell.cell;
         if ((k.getModifiers() & k.ALT_MASK) != 0 || (k.getModifiers() & k.META_MASK) != 0)
             switch(k.getKeyCode()) {
                 case VK_S:
@@ -243,7 +242,7 @@ public abstract class ZoomingPanel extends JComponent implements KeyListener, Mo
                     return;
                 }
                 case VK_I: {
-                    System.out.println("interrupt count => " + ftdiboard.readCount());
+                    System.out.println("interrupt count => " + ftdiboard.readInterruptCount());
                     repaint();
                     return;
                 }