X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRotatableCanvas.java;h=fc72b4b827094e42950d862bd6b39868090b35b5;hb=43a9f559bb49f579ce153c812052c149963a99de;hp=6ae66a2a1a5325ed71452ac2ec549113aebd14e8;hpb=6e71f42b0a3713ddbc3054e7ea9d8f5088130ec9;p=jalview.git diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java index 6ae66a2..fc72b4b 100755 --- a/src/jalview/gui/RotatableCanvas.java +++ b/src/jalview/gui/RotatableCanvas.java @@ -18,619 +18,761 @@ */ package jalview.gui; -import java.util.*; +import jalview.datamodel.*; + +import jalview.math.*; + +import jalview.util.*; import java.awt.*; import java.awt.event.*; + +import java.util.*; + import javax.swing.*; -import jalview.datamodel.*; -import jalview.math.*; -import jalview.util.*; -public class RotatableCanvas - extends JPanel implements MouseListener, +/** + * DOCUMENT ME! + * + * @author $author$ + * @version $Revision$ + */ +public class RotatableCanvas extends JPanel implements MouseListener, MouseMotionListener, KeyListener -//RubberbandListener, -//SequenceSelectionListener { - RotatableMatrix idmat = new RotatableMatrix(3, 3); - RotatableMatrix objmat = new RotatableMatrix(3, 3); - RotatableMatrix rotmat = new RotatableMatrix(3, 3); - - //RubberbandRectangle rubberband; - boolean drawAxes = true; - int omx = 0; - int mx = 0; - int omy = 0; - int my = 0; - Image img; - Graphics ig; - Dimension prefsize; - float[] centre = new float[3]; - float[] width = new float[3]; - float[] max = new float[3]; - float[] min = new float[3]; - float maxwidth; - float scale; - int npoint; - Vector points; - float[][] orig; - float[][] axes; - int startx; - int starty; - int lastx; - int lasty; - int rectx1; - int recty1; - int rectx2; - int recty2; - float scalefactor = 1; - AlignViewport av; - - // Controller controller; - public RotatableCanvas(AlignViewport av, Vector points, int npoint) - { - this.points = points; - this.npoint = npoint; - this.av = av; - ToolTipManager.sharedInstance().registerComponent(this); - PaintRefresher.Register(this, av.alignment); - - // - prefsize = getPreferredSize(); - orig = new float[npoint][3]; - - for (int i = 0; i < npoint; i++) + RotatableMatrix idmat = new RotatableMatrix(3, 3); + RotatableMatrix objmat = new RotatableMatrix(3, 3); + RotatableMatrix rotmat = new RotatableMatrix(3, 3); + + //RubberbandRectangle rubberband; + boolean drawAxes = true; + int omx = 0; + int mx = 0; + int omy = 0; + int my = 0; + Image img; + Graphics ig; + Dimension prefsize; + float[] centre = new float[3]; + float[] width = new float[3]; + float[] max = new float[3]; + float[] min = new float[3]; + float maxwidth; + float scale; + int npoint; + Vector points; + float[][] orig; + float[][] axes; + int startx; + int starty; + int lastx; + int lasty; + int rectx1; + int recty1; + int rectx2; + int recty2; + float scalefactor = 1; + AlignViewport av; + boolean showLabels = false; + Color bgColour = Color.black; + + // Controller controller; + public RotatableCanvas(AlignViewport av) { - SequencePoint sp = (SequencePoint) points.elementAt(i); + this.av = av; + } - for (int j = 0; j < 3; j++) - { - orig[i][j] = sp.coord[j]; - } + public void showLabels(boolean b) + { + showLabels = b; + repaint(); } - //Initialize the matrices to identity - for (int i = 0; i < 3; i++) + public void setPoints(Vector points, int npoint) { - for (int j = 0; j < 3; j++) - { - if (i != j) + this.points = points; + this.npoint = npoint; + ToolTipManager.sharedInstance().registerComponent(this); + ToolTipManager.sharedInstance().setInitialDelay(0); + ToolTipManager.sharedInstance().setDismissDelay(10000); + PaintRefresher.Register(this, av.alignment); + + prefsize = getPreferredSize(); + orig = new float[npoint][3]; + + for (int i = 0; i < npoint; i++) { - idmat.addElement(i, j, 0); - objmat.addElement(i, j, 0); - rotmat.addElement(i, j, 0); + SequencePoint sp = (SequencePoint) points.elementAt(i); + + for (int j = 0; j < 3; j++) + { + orig[i][j] = sp.coord[j]; + } } - else + + //Initialize the matrices to identity + for (int i = 0; i < 3; i++) { - idmat.addElement(i, j, 0); - objmat.addElement(i, j, 0); - rotmat.addElement(i, j, 0); + for (int j = 0; j < 3; j++) + { + if (i != j) + { + idmat.addElement(i, j, 0); + objmat.addElement(i, j, 0); + rotmat.addElement(i, j, 0); + } + else + { + idmat.addElement(i, j, 0); + objmat.addElement(i, j, 0); + rotmat.addElement(i, j, 0); + } + } } - } - } - axes = new float[3][3]; - initAxes(); + axes = new float[3][3]; + initAxes(); - findCentre(); - findWidth(); + findCentre(); + findWidth(); - scale = findScale(); + scale = findScale(); - // System.out.println("Scale factor = " + scale); - addMouseListener(this); - addKeyListener(this); + addMouseListener(this); + addKeyListener(this); - // if (getParent() != null) { - // getParent().addKeyListener(this); - //} - addMouseMotionListener(this); - - // Add rubberband - // rubberband = new RubberbandRectangle(this); - // rubberband.setActive(true); - // rubberband.addListener(this); - } - - /* public boolean handleSequenceSelectionEvent(SequenceSelectionEvent evt) { - redrawneeded = true; - repaint(); - return true; - } - - public void removeNotify() { - controller.removeListener(this); - super.removeNotify(); - }*/ - public void initAxes() - { - for (int i = 0; i < 3; i++) + addMouseMotionListener(this); + + } + + public void initAxes() { - for (int j = 0; j < 3; j++) - { - if (i != j) - { - axes[i][j] = 0; - } - else + for (int i = 0; i < 3; i++) { - axes[i][j] = 1; + for (int j = 0; j < 3; j++) + { + if (i != j) + { + axes[i][j] = 0; + } + else + { + axes[i][j] = 1; + } + } } - } } - } - public void findWidth() - { - max = new float[3]; - min = new float[3]; + /** + * DOCUMENT ME! + */ + public void findWidth() + { + max = new float[3]; + min = new float[3]; - max[0] = (float) - 1e30; - max[1] = (float) - 1e30; - max[2] = (float) - 1e30; + max[0] = (float) -1e30; + max[1] = (float) -1e30; + max[2] = (float) -1e30; - min[0] = (float) 1e30; - min[1] = (float) 1e30; - min[2] = (float) 1e30; + min[0] = (float) 1e30; + min[1] = (float) 1e30; + min[2] = (float) 1e30; - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < npoint; j++) - { - SequencePoint sp = (SequencePoint) points.elementAt(j); + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < npoint; j++) + { + SequencePoint sp = (SequencePoint) points.elementAt(j); + + if (sp.coord[i] >= max[i]) + { + max[i] = sp.coord[i]; + } + + if (sp.coord[i] <= min[i]) + { + min[i] = sp.coord[i]; + } + } + } + + // System.out.println("xmax " + max[0] + " min " + min[0]); + //System.out.println("ymax " + max[1] + " min " + min[1]); + //System.out.println("zmax " + max[2] + " min " + min[2]); + width[0] = Math.abs(max[0] - min[0]); + width[1] = Math.abs(max[1] - min[1]); + width[2] = Math.abs(max[2] - min[2]); - if (sp.coord[i] >= max[i]) + maxwidth = width[0]; + + if (width[1] > width[0]) { - max[i] = sp.coord[i]; + maxwidth = width[1]; } - if (sp.coord[i] <= min[i]) + if (width[2] > width[1]) { - min[i] = sp.coord[i]; + maxwidth = width[2]; } - } + + //System.out.println("Maxwidth = " + maxwidth); } - // System.out.println("xmax " + max[0] + " min " + min[0]); - //System.out.println("ymax " + max[1] + " min " + min[1]); - //System.out.println("zmax " + max[2] + " min " + min[2]); - width[0] = Math.abs(max[0] - min[0]); - width[1] = Math.abs(max[1] - min[1]); - width[2] = Math.abs(max[2] - min[2]); + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public float findScale() + { + int dim; + int width; + int height; + + if (getWidth() != 0) + { + width = getWidth(); + height = getHeight(); + } + else + { + width = prefsize.width; + height = prefsize.height; + } - maxwidth = width[0]; + if (width < height) + { + dim = width; + } + else + { + dim = height; + } - if (width[1] > width[0]) - { - maxwidth = width[1]; + return (float) ((dim * scalefactor) / (2 * maxwidth)); } - if (width[2] > width[1]) + /** + * DOCUMENT ME! + */ + public void findCentre() { - maxwidth = width[2]; - } + //Find centre coordinate + findWidth(); - //System.out.println("Maxwidth = " + maxwidth); - } + centre[0] = (max[0] + min[0]) / 2; + centre[1] = (max[1] + min[1]) / 2; + centre[2] = (max[2] + min[2]) / 2; - public float findScale() - { - int dim; - int width; - int height; - - if (getWidth() != 0) - { - width = getWidth(); - height = getHeight(); + // System.out.println("Centre x " + centre[0]); + //System.out.println("Centre y " + centre[1]); + //System.out.println("Centre z " + centre[2]); } - else + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Dimension getPreferredSize() { - width = prefsize.width; - height = prefsize.height; + if (prefsize != null) + { + return prefsize; + } + else + { + return new Dimension(400, 400); + } } - if (width < height) + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Dimension getMinimumSize() { - dim = width; + return getPreferredSize(); } - else + + /** + * DOCUMENT ME! + * + * @param g DOCUMENT ME! + */ + public void paintComponent(Graphics g1) { - dim = height; - } - return (float) ( (dim * scalefactor) / (2 * maxwidth)); - } + Graphics2D g = (Graphics2D) g1; + + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + if(points==null) + { + g.setFont(new Font("Verdana", Font.PLAIN, 18)); + g.drawString("Calculating PCA....", 20, getHeight()/2); + } + else + { + //Only create the image at the beginning - + if ( (img == null) || (prefsize.width != getWidth()) || + (prefsize.height != getHeight())) + { + prefsize.width = getWidth(); + prefsize.height = getHeight(); - public void findCentre() - { - //Find centre coordinate - findWidth(); + scale = findScale(); - centre[0] = (max[0] + min[0]) / 2; - centre[1] = (max[1] + min[1]) / 2; - centre[2] = (max[2] + min[2]) / 2; + // System.out.println("New scale = " + scale); + img = createImage(getWidth(), getHeight()); + ig = img.getGraphics(); + } - // System.out.println("Centre x " + centre[0]); - //System.out.println("Centre y " + centre[1]); - //System.out.println("Centre z " + centre[2]); - } - public Dimension getPreferredSize() - { - if (prefsize != null) - { - return prefsize; - } - else - { - return new Dimension(400, 400); - } - } - - public Dimension getMinimumSize() - { - return getPreferredSize(); - } - - public void paintComponent(Graphics g) - { - //Only create the image at the beginning - - if ( (img == null) || (prefsize.width != getWidth()) || - (prefsize.height != getHeight())) - { - prefsize.width = getWidth(); - prefsize.height = getHeight(); + drawBackground(ig, bgColour); + drawScene(ig); - scale = findScale(); + if (drawAxes == true) + { + drawAxes(ig); + } - // System.out.println("New scale = " + scale); - img = createImage(getWidth(), getHeight()); - ig = img.getGraphics(); + g.drawImage(img, 0, 0, this); + } } - drawBackground(ig, Color.black); - drawScene(ig); - - if (drawAxes == true) + /** + * DOCUMENT ME! + * + * @param g DOCUMENT ME! + */ + public void drawAxes(Graphics g) { - drawAxes(ig); - } - g.drawImage(img, 0, 0, this); - } + g.setColor(Color.yellow); - public void drawAxes(Graphics g) - { - g.setColor(Color.yellow); + for (int i = 0; i < 3; i++) + { + g.drawLine(getWidth() / 2, getHeight() / 2, + (int) ((axes[i][0] * scale * max[0]) + (getWidth() / 2)), + (int) ((axes[i][1] * scale * max[1]) + (getHeight() / 2))); + } + } - for (int i = 0; i < 3; i++) + /** + * DOCUMENT ME! + * + * @param g DOCUMENT ME! + * @param col DOCUMENT ME! + */ + public void drawBackground(Graphics g, Color col) { - g.drawLine(getWidth() / 2, getHeight() / 2, - (int) ( (axes[i][0] * scale * max[0]) + (getWidth() / 2)), - (int) ( (axes[i][1] * scale * max[1]) + (getHeight() / 2))); + g.setColor(col); + g.fillRect(0, 0, prefsize.width, prefsize.height); } - } - public void drawBackground(Graphics g, Color col) - { - g.setColor(col); - g.fillRect(0, 0, prefsize.width, prefsize.height); - } + /** + * DOCUMENT ME! + * + * @param g DOCUMENT ME! + */ + public void drawScene(Graphics g1) + { - public void drawScene(Graphics g) - { - boolean darker = false; + Graphics2D g = (Graphics2D) g1; - int halfwidth = getWidth() / 2; - int halfheight = getHeight() / 2; + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); - for (int i = 0; i < npoint; i++) - { - SequencePoint sp = (SequencePoint) points.elementAt(i); - int x = (int) ( (float) (sp.coord[0] - centre[0]) * scale) + - halfwidth; - int y = (int) ( (float) (sp.coord[1] - centre[1]) * scale) + - halfheight; - float z = sp.coord[1] - centre[2]; - - if (sp.sequence.getColor() == Color.black) - { - g.setColor(Color.white); - } - else - { - g.setColor(sp.sequence.getColor()); - } - if (av.getSelectionGroup() != null) - { - if (av.getSelectionGroup().sequences.contains( - ( (SequencePoint) points.elementAt(i)).sequence)) + int halfwidth = getWidth() / 2; + int halfheight = getHeight() / 2; + + for (int i = 0; i < npoint; i++) { - g.setColor(Color.gray); + SequencePoint sp = (SequencePoint) points.elementAt(i); + int x = (int) ((float) (sp.coord[0] - centre[0]) * scale) + + halfwidth; + int y = (int) ((float) (sp.coord[1] - centre[1]) * scale) + + halfheight; + float z = sp.coord[1] - centre[2]; + + if (sp.sequence.getColor() == Color.black) + { + g.setColor(Color.white); + } + else + { + g.setColor(sp.sequence.getColor()); + } + + if (av.getSelectionGroup() != null) + { + if (av.getSelectionGroup().sequences.contains( + ((SequencePoint) points.elementAt(i)).sequence)) + { + g.setColor(Color.gray); + } + } + + if (z < 0) + { + g.setColor(g.getColor().darker()); + } + + g.fillRect(x - 3, y - 3, 6, 6); + if(showLabels) + { + g.setColor(Color.red); + g.drawString( ( (SequencePoint) points.elementAt(i)).sequence. + getName(), + x - 3, y - 4); + } } - } - if (z < 0) - { - g.setColor(g.getColor().darker()); - } - - g.fillRect(x - 3, y - 3, 6, 6); - g.setColor(Color.red); + // //Now the rectangle + // if (rectx2 != -1 && recty2 != -1) { + // g.setColor(Color.white); + // + // g.drawRect(rectx1,recty1,rectx2-rectx1,recty2-recty1); + // } } - // //Now the rectangle - // if (rectx2 != -1 && recty2 != -1) { - // g.setColor(Color.white); - // - // g.drawRect(rectx1,recty1,rectx2-rectx1,recty2-recty1); - // } - } - - public Dimension minimumsize() - { - return prefsize; - } - - public Dimension preferredsize() - { - return prefsize; - } - - public void keyTyped(KeyEvent evt) - { - } - - public void keyReleased(KeyEvent evt) - { - } - - public void keyPressed(KeyEvent evt) - { - requestFocus(); - - if (evt.getKeyCode() == KeyEvent.VK_UP) + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Dimension minimumsize() { - scalefactor = (float) (scalefactor * 1.1); - scale = findScale(); + return prefsize; } - else if (evt.getKeyCode() == KeyEvent.VK_DOWN) + + /** + * DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public Dimension preferredsize() { - scalefactor = (float) (scalefactor * 0.9); - scale = findScale(); + return prefsize; } - else if (evt.getKeyChar() == 's') - { - System.err.println("DEBUG: Rectangle selection"); // log.debug - if ( (rectx2 != -1) && (recty2 != -1)) - { - rectSelect(rectx1, recty1, rectx2, recty2); - } + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void keyTyped(KeyEvent evt) + { } - repaint(); - } - - public void printPoints() - { - for (int i = 0; i < npoint; i++) + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void keyReleased(KeyEvent evt) { - SequencePoint sp = (SequencePoint) points.elementAt(i); - Format.print(System.out, "%5d ", i); - - for (int j = 0; j < 3; j++) - { - Format.print(System.out, "%13.3f ", sp.coord[j]); - } - - System.out.println(); } - } - - public void mouseClicked(MouseEvent evt) - { - } - - public void mouseEntered(MouseEvent evt) - { - } - - public void mouseExited(MouseEvent evt) - { - } - - public void mouseReleased(MouseEvent evt) - { - } - public void mousePressed(MouseEvent evt) - { - int x = evt.getX(); - int y = evt.getY(); - - mx = x; - my = y; + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void keyPressed(KeyEvent evt) + { + if (evt.getKeyCode() == KeyEvent.VK_UP) + { + scalefactor = (float) (scalefactor * 1.1); + scale = findScale(); + } + else if (evt.getKeyCode() == KeyEvent.VK_DOWN) + { + scalefactor = (float) (scalefactor * 0.9); + scale = findScale(); + } + else if (evt.getKeyChar() == 's') + { + System.err.println("DEBUG: Rectangle selection"); // log.debug - omx = mx; - omy = my; + if ((rectx2 != -1) && (recty2 != -1)) + { + rectSelect(rectx1, recty1, rectx2, recty2); + } + } - startx = x; - starty = y; + repaint(); + } - rectx1 = x; - recty1 = y; + /** + * DOCUMENT ME! + */ + public void printPoints() + { + for (int i = 0; i < npoint; i++) + { + SequencePoint sp = (SequencePoint) points.elementAt(i); + Format.print(System.out, "%5d ", i); - rectx2 = -1; - recty2 = -1; + for (int j = 0; j < 3; j++) + { + Format.print(System.out, "%13.3f ", sp.coord[j]); + } - SequenceI found = findPoint(x, y); + System.out.println(); + } + } - if (found != null) + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void mouseClicked(MouseEvent evt) { - if (av.getSelectionGroup() != null) - { - av.getSelectionGroup().addOrRemove(found, true); - PaintRefresher.Refresh(this, av.alignment); - } - else - { - av.setSelectionGroup(new SequenceGroup()); - av.getSelectionGroup().addOrRemove(found, true); - av.getSelectionGroup().setEndRes(av.alignment.getWidth()); - } } - repaint(); - } - - // private void fireSequenceSelectionEvent(Selection sel) { - // controller.handleSequenceSelectionEvent(new SequenceSelectionEvent(this,sel)); - //} - public void mouseMoved(MouseEvent evt) - { - SequenceI found = findPoint(evt.getX(), evt.getY()); - - if (found != null) + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void mouseEntered(MouseEvent evt) { - this.setToolTipText(found.getName()); } - else + + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void mouseExited(MouseEvent evt) { - this.setToolTipText(null); } - } - public void mouseDragged(MouseEvent evt) - { - mx = evt.getX(); - my = evt.getY(); - - //Check if this is a rectangle drawing drag - if ( (evt.getModifiers() & InputEvent.BUTTON2_MASK) != 0) + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void mouseReleased(MouseEvent evt) { - // rectx2 = evt.getX(); - // recty2 = evt.getY(); } - else + + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void mousePressed(MouseEvent evt) { - rotmat.setIdentity(); + int x = evt.getX(); + int y = evt.getY(); - rotmat.rotate( (float) (my - omy), 'x'); - rotmat.rotate( (float) (mx - omx), 'y'); + mx = x; + my = y; - for (int i = 0; i < npoint; i++) - { - SequencePoint sp = (SequencePoint) points.elementAt(i); - sp.coord[0] -= centre[0]; - sp.coord[1] -= centre[1]; - sp.coord[2] -= centre[2]; - - //Now apply the rotation matrix - sp.coord = rotmat.vectorMultiply(sp.coord); - - //Now translate back again - sp.coord[0] += centre[0]; - sp.coord[1] += centre[1]; - sp.coord[2] += centre[2]; - } + omx = mx; + omy = my; - for (int i = 0; i < 3; i++) - { - axes[i] = rotmat.vectorMultiply(axes[i]); - } + startx = x; + starty = y; - omx = mx; - omy = my; + rectx1 = x; + recty1 = y; - paint(this.getGraphics()); - } - } + rectx2 = -1; + recty2 = -1; + + SequenceI found = findPoint(x, y); - public void rectSelect(int x1, int y1, int x2, int y2) - { - boolean changedSel = false; + if (found != null) + { + if (av.getSelectionGroup() != null) + { + av.getSelectionGroup().addOrRemove(found, true); + PaintRefresher.Refresh(this, av.alignment); + } + else + { + av.setSelectionGroup(new SequenceGroup()); + av.getSelectionGroup().addOrRemove(found, true); + av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1); + } + } + + repaint(); + } - for (int i = 0; i < npoint; i++) + // private void fireSequenceSelectionEvent(Selection sel) { + // controller.handleSequenceSelectionEvent(new SequenceSelectionEvent(this,sel)); + //} + public void mouseMoved(MouseEvent evt) { - SequencePoint sp = (SequencePoint) points.elementAt(i); - int tmp1 = (int) ( ( (sp.coord[0] - centre[0]) * scale) + - ( (float) getWidth() / 2.0)); - int tmp2 = (int) ( ( (sp.coord[1] - centre[1]) * scale) + - ( (float) getHeight() / 2.0)); + SequenceI found = findPoint(evt.getX(), evt.getY()); - if ( (tmp1 > x1) && (tmp1 < x2) && (tmp2 > y1) && (tmp2 < y2)) - { - if (av != null) + if (found != null) { - if (!av.getSelectionGroup().sequences.contains(sp.sequence)) - { - changedSel = true; - av.getSelectionGroup().addSequence(sp.sequence, true); - } + this.setToolTipText(found.getName()); + } + else + { + this.setToolTipText(null); } - } } - // if (changedSel) { - // fireSequenceSelectionEvent(av.getSelection()); - // } - } + /** + * DOCUMENT ME! + * + * @param evt DOCUMENT ME! + */ + public void mouseDragged(MouseEvent evt) + { + mx = evt.getX(); + my = evt.getY(); - public SequenceI findPoint(int x, int y) - { - int halfwidth = getWidth() / 2; - int halfheight = getHeight() / 2; + //Check if this is a rectangle drawing drag + if ((evt.getModifiers() & InputEvent.BUTTON2_MASK) != 0) + { + // rectx2 = evt.getX(); + // recty2 = evt.getY(); + } + else + { + rotmat.setIdentity(); - int found = -1; + rotmat.rotate((float) (my - omy), 'x'); + rotmat.rotate((float) (mx - omx), 'y'); - for (int i = 0; i < npoint; i++) - { - SequencePoint sp = (SequencePoint) points.elementAt(i); - int px = (int) ( (float) (sp.coord[0] - centre[0]) * scale) + - halfwidth; - int py = (int) ( (float) (sp.coord[1] - centre[1]) * scale) + - halfheight; + for (int i = 0; i < npoint; i++) + { + SequencePoint sp = (SequencePoint) points.elementAt(i); + sp.coord[0] -= centre[0]; + sp.coord[1] -= centre[1]; + sp.coord[2] -= centre[2]; - if ( (Math.abs(px - x) < 3) && (Math.abs(py - y) < 3)) - { - found = i; - } + //Now apply the rotation matrix + sp.coord = rotmat.vectorMultiply(sp.coord); + + //Now translate back again + sp.coord[0] += centre[0]; + sp.coord[1] += centre[1]; + sp.coord[2] += centre[2]; + } + + for (int i = 0; i < 3; i++) + { + axes[i] = rotmat.vectorMultiply(axes[i]); + } + + omx = mx; + omy = my; + + paint(this.getGraphics()); + } } - if (found != -1) + /** + * DOCUMENT ME! + * + * @param x1 DOCUMENT ME! + * @param y1 DOCUMENT ME! + * @param x2 DOCUMENT ME! + * @param y2 DOCUMENT ME! + */ + public void rectSelect(int x1, int y1, int x2, int y2) { - return ( (SequencePoint) points.elementAt(found)).sequence; + boolean changedSel = false; + + for (int i = 0; i < npoint; i++) + { + SequencePoint sp = (SequencePoint) points.elementAt(i); + int tmp1 = (int) (((sp.coord[0] - centre[0]) * scale) + + ((float) getWidth() / 2.0)); + int tmp2 = (int) (((sp.coord[1] - centre[1]) * scale) + + ((float) getHeight() / 2.0)); + + if ((tmp1 > x1) && (tmp1 < x2) && (tmp2 > y1) && (tmp2 < y2)) + { + if (av != null) + { + if (!av.getSelectionGroup().sequences.contains(sp.sequence)) + { + changedSel = true; + av.getSelectionGroup().addSequence(sp.sequence, true); + } + } + } + } + + // if (changedSel) { + // fireSequenceSelectionEvent(av.getSelection()); + // } } - else + + /** + * DOCUMENT ME! + * + * @param x DOCUMENT ME! + * @param y DOCUMENT ME! + * + * @return DOCUMENT ME! + */ + public SequenceI findPoint(int x, int y) { - return null; + int halfwidth = getWidth() / 2; + int halfheight = getHeight() / 2; + + int found = -1; + + for (int i = 0; i < npoint; i++) + { + SequencePoint sp = (SequencePoint) points.elementAt(i); + int px = (int) ((float) (sp.coord[0] - centre[0]) * scale) + + halfwidth; + int py = (int) ((float) (sp.coord[1] - centre[1]) * scale) + + halfheight; + + if ((Math.abs(px - x) < 3) && (Math.abs(py - y) < 3)) + { + found = i; + } + } + + if (found != -1) + { + return ((SequencePoint) points.elementAt(found)).sequence; + } + else + { + return null; + } } - } - /* public boolean handleRubberbandEvent(RubberbandEvent evt) { - System.out.println("Rubberband handler called in RotatableCanvas with " + - evt.getBounds()); + /* public boolean handleRubberbandEvent(RubberbandEvent evt) { + System.out.println("Rubberband handler called in RotatableCanvas with " + + evt.getBounds()); - Rubberband rb = (Rubberband)evt.getSource(); + Rubberband rb = (Rubberband)evt.getSource(); - // Clear the current selection (instance variable) - //if ((rb.getModifiers() & Event.SHIFT_MASK) == 0) { - // clearSelection(); - //} + // Clear the current selection (instance variable) + //if ((rb.getModifiers() & Event.SHIFT_MASK) == 0) { + // clearSelection(); + //} - if (rb.getComponent() == this) { - Rectangle bounds = evt.getBounds(); - rectSelect(bounds.x,bounds.y,bounds.x+bounds.width,bounds.y+bounds.height); - } + if (rb.getComponent() == this) { + Rectangle bounds = evt.getBounds(); + rectSelect(bounds.x,bounds.y,bounds.x+bounds.width,bounds.y+bounds.height); + } - redrawneeded = true; - paint(this.getGraphics()); + redrawneeded = true; + paint(this.getGraphics()); - return true; - }*/ + return true; + }*/ }