//Used For mouse Dragging and resizing graphs\r
int graphStretch = -1;\r
int graphStretchY = -1;\r
+ int min; //used by mouseDragged to see if user\r
+ int max; //used by mouseDragged to see if user\r
+ boolean mouseDragging = false;\r
\r
/**\r
* Creates a new AnnotationPanel object.\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
- if (evt.isShiftDown())\r
- {\r
- /*int start = Integer.parseInt(activeRes.get(activeRes.size() -\r
- 1).toString());\r
- int end = res;\r
-\r
- if (end < start)\r
- {\r
- int temp = end;\r
- end = start;\r
- start = temp;\r
- }\r
+ min = res;\r
+ max = res;\r
\r
- for (int n = start; n <= end; n++)\r
- {\r
- addEditableColumn(n);\r
- } */\r
- }\r
+ if (av.getColumnSelection().contains(res))\r
+ av.getColumnSelection().removeElement(res);\r
else\r
{\r
- if (av.getColumnSelection().contains(res))\r
- av.getColumnSelection().removeElement(res);\r
- else\r
av.getColumnSelection().addElement(res);\r
+ SequenceGroup sg = new SequenceGroup();\r
\r
- ap.repaint();\r
+ for (int i = 0; i < av.alignment.getSequences().size(); i++)\r
+ {\r
+ sg.addSequence(av.alignment.getSequenceAt(i), false);\r
+ }\r
\r
+ sg.setStartRes(res);\r
+ sg.setEndRes(res);\r
+ av.setSelectionGroup(sg);\r
}\r
+\r
+ ap.repaint();\r
+\r
}\r
\r
/**\r
{\r
graphStretch = -1;\r
graphStretchY = -1;\r
+ mouseDragging = false;\r
}\r
\r
/**\r
*/\r
public void mouseEntered(MouseEvent evt)\r
{\r
+ if(mouseDragging)\r
+ ap.seqPanel.scrollCanvas(null);\r
}\r
\r
/**\r
*/\r
public void mouseExited(MouseEvent evt)\r
{\r
+ if(mouseDragging)\r
+ ap.seqPanel.scrollCanvas(evt);\r
}\r
\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
adjustPanelHeight();\r
ap.repaint();\r
}\r
+ else\r
+ {\r
+ mouseDragging = true;\r
+\r
+ int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
+\r
+ SequenceGroup sg = av.getSelectionGroup();\r
+\r
+ if (res < min)\r
+ {\r
+ min = res;\r
+ }\r
+\r
+ if (res > max)\r
+ {\r
+ max = res;\r
+ }\r
+\r
+ if (sg != null)\r
+ {\r
+ if (!av.getColumnSelection().contains(res))\r
+ {\r
+ av.getColumnSelection().addElement(res);\r
+ }\r
+\r
+ if (res > sg.getStartRes())\r
+ {\r
+ sg.setEndRes(res);\r
+ }\r
+ else if (res < sg.getStartRes())\r
+ {\r
+ sg.setStartRes(res);\r
+ }\r
+\r
+ for (int i = min; i <= max; i++)\r
+ {\r
+ if ((i < sg.getStartRes()) || (i > sg.getEndRes()))\r
+ {\r
+ av.getColumnSelection().removeElement(i);\r
+ }\r
+ else\r
+ {\r
+ av.getColumnSelection().addElement(i);\r
+ }\r
+ }\r
+\r
+ ap.repaint();\r
+ }\r
+\r
+ }\r
}\r
\r
/**\r
\r
int x = 0;\r
int y = 0;\r
- char[] lastSS = new char[aa.length];\r
- int[] lastSSX = new int[aa.length];\r
+ char lastSS;\r
+ int lastSSX;\r
int iconOffset = av.charHeight / 2;\r
boolean validRes = false;\r
\r
continue;\r
}\r
\r
+ lastSS = ' ';\r
+ lastSSX = 0;\r
\r
\r
if (row.graph>0)\r
\r
int column = startRes;\r
int yPos = startRes;\r
- int aaMax = row.annotations.length-1;\r
\r
while (yPos < endRes)\r
{\r
if (av.hasHiddenColumns)\r
{\r
column = av.getColumnSelection().adjustForHiddenColumns(yPos);\r
- if (column > aaMax)\r
+ if (column > row.annotations.length-1)\r
{\r
break;\r
}\r
if (row.hasIcons)\r
{\r
if (!validRes ||\r
- (row.annotations[column].secondaryStructure != lastSS[i]))\r
+ (row.annotations[column].secondaryStructure != lastSS))\r
{\r
- switch (lastSS[i])\r
+ switch (lastSS)\r
{\r
case 'H':\r
g.setColor(HELIX_COLOUR);\r
- g.fillRoundRect(lastSSX[i], y + 4 + iconOffset,\r
- x - lastSSX[i], 7, 8, 8);\r
+ g.fillRoundRect(lastSSX, y + 4 + iconOffset,\r
+ x - lastSSX, 7, 8, 8);\r
\r
break;\r
\r
case 'E':\r
g.setColor(SHEET_COLOUR);\r
- g.fillRect(lastSSX[i], y + 4 + iconOffset,\r
- x - lastSSX[i] - 4, 7);\r
+ g.fillRect(lastSSX, y + 4 + iconOffset,\r
+ x - lastSSX - 4, 7);\r
g.fillPolygon(new int[] { x - 4, x - 4, x },\r
new int[]\r
{\r
\r
default:\r
g.setColor(Color.gray);\r
- g.fillRect(lastSSX[i], y + 6 + iconOffset,\r
- x - lastSSX[i], 2);\r
+ g.fillRect(lastSSX, y + 6 + iconOffset,\r
+ x - lastSSX, 2);\r
\r
break;\r
}\r
\r
if (validRes)\r
{\r
- lastSS[i] = row.annotations[column].secondaryStructure;\r
+ lastSS = row.annotations[column].secondaryStructure;\r
}\r
else\r
{\r
- lastSS[i] = ' ';\r
+ lastSS = ' ';\r
}\r
\r
- lastSSX[i] = x;\r
+ lastSSX = x;\r
}\r
}\r
\r
\r
if (row.hasIcons)\r
{\r
- switch (lastSS[i])\r
+ switch (lastSS)\r
{\r
case 'H':\r
g.setColor(HELIX_COLOUR);\r
- g.fillRoundRect(lastSSX[i], y + 4 + iconOffset,\r
- x - lastSSX[i], 7, 8, 8);\r
+ g.fillRoundRect(lastSSX, y + 4 + iconOffset,\r
+ x - lastSSX, 7, 8, 8);\r
\r
break;\r
\r
if (row.annotations[endRes] !=null\r
&& row.annotations[endRes].secondaryStructure != 'E')\r
{\r
- g.fillRect(lastSSX[i], y + 4 + iconOffset,\r
- x - lastSSX[i] - 4, 7);\r
+ g.fillRect(lastSSX, y + 4 + iconOffset,\r
+ x - lastSSX - 4, 7);\r
g.fillPolygon(new int[]\r
{x - 4, x - 4, x},\r
new int[]\r
}, 3);\r
}\r
else\r
- g.fillRect(lastSSX[i], y + 4 + iconOffset,\r
- x - lastSSX[i], 7);\r
+ g.fillRect(lastSSX, y + 4 + iconOffset,\r
+ x - lastSSX, 7);\r
\r
break;\r
\r
- case 'C':\r
- break;\r
\r
default:\r
g.setColor(Color.gray);\r
- g.fillRect(lastSSX[i], y + 6 + iconOffset, x - lastSSX[i], 2);\r
+ g.fillRect(lastSSX, y + 6 + iconOffset, x - lastSSX, 2);\r
\r
break;\r
}\r
g.setColor(Color.gray);\r
g.drawLine(x-av.charWidth,y2,(eRes-sRes+1)*av.charWidth,y2);\r
\r
-\r
- if(aa.threshold!=null)\r
- {\r
- g.setColor(aa.threshold.colour);\r
- Graphics2D g2 = (Graphics2D)g;\r
- g2.setStroke(new BasicStroke(1,\r
- BasicStroke.CAP_SQUARE,\r
- BasicStroke.JOIN_ROUND, 3f,\r
- new float[] { 5f, 3f }, 0f));\r
-\r
- y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight);\r
- g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2);\r
- g2.setStroke(new BasicStroke());\r
- }\r
-\r
eRes = Math.min(eRes, aa.annotations.length);\r
\r
int column = sRes;\r
g.drawLine(x-av.charWidth/2, y1, x+av.charWidth/2, y2);\r
x += av.charWidth;\r
}\r
+ if(aa.threshold!=null)\r
+ {\r
+ g.setColor(aa.threshold.colour);\r
+ Graphics2D g2 = (Graphics2D)g;\r
+ g2.setStroke(new BasicStroke(1,\r
+ BasicStroke.CAP_SQUARE,\r
+ BasicStroke.JOIN_ROUND, 3f,\r
+ new float[] { 5f, 3f }, 0f));\r
+\r
+ y2 = (int)(y - ((aa.threshold.value-min) / range)*graphHeight);\r
+ g.drawLine(0,y2,(eRes-sRes)*av.charWidth,y2);\r
+ g2.setStroke(new BasicStroke());\r
+ }\r
}\r
\r
public void drawBarGraph(Graphics g, AlignmentAnnotation aa,\r
\r
float range = max - min;\r
\r
- if(aa.threshold!=null)\r
- {\r
- g.setColor(aa.threshold.colour);\r
- Graphics2D g2 = (Graphics2D)g;\r
- g2.setStroke(new BasicStroke(1,\r
- BasicStroke.CAP_SQUARE,\r
- BasicStroke.JOIN_ROUND, 3f,\r
- new float[] { 5f, 3f }, 0f));\r
-\r
- y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight);\r
- g.drawLine(x-av.charWidth,y2,(eRes-sRes)*av.charWidth,y2);\r
- g2.setStroke(new BasicStroke());\r
- }\r
-\r
y1 = y2 = y;\r
\r
if(min<0)\r
\r
x += av.charWidth;\r
}\r
+ if(aa.threshold!=null)\r
+ {\r
+ g.setColor(aa.threshold.colour);\r
+ Graphics2D g2 = (Graphics2D)g;\r
+ g2.setStroke(new BasicStroke(1,\r
+ BasicStroke.CAP_SQUARE,\r
+ BasicStroke.JOIN_ROUND, 3f,\r
+ new float[] { 5f, 3f }, 0f));\r
\r
+ y2 = (int)(y - ((aa.threshold.value-min) / range)*aa.graphHeight);\r
+ g.drawLine(0,y2,(eRes-sRes)*av.charWidth,y2);\r
+ g2.setStroke(new BasicStroke());\r
+ }\r
}\r
\r
// used by overview window\r
git://source.jalview.org / jalview.git / blobdiff