public int adjustPanelHeight()\r
{\r
// setHeight of panels\r
- image = null;\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
int height = 0;\r
\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
Annotation[] anot = aa[activeRow].annotations;\r
\r
+ if (anot.length < av.getColumnSelection().getMax())\r
+ {\r
+ Annotation[] temp = new Annotation[av.getColumnSelection().getMax()+2 ];\r
+ System.arraycopy(anot, 0, temp, 0, anot.length);\r
+ anot = temp;\r
+ aa[activeRow].annotations = anot;\r
+ }\r
+\r
+\r
if (evt.getActionCommand().equals(REMOVE))\r
{\r
for (int i = 0; i < av.getColumnSelection().size(); i++)\r
public void mousePressed(MouseEvent evt)\r
{\r
\r
-\r
AlignmentAnnotation[] aa = av.alignment.getAlignmentAnnotation();\r
if(aa==null)\r
return;\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
+ if(av.hasHiddenColumns)\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
min = res;\r
max = res;\r
\r
\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
+ if(av.hasHiddenColumns)\r
+ res = av.getColumnSelection().adjustForHiddenColumns(res);\r
+\r
SequenceGroup sg = av.getSelectionGroup();\r
\r
if (res < min)\r
\r
if (aa == null)\r
{\r
+ this.setToolTipText(null);\r
return;\r
}\r
\r
}\r
}\r
\r
+ if(row==-1)\r
+ {\r
+ this.setToolTipText(null);\r
+ return;\r
+ }\r
+\r
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();\r
\r
if(av.hasHiddenColumns)\r
res = av.getColumnSelection().adjustForHiddenColumns(res);\r
\r
- if (row > -1 && res<aa[row].annotations.length)\r
+ if ( aa[row].annotations!=null\r
+ && row > -1\r
+ && res < (int) aa[row].annotations.length)\r
{\r
if(aa[row].graphGroup>-1)\r
{\r
this.setToolTipText(tip.toString() + "</html>");\r
}\r
}\r
- else if(aa[row].annotations[res] != null)\r
+ else if(aa[row].annotations[res] != null\r
+ && aa[row].annotations[res].description!=null)\r
this.setToolTipText(aa[row].annotations[res].description);\r
\r
if(aa[row].annotations[res]!=null)\r
{\r
StringBuffer text = new StringBuffer("Sequence position " +\r
- (res + 1) + " " +\r
- aa[row].annotations[res].description);\r
+ (res + 1));\r
+\r
+ if (aa[row].annotations[res].description != null)\r
+ text.append(" " + aa[row].annotations[res].description);\r
\r
ap.alignFrame.statusBar.setText(text.toString());\r
}\r
}\r
+ else\r
+ this.setToolTipText(null);\r
}\r
\r
/**\r
{\r
if(av.updatingConsensus || av.updatingConservation)\r
{\r
+ if(image==null)\r
+ {\r
+ return;\r
+ }\r
//We'll keep a record of the old image,\r
//and draw a faded image until the calculation\r
//has completed\r
}\r
}\r
\r
- if (av.updatingConsensus && aa[i].label.equals("Consensus"))\r
+ if (av.updatingConsensus && aa[i]==av.consensus)\r
{\r
y += av.charHeight;\r
\r
\r
default:\r
g.setColor(Color.gray);\r
- if(!av.wrapAlignment || endRes==av.endRes)\r
g.fillRect(lastSSX, y + 6 + iconOffset,\r
(x*av.charWidth) - lastSSX, 2);\r
\r