*
* 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.
+ * 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
* 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 <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see <http://www.gnu.org/licenses/>.
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
aa[activeRow].hasText = true;
if (evt.getActionCommand().equals(STEM))
{
- aa[activeRow].showAllColLabels=true;
+ aa[activeRow].showAllColLabels = true;
}
}
anot[index] = new Annotation(label, "", type, 0);
}
- anot[index].secondaryStructure = type;
+
+ anot[index].secondaryStructure = type != 'S' ? type : label
+ .length() == 0 ? ' ' : label.charAt(0);
anot[index].displayCharacter = label;
}
}
return;
}
- PopupMenu pop = new PopupMenu(MessageManager.getString("label.structure_type"));
+ PopupMenu pop = new PopupMenu(
+ MessageManager.getString("label.structure_type"));
MenuItem item;
/*
* Just display the needed structure options
return;
}
- gg.copyArea(0, 0, imgWidth, getSize().height, -horizontal
- * av.charWidth, 0);
+ gg.copyArea(0, 0, imgWidth, getSize().height,
+ -horizontal * av.getCharWidth(), 0);
int sr = av.startRes, er = av.endRes + 1, transX = 0;
if (horizontal > 0) // scrollbar pulled right, image to the left
{
- transX = (er - sr - horizontal) * av.charWidth;
+ transX = (er - sr - horizontal) * av.getCharWidth();
sr = er - horizontal;
}
else if (horizontal < 0)
g.setFont(ofont);
g.setColor(Color.white);
- g.fillRect(0, 0, (endRes - startRes) * av.charWidth, getSize().height);
+ g.fillRect(0, 0, (endRes - startRes) * av.getCharWidth(),
+ getSize().height);
if (fm == null)
{
g.setColor(Color.black);
if (av.validCharWidth)
{
- g.drawString(MessageManager.getString("label.alignment_has_no_annotations"), 20, 15);
+ g.drawString(MessageManager
+ .getString("label.alignment_has_no_annotations"), 20, 15);
}
return;
{
return imgWidth;
}
+
private int[] bounds = new int[2];
+
@Override
public int[] getVisibleVRange()
{
- if (ap!=null && ap.alabels!=null)
+ if (ap != null && ap.alabels != null)
{
- int sOffset=-ap.alabels.scrollOffset;
- int visHeight = sOffset+ap.annotationPanelHolder.getHeight();
- bounds[0] = sOffset; bounds[1]=visHeight;
- return bounds;
- } else return null;
+ int sOffset = -ap.alabels.scrollOffset;
+ int visHeight = sOffset + ap.annotationPanelHolder.getHeight();
+ bounds[0] = sOffset;
+ bounds[1] = visHeight;
+ return bounds;
+ }
+ else
+ return null;
}
}