X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignmentPanel.java;h=9d6467a05ac5b2dede3fd9101bedc1d8a0294c75;hb=e83f899e879e04af8f9baa9a495e2918a67f6a4f;hp=cf3e3df661db8376e5320cc2eab2edc8b9273004;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index cf3e3df..9d6467a 100755 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -1,32 +1,38 @@ package jalview.gui; import jalview.jbgui.GAlignmentPanel; +import jalview.schemes.*; +import jalview.analysis.*; +import jalview.datamodel.*; import java.awt.*; -import javax.swing.*; import java.awt.event.*; +import java.awt.print.*; -public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListener +public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListener, Printable { AlignViewport av; - public SeqPanel seqPanel; - public IdPanel idPanel; + OverviewPanel overviewPanel; + SeqPanel seqPanel; + IdPanel idPanel; + SecondaryStructurePanel ssPanel; public AlignFrame alignFrame; - public ScalePanel scalePanel; - public ScorePanel scorePanel; + ScalePanel scalePanel; + ScorePanel scorePanel; - public boolean groupEdit = false; - - public AlignmentPanel(AlignFrame af, AlignViewport av) + public AlignmentPanel(AlignFrame af, final AlignViewport av) { alignFrame = af; this.av = av; seqPanel = new SeqPanel (av, this); idPanel = new IdPanel (av, this); - scalePanel = new ScalePanel(av); + scalePanel = new ScalePanel(av, this); scorePanel = new ScorePanel(av); + ssPanel = new SecondaryStructurePanel(av); + secondaryPanelHolder.add(ssPanel, BorderLayout.CENTER); idPanelHolder.add(idPanel, BorderLayout.CENTER); + idPanel.addNotify(); scalePanelHolder.add(scalePanel, BorderLayout.CENTER); scorePanelHolder.add(scorePanel, BorderLayout.CENTER); seqPanelHolder.add(seqPanel, BorderLayout.CENTER); @@ -34,56 +40,125 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene hscroll.addAdjustmentListener(this); vscroll.addAdjustmentListener(this); - selectAll(false); addComponentListener(new ComponentAdapter() { public void componentResized(ComponentEvent evt) - { RefreshPanels(); } + { + RefreshPanels(); + } }); - } + hscroll.setFocusable(false); + vscroll.setFocusable(false); + setFocusable(true); + + addKeyListener(new KeyAdapter() + { + public void keyPressed(KeyEvent evt) + { + if(evt.getKeyCode()==27) + { + av.setRubberbandGroup(null); + RefreshPanels(); + } + } + }); - public int countSelected() - { - return av.getSelection().size(); - } - public void selectAll(boolean flag) { - int i = 0; - if (flag) { - while (i < seqPanel.align.getHeight()) { - if (! av.getSelection().contains(av.getAlignment().getSequenceAt(i))) { - av.getSelection().addElement(av.getAlignment().getSequenceAt(i)); - } - i++; - } - } else { - av.getSelection().clear(); - } } + public void highlightSearchResults(int [] results) + { + seqPanel.seqCanvas.highlightSearchResults( results ); + + // do we need to scroll the panel? + if(results!=null && (av.getStartSeq()>results[0] + || av.getEndSeq()results[1] + || av.getEndRes() av.getAlignment().getWidth()) @@ -109,16 +184,20 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene hscroll.setValues(x,hextent,0,av.getAlignment().getWidth()); vscroll.setValues(y,vextent,0,av.getAlignment().getHeight() ); + + repaint(); + } - public void adjustmentValueChanged(AdjustmentEvent evt) { + public void adjustmentValueChanged(AdjustmentEvent evt) + { if (evt.getSource() == hscroll) { int x = hscroll.getValue(); av.setStartRes(x); - av.setEndRes(x + (int)(seqPanel.seqCanvas.getWidth()/av.getCharWidth()-1)); + av.setEndRes(x + seqPanel.seqCanvas.getWidth()/av.getCharWidth()-1); } if (evt.getSource() == vscroll) @@ -128,9 +207,96 @@ public class AlignmentPanel extends GAlignmentPanel implements AdjustmentListene av.setEndSeq(offy + seqPanel.seqCanvas.getHeight()/av.getCharHeight()); } + + if(overviewPanel!=null) + overviewPanel.setBoxPosition(); + + seqPanel.seqCanvas.paintFlag=true; repaint(); } + public int print(Graphics pg, PageFormat pf, int pi) throws PrinterException + { + + pg.translate((int)pf.getImageableX(), (int)pf.getImageableY()); + + int pwidth = (int)pf.getImageableWidth(); + int pheight = (int)pf.getImageableHeight(); + int idWidth = (int)idPanel.idCanvas.getLabelWidth().getWidth(); + + pg.setColor(Color.white); + pg.fillRect(0,0,pwidth, pheight); + pg.setFont( av.getFont() ); + + //////////////////////////////////// + /// How many sequences and residues can we fit on a printable page? + int totalRes = (pwidth - idWidth)/av.getCharWidth(); + int totalSeq = (int)((pheight - 30)/av.getCharHeight())-1; + int pagesWide = av.getAlignment().getWidth() / totalRes +1; + int pagesHigh = av.getAlignment().getHeight() / totalSeq +1; + + if (pi >= pagesWide*pagesHigh) + return Printable.NO_SUCH_PAGE; + + ///////////////////////////// + /// Only print these sequences and residues on this page + int startRes, endRes, startSeq, endSeq; + startRes = (pi % pagesWide) * totalRes; + endRes = startRes + totalRes-1; + if(endRes>av.getAlignment().getWidth()) + endRes = av.getAlignment().getWidth(); + + startSeq = (pi / pagesWide) * totalSeq; + endSeq = startSeq + totalSeq; + if(endSeq > av.getAlignment().getHeight()) + endSeq = av.getAlignment().getHeight(); + + + //////////////// + //draw Scale + pg.translate(idWidth,0); + scalePanel.scaleCanvas.drawScale(pg, startRes, endRes, pwidth-idWidth); + + pg.translate(-idWidth, 30); + //////////////// + // Draw the ids + Color currentColor=null; + Color currentTextColor=null; + for(int i=startSeq; i