X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FOverviewPanel.java;h=ae8a85bcf3a27af7d44ea3162f10868eef2d7fc0;hb=fdf3e97f5e1100fcd499f76023bb5d293ff10d5e;hp=b48b2a4770f1fc91ddaf1d3eb4540768f70c105c;hpb=d668b0fe1a9eefb95c935bc6c71a88e67642e712;p=jalview.git diff --git a/src/jalview/appletgui/OverviewPanel.java b/src/jalview/appletgui/OverviewPanel.java index b48b2a4..ae8a85b 100755 --- a/src/jalview/appletgui/OverviewPanel.java +++ b/src/jalview/appletgui/OverviewPanel.java @@ -1,18 +1,18 @@ /* - * 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 + * 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 + * + * 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 * PURPOSE. See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . */ package jalview.appletgui; @@ -207,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); @@ -289,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) @@ -369,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); @@ -400,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(); @@ -416,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);