X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fslipway%2Fgui%2FGui3.java;h=26d869faed5c1260030d97fbc63a6ae8c9425d3f;hb=5301afc9e47f0dd6f96858d1c70407e0df5b53cf;hp=76e2f87ca1ef0d26a1151d6abea90b09e37608d5;hpb=6a7c71b440b8ec920a95b26d9c7a60595c3f6bcf;p=slipway.git diff --git a/src/edu/berkeley/slipway/gui/Gui3.java b/src/edu/berkeley/slipway/gui/Gui3.java index 76e2f87..26d869f 100644 --- a/src/edu/berkeley/slipway/gui/Gui3.java +++ b/src/edu/berkeley/slipway/gui/Gui3.java @@ -1,9 +1,11 @@ package edu.berkeley.slipway.gui; +// gui: use colors to distinguish planes? dot-dash lines? + import com.atmel.fpslic.*; import edu.berkeley.slipway.*; import static com.atmel.fpslic.FpslicConstants.*; -import static com.atmel.fpslic.FpslicUtil.*; +import static java.awt.event.KeyEvent.*; import edu.berkeley.slipway.*; import java.awt.*; import java.awt.geom.*; @@ -15,22 +17,22 @@ import java.util.*; import javax.swing.*; import static edu.berkeley.slipway.gui.GuiConstants.*; -public class Gui3 extends Canvas implements MouseWheelListener, MouseMotionListener { +public class Gui3 extends Canvas implements MouseWheelListener, MouseMotionListener, KeyListener { - Fpslic at40k; - FtdiBoard drone; + FpslicDevice at40k; + SlipwayBoard slipway; private int width; private int height; private int magnify = 0; - private GuiCell[][] ca = new GuiCell[128][]; - private FtdiBoard ftdiboard; - public Gui3(Fpslic at40k, FtdiBoard drone) { - this(at40k, drone, 24, 24); + public GuiCell[][] ca = new GuiCell[128][]; + private SlipwayBoard ftdiboard; + public Gui3(FpslicDevice at40k, SlipwayBoard slipway) { + this(at40k, slipway, 24, 24); } - public Gui3(Fpslic at40k, FtdiBoard drone, int width, int height) { + public Gui3(FpslicDevice at40k, SlipwayBoard slipway, int width, int height) { this.at40k = at40k; - this.drone = drone; + this.slipway = slipway; this.width = width; this.height = height; for(int i=0; i