X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=ae8a85bcf3a27af7d44ea3162f10868eef2d7fc0;hb=3b4eda86f1f240a932cc778658dc1fbe56e9630d;hp=ba066a1fb460692636b01a85712d2cf2d3afa673;hpb=3f734555193e56f46b07d5bc12df77d26e180ec0;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index ba066a1..ae8a85b 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -1,13 +1,13 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -67,7 +67,7 @@ public class OverviewPanel extends Panel implements Runnable, sr.forOverview = true; fr = new FeatureRenderer(av); fr.overview = true; - + // scale the initial size of overviewpanel to shape of alignment float initialScale = (float) av.getAlignment().getWidth() / (float) av.getAlignment().getHeight(); @@ -102,6 +102,7 @@ public class OverviewPanel extends Panel implements Runnable, addComponentListener(new ComponentAdapter() { + @Override public void componentResized(ComponentEvent evt) { if (getSize().width != width @@ -120,22 +121,27 @@ public class OverviewPanel extends Panel implements Runnable, } + @Override public void mouseEntered(MouseEvent evt) { } + @Override public void mouseExited(MouseEvent evt) { } + @Override public void mouseClicked(MouseEvent evt) { } + @Override public void mouseMoved(MouseEvent evt) { } + @Override public void mousePressed(MouseEvent evt) { boxX = evt.getX(); @@ -143,6 +149,7 @@ public class OverviewPanel extends Panel implements Runnable, checkValid(); } + @Override public void mouseReleased(MouseEvent evt) { boxX = evt.getX(); @@ -150,6 +157,7 @@ public class OverviewPanel extends Panel implements Runnable, checkValid(); } + @Override public void mouseDragged(MouseEvent evt) { boxX = evt.getX(); @@ -199,8 +207,8 @@ public class OverviewPanel extends Panel implements Runnable, if (av.hasHiddenRows()) { - row = av.getAlignment().getHiddenSequences().findIndexWithoutHiddenSeqs( - row); + row = av.getAlignment().getHiddenSequences() + .findIndexWithoutHiddenSeqs(row); } ap.setScrollValues(col, row); @@ -242,6 +250,7 @@ public class OverviewPanel extends Panel implements Runnable, // the overview is being calculated boolean resizeAgain = false; + @Override public void run() { miniMe = null; @@ -280,7 +289,7 @@ public class OverviewPanel extends Panel implements Runnable, int row, col, sameRow = 0, sameCol = 0; jalview.datamodel.SequenceI seq; boolean hiddenRow = false; - AlignmentI alignment=av.getAlignment(); + AlignmentI alignment = av.getAlignment(); for (row = 0; row <= sequencesHeight; row++) { if ((int) (row * sampleRow) == lastrow) @@ -360,14 +369,16 @@ public class OverviewPanel extends Panel implements Runnable, sameRow = 1; } - if (av.getAlignmentConservationAnnotation()!= null) + if (av.getAlignmentConservationAnnotation() != null) { for (col = 0; col < width; col++) { lastcol = (int) (col * sampleCol); { mg.translate(col, sequencesHeight); - ap.annotationPanel.renderer.drawGraph(mg, av.getAlignmentConservationAnnotation(),av.getAlignmentConservationAnnotation().annotations, + ap.annotationPanel.renderer.drawGraph(mg, + av.getAlignmentConservationAnnotation(), + av.getAlignmentConservationAnnotation().annotations, (int) (sampleCol) + 1, graphHeight, (int) (col * sampleCol), (int) (col * sampleCol) + 1); mg.translate(-col, -sequencesHeight); @@ -391,7 +402,8 @@ public class OverviewPanel extends Panel implements Runnable, { int fullsizeWidth = av.getAlignment().getWidth() * av.getCharWidth(); int fullsizeHeight = (av.getAlignment().getHeight() + av.getAlignment() - .getHiddenSequences().getSize()) * av.getCharHeight(); + .getHiddenSequences().getSize()) + * av.getCharHeight(); int startRes = av.getStartRes(); int endRes = av.getEndRes(); @@ -407,8 +419,8 @@ public class OverviewPanel extends Panel implements Runnable, if (av.hasHiddenRows()) { - startSeq = av.getAlignment().getHiddenSequences().adjustForHiddenSeqs( - startSeq); + startSeq = av.getAlignment().getHiddenSequences() + .adjustForHiddenSeqs(startSeq); endSeq = av.getAlignment().getHiddenSequences() .adjustForHiddenSeqs(endSeq); @@ -435,11 +447,13 @@ public class OverviewPanel extends Panel implements Runnable, repaint(); } + @Override public void update(Graphics g) { paint(g); } + @Override public void paint(Graphics g) { Graphics og = offscreen.getGraphics();