X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAnnotationPanel.java;h=1b4a230a526f78d0d50d6dfe7a7d906372bc5fd0;hb=6fc9aca27f606f6e3a0121597896e1a5dae35c36;hp=ab6d3956d8cb8594fb2a0d335b0fdf64e0b79ec5;hpb=b0964906430d7b229311b08c234881d53f78da47;p=jalview.git diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java index ab6d395..1b4a230 100755 --- a/src/jalview/gui/AnnotationPanel.java +++ b/src/jalview/gui/AnnotationPanel.java @@ -57,6 +57,9 @@ public class AnnotationPanel extends JPanel implements MouseListener, //Used For mouse Dragging and resizing graphs int graphStretch = -1; int graphStretchY = -1; + int min; //used by mouseDragged to see if user + int max; //used by mouseDragged to see if user + boolean mouseDragging = false; /** * Creates a new AnnotationPanel object. @@ -335,34 +338,28 @@ public class AnnotationPanel extends JPanel implements MouseListener, int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); - if (evt.isShiftDown()) - { - /*int start = Integer.parseInt(activeRes.get(activeRes.size() - - 1).toString()); - int end = res; - - if (end < start) - { - int temp = end; - end = start; - start = temp; - } + min = res; + max = res; - for (int n = start; n <= end; n++) - { - addEditableColumn(n); - } */ - } + if (av.getColumnSelection().contains(res)) + av.getColumnSelection().removeElement(res); else { - if (av.getColumnSelection().contains(res)) - av.getColumnSelection().removeElement(res); - else av.getColumnSelection().addElement(res); + SequenceGroup sg = new SequenceGroup(); - ap.repaint(); + for (int i = 0; i < av.alignment.getSequences().size(); i++) + { + sg.addSequence(av.alignment.getSequenceAt(i), false); + } + sg.setStartRes(res); + sg.setEndRes(res); + av.setSelectionGroup(sg); } + + ap.repaint(); + } /** @@ -374,6 +371,7 @@ public class AnnotationPanel extends JPanel implements MouseListener, { graphStretch = -1; graphStretchY = -1; + mouseDragging = false; } /** @@ -383,6 +381,8 @@ public class AnnotationPanel extends JPanel implements MouseListener, */ public void mouseEntered(MouseEvent evt) { + if(mouseDragging) + ap.seqPanel.scrollCanvas(null); } /** @@ -392,8 +392,11 @@ public class AnnotationPanel extends JPanel implements MouseListener, */ public void mouseExited(MouseEvent evt) { + if(mouseDragging) + ap.seqPanel.scrollCanvas(evt); } + /** * DOCUMENT ME! * @@ -410,6 +413,56 @@ public class AnnotationPanel extends JPanel implements MouseListener, adjustPanelHeight(); ap.repaint(); } + else + { + mouseDragging = true; + + int res = (evt.getX() / av.getCharWidth()) + av.getStartRes(); + + SequenceGroup sg = av.getSelectionGroup(); + + if (res < min) + { + min = res; + } + + if (res > max) + { + max = res; + } + + if (sg != null) + { + if (!av.getColumnSelection().contains(res)) + { + av.getColumnSelection().addElement(res); + } + + if (res > sg.getStartRes()) + { + sg.setEndRes(res); + } + else if (res < sg.getStartRes()) + { + sg.setStartRes(res); + } + + for (int i = min; i <= max; i++) + { + if ((i < sg.getStartRes()) || (i > sg.getEndRes())) + { + av.getColumnSelection().removeElement(i); + } + else + { + av.getColumnSelection().addElement(i); + } + } + + ap.repaint(); + } + + } } /** @@ -606,8 +659,8 @@ public class AnnotationPanel extends JPanel implements MouseListener, int x = 0; int y = 0; - char[] lastSS = new char[aa.length]; - int[] lastSSX = new int[aa.length]; + char lastSS; + int lastSSX; int iconOffset = av.charHeight / 2; boolean validRes = false; @@ -624,6 +677,8 @@ public class AnnotationPanel extends JPanel implements MouseListener, continue; } + lastSS = ' '; + lastSSX = 0; if (row.graph>0) @@ -651,14 +706,13 @@ public class AnnotationPanel extends JPanel implements MouseListener, int column = startRes; int yPos = startRes; - int aaMax = row.annotations.length-1; while (yPos < endRes) { if (av.hasHiddenColumns) { column = av.getColumnSelection().adjustForHiddenColumns(yPos); - if (column > aaMax) + if (column > row.annotations.length-1) { break; } @@ -724,21 +778,21 @@ public class AnnotationPanel extends JPanel implements MouseListener, if (row.hasIcons) { if (!validRes || - (row.annotations[column].secondaryStructure != lastSS[i])) + (row.annotations[column].secondaryStructure != lastSS)) { - switch (lastSS[i]) + switch (lastSS) { case 'H': g.setColor(HELIX_COLOUR); - g.fillRoundRect(lastSSX[i], y + 4 + iconOffset, - x - lastSSX[i], 7, 8, 8); + g.fillRoundRect(lastSSX, y + 4 + iconOffset, + x - lastSSX, 7, 8, 8); break; case 'E': g.setColor(SHEET_COLOUR); - g.fillRect(lastSSX[i], y + 4 + iconOffset, - x - lastSSX[i] - 4, 7); + g.fillRect(lastSSX, y + 4 + iconOffset, + x - lastSSX - 4, 7); g.fillPolygon(new int[] { x - 4, x - 4, x }, new int[] { @@ -751,22 +805,22 @@ public class AnnotationPanel extends JPanel implements MouseListener, default: g.setColor(Color.gray); - g.fillRect(lastSSX[i], y + 6 + iconOffset, - x - lastSSX[i], 2); + g.fillRect(lastSSX, y + 6 + iconOffset, + x - lastSSX, 2); break; } if (validRes) { - lastSS[i] = row.annotations[column].secondaryStructure; + lastSS = row.annotations[column].secondaryStructure; } else { - lastSS[i] = ' '; + lastSS = ' '; } - lastSSX[i] = x; + lastSSX = x; } } @@ -777,12 +831,12 @@ public class AnnotationPanel extends JPanel implements MouseListener, if (row.hasIcons) { - switch (lastSS[i]) + switch (lastSS) { case 'H': g.setColor(HELIX_COLOUR); - g.fillRoundRect(lastSSX[i], y + 4 + iconOffset, - x - lastSSX[i], 7, 8, 8); + g.fillRoundRect(lastSSX, y + 4 + iconOffset, + x - lastSSX, 7, 8, 8); break; @@ -792,8 +846,8 @@ public class AnnotationPanel extends JPanel implements MouseListener, if (row.annotations[endRes] !=null && row.annotations[endRes].secondaryStructure != 'E') { - g.fillRect(lastSSX[i], y + 4 + iconOffset, - x - lastSSX[i] - 4, 7); + g.fillRect(lastSSX, y + 4 + iconOffset, + x - lastSSX - 4, 7); g.fillPolygon(new int[] {x - 4, x - 4, x}, new int[] @@ -803,17 +857,15 @@ public class AnnotationPanel extends JPanel implements MouseListener, }, 3); } else - g.fillRect(lastSSX[i], y + 4 + iconOffset, - x - lastSSX[i], 7); + g.fillRect(lastSSX, y + 4 + iconOffset, + x - lastSSX, 7); break; - case 'C': - break; default: g.setColor(Color.gray); - g.fillRect(lastSSX[i], y + 6 + iconOffset, x - lastSSX[i], 2); + g.fillRect(lastSSX, y + 6 + iconOffset, x - lastSSX, 2); break; } @@ -906,21 +958,6 @@ public class AnnotationPanel extends JPanel implements MouseListener, g.setColor(Color.gray); g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2); - - if(aa.threshold!=null) - { - g.setColor(aa.threshold.colour); - Graphics2D g2 = (Graphics2D)g; - g2.setStroke(new BasicStroke(1, - BasicStroke.CAP_SQUARE, - BasicStroke.JOIN_ROUND, 3f, - new float[] { 5f, 3f }, 0f)); - - y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight); - g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2); - g2.setStroke(new BasicStroke()); - } - eRes = Math.min(eRes, aa.annotations.length); int column = sRes; @@ -954,6 +991,19 @@ public class AnnotationPanel extends JPanel implements MouseListener, g.drawLine(x-av.charWidth/2, y1, x+av.charWidth/2, y2); x += av.charWidth; } + if(aa.threshold!=null) + { + g.setColor(aa.threshold.colour); + Graphics2D g2 = (Graphics2D)g; + g2.setStroke(new BasicStroke(1, + BasicStroke.CAP_SQUARE, + BasicStroke.JOIN_ROUND, 3f, + new float[] { 5f, 3f }, 0f)); + + y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight); + g.drawLine(0,y2,(eRes-sRes)*av.charWidth,y2); + g2.setStroke(new BasicStroke()); + } } public void drawBarGraph(Graphics g, AlignmentAnnotation aa, @@ -970,20 +1020,6 @@ public class AnnotationPanel extends JPanel implements MouseListener, float range = max - min; - if(aa.threshold!=null) - { - g.setColor(aa.threshold.colour); - Graphics2D g2 = (Graphics2D)g; - g2.setStroke(new BasicStroke(1, - BasicStroke.CAP_SQUARE, - BasicStroke.JOIN_ROUND, 3f, - new float[] { 5f, 3f }, 0f)); - - y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight); - g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2); - g2.setStroke(new BasicStroke()); - } - y1 = y2 = y; if(min<0) @@ -1030,7 +1066,19 @@ public class AnnotationPanel extends JPanel implements MouseListener, x += av.charWidth; } + if(aa.threshold!=null) + { + g.setColor(aa.threshold.colour); + Graphics2D g2 = (Graphics2D)g; + g2.setStroke(new BasicStroke(1, + BasicStroke.CAP_SQUARE, + BasicStroke.JOIN_ROUND, 3f, + new float[] { 5f, 3f }, 0f)); + y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight); + g.drawLine(0,y2,(eRes-sRes)*av.charWidth,y2); + g2.setStroke(new BasicStroke()); + } } // used by overview window