X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=d7c2b43633ee9e635b7f8d62b8f85041ce42548d;hb=442b6bc246ee877d5e977baf80fd96299e0e05c4;hp=4eae6365e658bda3b34129ab301078a3467d4d56;hpb=1e56f1761e711a369e6f1990dea4bb11e8b5d8df;p=jalview.git diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 4eae636..d7c2b43 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -19,21 +19,22 @@ package jalview.appletgui; -import jalview.schemes.*; -import jalview.datamodel.*; -import jalview.analysis.*; -import jalview.io.*; -import jalview.commands.*; +import java.io.*; +import java.net.*; +import java.util.*; + import java.awt.*; import java.awt.event.*; -import java.util.*; -import java.io.InputStreamReader; -import java.io.BufferedReader; -import java.net.URL; +import jalview.analysis.*; +import jalview.commands.*; +import jalview.datamodel.*; +import jalview.io.*; +import jalview.schemes.*; -public class AlignFrame extends Frame implements ActionListener, - ItemListener, KeyListener, MouseListener +public class AlignFrame + extends EmbmenuFrame implements ActionListener, + ItemListener, KeyListener { public AlignmentPanel alignPanel; public AlignViewport viewport; @@ -42,18 +43,22 @@ public class AlignFrame extends Frame implements ActionListener, String jalviewServletURL; - - public AlignFrame(AlignmentI al, - jalview.bin.JalviewLite applet, - String title, - boolean embedded) + public AlignFrame(AlignmentI al, + jalview.bin.JalviewLite applet, + String title, + boolean embedded) { - jalviewServletURL = applet.getParameter("APPLICATION_URL"); + if (applet != null) + { + jalviewServletURL = applet.getParameter("APPLICATION_URL"); + } - try{ + try + { jbInit(); - }catch(Exception ex) + } + catch (Exception ex) { ex.printStackTrace(); } @@ -68,15 +73,19 @@ public class AlignFrame extends Frame implements ActionListener, seqLimits.setState(viewport.showJVSuffix); - if(applet!=null) + if (applet != null) { String param = applet.getParameter("sortBy"); if (param != null) { if (param.equalsIgnoreCase("Id")) + { sortIDMenuItem_actionPerformed(); + } else if (param.equalsIgnoreCase("Pairwise Identity")) + { sortPairwiseMenuItem_actionPerformed(); + } } param = applet.getParameter("wrap"); @@ -88,6 +97,12 @@ public class AlignFrame extends Frame implements ActionListener, wrapMenuItem_actionPerformed(); } } + param = applet.getParameter("centrecolumnlabels"); + if (param != null) + { + centreColumnLabelFlag.setState(true); + centreColumnLabelFlag_stateChanged(); + } try { @@ -109,28 +124,18 @@ public class AlignFrame extends Frame implements ActionListener, } - //Some JVMS send keyevents to Top frame or lowest panel, - //Havent worked out why yet. So add to both this frame and seqCanvas for now - this.addKeyListener(this); - alignPanel.seqPanel.seqCanvas.addKeyListener(this); - alignPanel.idPanel.idCanvas.addKeyListener(this); - alignPanel.scalePanel.addKeyListener(this); - alignPanel.annotationPanel.addKeyListener(this); - - - if(embedded) - { - setEmbedded(); - } - else - { - add(alignPanel, BorderLayout.CENTER); - jalview.bin.JalviewLite.addFrame(this, title, DEFAULT_WIDTH, - DEFAULT_HEIGHT); - } - alignPanel.validate(); - alignPanel.repaint(); + //Some JVMS send keyevents to Top frame or lowest panel, + //Havent worked out why yet. So add to both this frame and seqCanvas for now + this.addKeyListener(this); + alignPanel.seqPanel.seqCanvas.addKeyListener(this); + alignPanel.idPanel.idCanvas.addKeyListener(this); + alignPanel.scalePanel.addKeyListener(this); + alignPanel.annotationPanel.addKeyListener(this); + createAlignFrameWindow(embedded, title); + alignPanel.validate(); + alignPanel.paintAlignment(true); } + public AlignViewport getAlignViewport() { return viewport; @@ -141,7 +146,6 @@ public class AlignFrame extends Frame implements ActionListener, return alignPanel.seqPanel.seqCanvas; } - /** * DOCUMENT ME! * @@ -152,39 +156,46 @@ public class AlignFrame extends Frame implements ActionListener, { Hashtable featureLinks = new Hashtable(); boolean featuresFile = false; - try{ - featuresFile = new jalview.io.FeaturesFile(file, type).parse(viewport.alignment, - alignPanel.seqPanel.seqCanvas. - getFeatureRenderer().featureColours, - featureLinks, - true); + try + { + featuresFile = new jalview.io.FeaturesFile(file, + type).parse(viewport.alignment, + alignPanel.seqPanel.seqCanvas. + getFeatureRenderer().featureColours, + featureLinks, + true); } - catch(Exception ex) + catch (Exception ex) { ex.printStackTrace(); } - if(featuresFile) + if (featuresFile) { - if(featureLinks.size()>0) + if (featureLinks.size() > 0) + { alignPanel.seqPanel.seqCanvas .getFeatureRenderer().featureLinks = featureLinks; + } viewport.showSequenceFeatures = true; sequenceFeatures.setState(true); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } } - public void keyPressed(KeyEvent evt) { - if (viewport.cursorMode - && evt.getKeyCode() >= KeyEvent.VK_0 - && evt.getKeyCode() <= KeyEvent.VK_9) - { - alignPanel.seqPanel.numberPressed(evt.getKeyChar()); - } + if (viewport.cursorMode && + ( (evt.getKeyCode() >= KeyEvent.VK_0 && + evt.getKeyCode() <= KeyEvent.VK_9) + || + (evt.getKeyCode() >= KeyEvent.VK_NUMPAD0 && + evt.getKeyCode() <= KeyEvent.VK_NUMPAD9) + ) + && Character.isDigit(evt.getKeyChar())) + alignPanel.seqPanel.numberPressed(evt.getKeyChar()); + switch (evt.getKeyCode()) { @@ -220,38 +231,45 @@ public class AlignFrame extends Frame implements ActionListener, } break; case KeyEvent.VK_DOWN: - if(viewport.cursorMode) + if (viewport.cursorMode) { - alignPanel.seqPanel.moveCursor(0,1); + alignPanel.seqPanel.moveCursor(0, 1); } else + { moveSelectedSequences(false); + } break; case KeyEvent.VK_UP: if (viewport.cursorMode) { - alignPanel.seqPanel.moveCursor(0,-1); + alignPanel.seqPanel.moveCursor(0, -1); } else + { moveSelectedSequences(true); + } break; case KeyEvent.VK_LEFT: - if(viewport.cursorMode) - { - alignPanel.seqPanel.moveCursor(-1,0); - } + if (evt.isAltDown() || !viewport.cursorMode) + slideSequences(false, + alignPanel.seqPanel.getKeyboardNo1()); + else + alignPanel.seqPanel.moveCursor( -1, 0); break; case KeyEvent.VK_RIGHT: - if (viewport.cursorMode) - { - alignPanel.seqPanel.moveCursor(1,0); - } - break; + if (evt.isAltDown() || !viewport.cursorMode) + slideSequences(true, + alignPanel.seqPanel.getKeyboardNo1()); + else + alignPanel.seqPanel.moveCursor( 1, 0); + break; + case KeyEvent.VK_SPACE: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.insertGapAtCursor(evt.isControlDown() || evt.isShiftDown() @@ -262,13 +280,13 @@ public class AlignFrame extends Frame implements ActionListener, case KeyEvent.VK_DELETE: case KeyEvent.VK_BACK_SPACE: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.deleteGapAtCursor(evt.isControlDown() || evt.isShiftDown() || evt.isAltDown()); } - else + else { cut_actionPerformed(); alignPanel.seqPanel.seqCanvas.repaint(); @@ -276,13 +294,13 @@ public class AlignFrame extends Frame implements ActionListener, break; case KeyEvent.VK_S: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.setCursorRow(); } break; case KeyEvent.VK_P: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.setCursorPosition(); } @@ -290,35 +308,35 @@ public class AlignFrame extends Frame implements ActionListener, case KeyEvent.VK_ENTER: case KeyEvent.VK_COMMA: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.setCursorRowAndColumn(); } break; case KeyEvent.VK_Q: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.setSelectionAreaAtCursor(true); } break; case KeyEvent.VK_M: - if(viewport.cursorMode) + if (viewport.cursorMode) { alignPanel.seqPanel.setSelectionAreaAtCursor(false); } break; - case KeyEvent.VK_F2: - viewport.cursorMode = ! viewport.cursorMode; - statusBar.setText("Keyboard editing mode is "+ - (viewport.cursorMode ? "on" : "off")); - if(viewport.cursorMode) - { - alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes; - alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq; - } - break; + case KeyEvent.VK_F2: + viewport.cursorMode = !viewport.cursorMode; + statusBar.setText("Keyboard editing mode is " + + (viewport.cursorMode ? "on" : "off")); + if (viewport.cursorMode) + { + alignPanel.seqPanel.seqCanvas.cursorX = viewport.startRes; + alignPanel.seqPanel.seqCanvas.cursorY = viewport.startSeq; + } + break; case KeyEvent.VK_F: if (evt.isControlDown()) @@ -334,47 +352,61 @@ public class AlignFrame extends Frame implements ActionListener, boolean hide = false; SequenceGroup sg = viewport.getSelectionGroup(); - if(toggleSeqs) + if (toggleSeqs) { - if (sg != null && sg.getSize(false) != viewport.alignment.getHeight()) + if (sg != null && sg.getSize() != viewport.alignment.getHeight()) { hide = true; viewport.hideAllSelectedSeqs(); } - else if (!(toggleCols && viewport.colSel.getSelected().size() > 0)) + else if (! (toggleCols && viewport.colSel.getSelected().size() > 0)) + { viewport.showAllHiddenSeqs(); + } } - if(toggleCols) + if (toggleCols) { if (viewport.colSel.getSelected().size() > 0) { viewport.hideSelectedColumns(); - if(!toggleSeqs) - viewport.selectionGroup = sg; + if (!toggleSeqs) + { + viewport.selectionGroup = sg; + } } else if (!hide) + { viewport.showAllHiddenColumns(); + } } break; } case KeyEvent.VK_PAGE_UP: if (viewport.wrapAlignment) + { alignPanel.scrollUp(true); + } else + { alignPanel.setScrollValues(viewport.startRes, viewport.startSeq - viewport.endSeq + viewport.startSeq); + } break; case KeyEvent.VK_PAGE_DOWN: if (viewport.wrapAlignment) + { alignPanel.scrollUp(false); + } else + { alignPanel.setScrollValues(viewport.startRes, viewport.startSeq + viewport.endSeq - viewport.startSeq); + } break; case KeyEvent.VK_Z: @@ -409,18 +441,26 @@ public class AlignFrame extends Frame implements ActionListener, if (evt.isControlDown()) { if (evt.isShiftDown()) + { this.removeAllGapsMenuItem_actionPerformed(); + } else + { removeGappedColumnMenuItem_actionPerformed(); + } } break; case KeyEvent.VK_I: if (evt.isControlDown()) { if (evt.isAltDown()) + { viewport.invertColumnSelection(); + } else + { this.invertSequenceMenuItem_actionPerformed(); + } } break; @@ -429,207 +469,415 @@ public class AlignFrame extends Frame implements ActionListener, { this.deleteGroups_actionPerformed(); } - break; - - case KeyEvent.VK_T: - if (evt.isControlDown()) - { - newView(); - } - break; + break; + case KeyEvent.VK_T: + if (evt.isControlDown()) + { + newView(null); + } + break; - } - alignPanel.repaint(); + } + alignPanel.paintAlignment(true); } + public void keyReleased(KeyEvent evt) {} + public void keyTyped(KeyEvent evt) {} -public void itemStateChanged(ItemEvent evt) - { - if(evt.getSource()==colourTextMenuItem) - colourTextMenuItem_actionPerformed(); - else if(evt.getSource()==wrapMenuItem) - wrapMenuItem_actionPerformed(); - else if(evt.getSource()==scaleAbove) - viewport.setScaleAboveWrapped(scaleAbove.getState()); - else if(evt.getSource()==scaleLeft) - viewport.setScaleLeftWrapped(scaleLeft.getState()); - else if(evt.getSource()==scaleRight) - viewport.setScaleRightWrapped(scaleRight.getState()); - else if(evt.getSource()==seqLimits) + public void itemStateChanged(ItemEvent evt) + { + if (evt.getSource() == colourTextMenuItem) + { + colourTextMenuItem_actionPerformed(); + } + else if (evt.getSource() == wrapMenuItem) + { + wrapMenuItem_actionPerformed(); + } + else if (evt.getSource() == scaleAbove) + { + viewport.setScaleAboveWrapped(scaleAbove.getState()); + } + else if (evt.getSource() == scaleLeft) + { + viewport.setScaleLeftWrapped(scaleLeft.getState()); + } + else if (evt.getSource() == scaleRight) + { + viewport.setScaleRightWrapped(scaleRight.getState()); + } + else if (evt.getSource() == seqLimits) + { seqLimits_itemStateChanged(); - else if(evt.getSource()==viewBoxesMenuItem) - viewport.setShowBoxes(viewBoxesMenuItem.getState()); - else if(evt.getSource()==viewTextMenuItem) - viewport.setShowText(viewTextMenuItem.getState()); - else if(evt.getSource()==renderGapsMenuItem) - viewport.setRenderGaps(renderGapsMenuItem.getState()); - else if(evt.getSource()==annotationPanelMenuItem) + } + else if (evt.getSource() == viewBoxesMenuItem) + { + viewport.setShowBoxes(viewBoxesMenuItem.getState()); + } + else if (evt.getSource() == viewTextMenuItem) + { + viewport.setShowText(viewTextMenuItem.getState()); + } + else if (evt.getSource() == renderGapsMenuItem) + { + viewport.setRenderGaps(renderGapsMenuItem.getState()); + } + else if (evt.getSource() == annotationPanelMenuItem) { viewport.setShowAnnotation(annotationPanelMenuItem.getState()); alignPanel.setAnnotationVisible(annotationPanelMenuItem.getState()); } - else if(evt.getSource()==sequenceFeatures) - { - viewport.showSequenceFeatures(sequenceFeatures.getState()); - alignPanel.seqPanel.seqCanvas.repaint(); - } - else if(evt.getSource()==conservationMenuItem) - conservationMenuItem_actionPerformed(); - else if(evt.getSource()==abovePIDThreshold) - abovePIDThreshold_actionPerformed(); - else if(evt.getSource()==applyToAllGroups) - viewport.setColourAppliesToAllGroups(applyToAllGroups.getState()); - else if(evt.getSource()==autoCalculate) - viewport.autocalculateConsensus = autoCalculate.getState(); - - alignPanel.repaint(); - } - public void actionPerformed(ActionEvent evt) - { + else if (evt.getSource() == sequenceFeatures) + { + viewport.showSequenceFeatures(sequenceFeatures.getState()); + alignPanel.seqPanel.seqCanvas.repaint(); + } + else if (evt.getSource() == conservationMenuItem) + { + conservationMenuItem_actionPerformed(); + } + else if (evt.getSource() == abovePIDThreshold) + { + abovePIDThreshold_actionPerformed(); + } + else if (evt.getSource() == applyToAllGroups) + { + viewport.setColourAppliesToAllGroups(applyToAllGroups.getState()); + } + else if (evt.getSource() == autoCalculate) + { + viewport.autocalculateConsensus = autoCalculate.getState(); + } else if (evt.getSource() == this.centreColumnLabelFlag) + { + centreColumnLabelFlag_stateChanged(); + } + + alignPanel.paintAlignment(true); + } + + private void centreColumnLabelFlag_stateChanged() + { + viewport.centreColumnLabels = centreColumnLabelFlag.getState(); + this.alignPanel.annotationPanel.repaint(); + } + + public void actionPerformed(ActionEvent evt) + { Object source = evt.getSource(); - if(source==inputText) + if (source == inputText) + { inputText_actionPerformed(); - else if(source==loadTree) + } + else if (source == loadTree) + { loadTree_actionPerformed(); - else if(source==loadApplication) + } + else if (source == loadApplication) + { launchFullApplication(); - else if(source==closeMenuItem) + } + else if (source == loadAnnotations) + { + loadAnnotations(); + } + else if (source == outputAnnotations) + { + outputAnnotations(true); + } + else if (source == outputFeatures) + { + outputFeatures(true, "Jalview"); + } + else if (source == closeMenuItem) + { closeMenuItem_actionPerformed(); - else if(source==copy) + } + else if (source == copy) + { copy_actionPerformed(); - else if(source==undoMenuItem) + } + else if (source == undoMenuItem) + { undoMenuItem_actionPerformed(); - else if(source==redoMenuItem) + } + else if (source == redoMenuItem) + { redoMenuItem_actionPerformed(); - else if(source==inputText) - inputText_actionPerformed(); - else if(source==closeMenuItem) - closeMenuItem_actionPerformed(); - else if(source==undoMenuItem) - undoMenuItem_actionPerformed(); - else if(source==redoMenuItem) - redoMenuItem_actionPerformed(); - else if(source==copy) - copy_actionPerformed(); - else if(source==pasteNew) - pasteNew_actionPerformed(); - else if(source==pasteThis) - pasteThis_actionPerformed(); - else if(source==cut) - cut_actionPerformed(); - else if(source==delete) - delete_actionPerformed(); - else if(source==deleteGroups) - deleteGroups_actionPerformed(); - else if(source==selectAllSequenceMenuItem) - selectAllSequenceMenuItem_actionPerformed(); - else if(source==deselectAllSequenceMenuItem) - deselectAllSequenceMenuItem_actionPerformed(); - else if(source==invertSequenceMenuItem) - invertSequenceMenuItem_actionPerformed(); - else if(source==invertColSel) - { viewport.invertColumnSelection(); alignPanel.repaint(); } - else if(source==remove2LeftMenuItem) - trimAlignment(true); - else if(source==remove2RightMenuItem) - trimAlignment(false); - else if(source==removeGappedColumnMenuItem) - removeGappedColumnMenuItem_actionPerformed(); - else if(source==removeAllGapsMenuItem) - removeAllGapsMenuItem_actionPerformed(); - else if(source==findMenuItem) - findMenuItem_actionPerformed(); - else if(source==font) - new FontChooser(alignPanel); + } + else if (source == inputText) + { + inputText_actionPerformed(); + } + else if (source == closeMenuItem) + { + closeMenuItem_actionPerformed(); + } + else if (source == undoMenuItem) + { + undoMenuItem_actionPerformed(); + } + else if (source == redoMenuItem) + { + redoMenuItem_actionPerformed(); + } + else if (source == copy) + { + copy_actionPerformed(); + } + else if (source == pasteNew) + { + pasteNew_actionPerformed(); + } + else if (source == pasteThis) + { + pasteThis_actionPerformed(); + } + else if (source == cut) + { + cut_actionPerformed(); + } + else if (source == delete) + { + delete_actionPerformed(); + } + else if (source == deleteGroups) + { + deleteGroups_actionPerformed(); + } + else if (source == selectAllSequenceMenuItem) + { + selectAllSequenceMenuItem_actionPerformed(); + } + else if (source == deselectAllSequenceMenuItem) + { + deselectAllSequenceMenuItem_actionPerformed(); + } + else if (source == invertSequenceMenuItem) + { + invertSequenceMenuItem_actionPerformed(); + } + else if (source == invertColSel) + { + viewport.invertColumnSelection(); + alignPanel.paintAlignment(true); + } + else if (source == remove2LeftMenuItem) + { + trimAlignment(true); + } + else if (source == remove2RightMenuItem) + { + trimAlignment(false); + } + else if (source == removeGappedColumnMenuItem) + { + removeGappedColumnMenuItem_actionPerformed(); + } + else if (source == removeAllGapsMenuItem) + { + removeAllGapsMenuItem_actionPerformed(); + } + else if (source == findMenuItem) + { + findMenuItem_actionPerformed(); + } + else if (source == font) + { + new FontChooser(alignPanel); + } else if (source == newView) - newView(); - else if(source==showColumns) { - viewport.showAllHiddenColumns(); alignPanel.repaint(); + newView(null); + } + else if (source == showColumns) + { + viewport.showAllHiddenColumns(); + alignPanel.paintAlignment(true); } - else if(source==showSeqs) + else if (source == showSeqs) { viewport.showAllHiddenSeqs(); } - else if(source == hideColumns) + else if (source == hideColumns) { - viewport.hideSelectedColumns(); alignPanel.repaint(); + viewport.hideSelectedColumns(); + alignPanel.paintAlignment(true); } - else if(source == hideSequences && viewport.getSelectionGroup()!=null) + else if (source == hideSequences && viewport.getSelectionGroup() != null) { viewport.hideAllSelectedSeqs(); } - else if(source==featureSettings) - new FeatureSettings(alignPanel); - else if(source==overviewMenuItem) - overviewMenuItem_actionPerformed(); - else if(source==noColourmenuItem) - changeColour(null); - else if(source==clustalColour) + else if (source == featureSettings) + { + new FeatureSettings(alignPanel); + } + else if(source== alProperties) + { + StringBuffer contents = new StringBuffer(); + + float avg = 0; + int min=Integer.MAX_VALUE, max=0; + for(int i=0; imax) + max = size; + if(size0) + if (command.getSize() > 0) { viewport.historyList.push(command); viewport.redoList.removeAllElements(); @@ -776,7 +1110,6 @@ public void itemStateChanged(ItemEvent evt) viewport.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null; } } - /** * DOCUMENT ME! * @@ -784,18 +1117,21 @@ public void itemStateChanged(ItemEvent evt) */ protected void undoMenuItem_actionPerformed() { - if(viewport.historyList.size()<1) + if (viewport.historyList.size() < 1) + { return; + } - CommandI command = (CommandI)viewport.historyList.pop(); + CommandI command = (CommandI) viewport.historyList.pop(); viewport.redoList.push(command); - command.undoCommand(); + command.undoCommand(null); AlignViewport originalSource = getOriginatingSource(command); originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null; updateEditMenuBar(); - originalSource.firePropertyChange("alignment", null,originalSource.alignment.getSequences()); + originalSource.firePropertyChange("alignment", null, + originalSource.alignment.getSequences()); } /** @@ -805,27 +1141,30 @@ public void itemStateChanged(ItemEvent evt) */ protected void redoMenuItem_actionPerformed() { - if(viewport.redoList.size()<1) + if (viewport.redoList.size() < 1) + { return; + } CommandI command = (CommandI) viewport.redoList.pop(); viewport.historyList.push(command); - command.doCommand(); + command.doCommand(null); AlignViewport originalSource = getOriginatingSource(command); - originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns()!=null; + originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null; updateEditMenuBar(); - originalSource.firePropertyChange("alignment", null, originalSource.alignment.getSequences()); + originalSource.firePropertyChange("alignment", null, + originalSource.alignment.getSequences()); } AlignViewport getOriginatingSource(CommandI command) { AlignViewport originalSource = null; //For sequence removal and addition, we need to fire - //the property change event FROM the viewport where the - //original alignment was altered - AlignmentI al = null; + //the property change event FROM the viewport where the + //original alignment was altered + AlignmentI al = null; if (command instanceof EditCommand) { EditCommand editCommand = (EditCommand) command; @@ -850,12 +1189,13 @@ public void itemStateChanged(ItemEvent evt) //The original view is closed, we must validate //the current view against the closed view first if (al != null) + { PaintRefresher.validateSequences(al, viewport.alignment); + } originalSource = viewport; } - return originalSource; } @@ -872,13 +1212,13 @@ public void itemStateChanged(ItemEvent evt) for (int i = 1; i < viewport.alignment.getHeight(); i++) { SequenceI seq = viewport.alignment.getSequenceAt(i); - if (!sg.getSequences(false).contains(seq)) + if (!sg.getSequences(null).contains(seq)) { continue; } SequenceI temp = viewport.alignment.getSequenceAt(i - 1); - if (sg.getSequences(false).contains(temp)) + if (sg.getSequences(null).contains(temp)) { continue; } @@ -892,13 +1232,13 @@ public void itemStateChanged(ItemEvent evt) for (int i = viewport.alignment.getHeight() - 2; i > -1; i--) { SequenceI seq = viewport.alignment.getSequenceAt(i); - if (!sg.getSequences(true).contains(seq)) + if (!sg.getSequences(viewport.hiddenRepSequences).contains(seq)) { continue; } SequenceI temp = viewport.alignment.getSequenceAt(i + 1); - if (sg.getSequences(true).contains(temp)) + if (sg.getSequences(viewport.hiddenRepSequences).contains(temp)) { continue; } @@ -908,7 +1248,96 @@ public void itemStateChanged(ItemEvent evt) } } - alignPanel.repaint(); + alignPanel.paintAlignment(true); + } + + synchronized void slideSequences(boolean right, int size) + { + Vector sg = new Vector(); + if(viewport.cursorMode) + { + sg.addElement(viewport.alignment.getSequenceAt( + alignPanel.seqPanel.seqCanvas.cursorY)); + } + else if(viewport.getSelectionGroup()!=null + && viewport.getSelectionGroup().getSize()!=viewport.alignment.getHeight()) + { + sg = viewport.getSelectionGroup().getSequences( + viewport.hiddenRepSequences); + } + + if(sg.size()<1) + { + return; + } + + Vector invertGroup = new Vector(); + + for (int i = 0; i < viewport.alignment.getHeight(); i++) + { + if(!sg.contains(viewport.alignment.getSequenceAt(i))) + invertGroup.addElement(viewport.alignment.getSequenceAt(i)); + } + + SequenceI[] seqs1 = new SequenceI[sg.size()]; + for (int i = 0; i < sg.size(); i++) + seqs1[i] = (SequenceI) sg.elementAt(i); + + SequenceI[] seqs2 = new SequenceI[invertGroup.size()]; + for (int i = 0; i < invertGroup.size(); i++) + seqs2[i] = (SequenceI) invertGroup.elementAt(i); + + SlideSequencesCommand ssc; + if (right) + ssc = new SlideSequencesCommand("Slide Sequences", + seqs2, seqs1, size, + viewport.getGapCharacter() + ); + else + ssc = new SlideSequencesCommand("Slide Sequences", + seqs1, seqs2, size, + viewport.getGapCharacter() + ); + + int groupAdjustment = 0; + if (ssc.getGapsInsertedBegin() && right) + { + if (viewport.cursorMode) + alignPanel.seqPanel.moveCursor(size, 0); + else + groupAdjustment = size; + } + else if (!ssc.getGapsInsertedBegin() && !right) + { + if (viewport.cursorMode) + alignPanel.seqPanel.moveCursor( -size, 0); + else + groupAdjustment = -size; + } + + if (groupAdjustment != 0) + { + viewport.getSelectionGroup().setStartRes( + viewport.getSelectionGroup().getStartRes() + groupAdjustment); + viewport.getSelectionGroup().setEndRes( + viewport.getSelectionGroup().getEndRes() + groupAdjustment); + } + + + boolean appendHistoryItem = false; + if(viewport.historyList!=null + && viewport.historyList.size()>0 + && viewport.historyList.peek() instanceof SlideSequencesCommand) + { + appendHistoryItem = ssc.appendSlideCommand( + (SlideSequencesCommand)viewport.historyList.peek()) + ; + } + + if(!appendHistoryItem) + addHistoryItem(ssc); + + repaint(); } static StringBuffer copiedSequences; @@ -923,7 +1352,7 @@ public void itemStateChanged(ItemEvent evt) SequenceGroup sg = viewport.getSelectionGroup(); copiedSequences = new StringBuffer(); Hashtable orderedSeqs = new Hashtable(); - for (int i = 0; i < sg.getSize(false); i++) + for (int i = 0; i < sg.getSize(); i++) { SequenceI seq = sg.getSequenceAt(i); int index = viewport.alignment.findIndex(seq); @@ -944,60 +1373,61 @@ public void itemStateChanged(ItemEvent evt) viewport.getColumnSelection().getHiddenColumns().elementAt(i); copiedHiddenColumns.addElement(new int[] - {region[0] - hiddenOffset, - region[1] - hiddenOffset}); + {region[0] - hiddenOffset, + region[1] - hiddenOffset}); } } else + { copiedHiddenColumns = null; + } - - for (int i = 0; i < sg.getSize(false); i++) + for (int i = 0; i < sg.getSize(); i++) { - SequenceI seq = null; + SequenceI seq = null; - while (seq == null) + while (seq == null) + { + if (orderedSeqs.containsKey(index + "")) { - if (orderedSeqs.containsKey(index + "")) - { - seq = (SequenceI) orderedSeqs.get(index + ""); - index++; + seq = (SequenceI) orderedSeqs.get(index + ""); + index++; - break; - } - else - { - index++; - } + break; + } + else + { + index++; } + } - //FIND START RES - //Returns residue following index if gap - startRes = seq.findPosition(sg.getStartRes()); + //FIND START RES + //Returns residue following index if gap + startRes = seq.findPosition(sg.getStartRes()); - //FIND END RES - //Need to find the residue preceeding index if gap - endRes = 0; + //FIND END RES + //Need to find the residue preceeding index if gap + endRes = 0; - for (int j = 0; j < sg.getEndRes()+1 && j < seq.getLength(); j++) + for (int j = 0; j < sg.getEndRes() + 1 && j < seq.getLength(); j++) + { + ch = seq.getCharAt(j); + if (!jalview.util.Comparison.isGap( (ch))) { - ch = seq.getCharAt(j); - if (!jalview.util.Comparison.isGap( (ch))) - { - endRes++; - } + endRes++; } + } - if(endRes>0) - { - endRes += seq.getStart() -1; - } + if (endRes > 0) + { + endRes += seq.getStart() - 1; + } - copiedSequences.append(seq.getName() + "\t" + - startRes + "\t" + - endRes + "\t" + - seq.getSequenceAsString(sg.getStartRes(), - sg.getEndRes() + 1) + "\n"); + copiedSequences.append(seq.getName() + "\t" + + startRes + "\t" + + endRes + "\t" + + seq.getSequenceAsString(sg.getStartRes(), + sg.getEndRes() + 1) + "\n"); } } @@ -1061,30 +1491,12 @@ public void itemStateChanged(ItemEvent evt) } } - jalview.bin.JalviewLite.addFrame(af, newtitle, DEFAULT_WIDTH, DEFAULT_HEIGHT); } else { - for (int i = 0; i < newSeqs.length; i++) - { - viewport.alignment.addSequence(newSeqs[i]); - } - - //!newAlignment - addHistoryItem(new EditCommand( - "Add sequences", - EditCommand.PASTE, - newSeqs, - 0, - viewport.alignment.getWidth(), - viewport.alignment) - ); - - viewport.setEndSeq(viewport.alignment.getHeight()); - viewport.alignment.getWidth(); - viewport.firePropertyChange("alignment", null, viewport.alignment.getSequences()); + addSequences(newSeqs); } } @@ -1093,6 +1505,30 @@ public void itemStateChanged(ItemEvent evt) } + void addSequences(SequenceI[] seqs) + { + for (int i = 0; i < seqs.length; i++) + { + viewport.alignment.addSequence(seqs[i]); + } + + //!newAlignment + addHistoryItem(new EditCommand( + "Add sequences", + EditCommand.PASTE, + seqs, + 0, + viewport.alignment.getWidth(), + viewport.alignment) + ); + + viewport.setEndSeq(viewport.alignment.getHeight()); + viewport.alignment.getWidth(); + viewport.firePropertyChange("alignment", null, + viewport.alignment.getSequences()); + + } + protected void cut_actionPerformed() { copy_actionPerformed(); @@ -1110,56 +1546,54 @@ public void itemStateChanged(ItemEvent evt) Vector seqs = new Vector(); SequenceI seq; - for (int i = 0; i < sg.getSize(false); i++) + for (int i = 0; i < sg.getSize(); i++) { seq = sg.getSequenceAt(i); seqs.addElement(seq); } + // If the cut affects all sequences, remove highlighted columns + if (sg.getSize() == viewport.alignment.getHeight()) + { + viewport.getColumnSelection().removeElements(sg.getStartRes(), + sg.getEndRes() + 1); + } - // If the cut affects all sequences, remove highlighted columns - if (sg.getSize(false) == viewport.alignment.getHeight()) - { - viewport.getColumnSelection().removeElements(sg.getStartRes(), - sg.getEndRes() + 1); - } - - - SequenceI [] cut = new SequenceI[seqs.size()]; - for(int i=0; i 0) { - if(trimLeft) + if (trimLeft) + { column = colSel.getMin(); + } else + { column = colSel.getMax(); + } - SequenceI [] seqs; - if(viewport.getSelectionGroup()!=null) - seqs = viewport.getSelectionGroup().getSequencesAsArray(true); + SequenceI[] seqs; + if (viewport.getSelectionGroup() != null) + { + seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport. + hiddenRepSequences); + } else + { seqs = viewport.alignment.getSequencesArray(); - + } TrimRegionCommand trimRegion; - if(trimLeft) + if (trimLeft) { trimRegion = new TrimRegionCommand("Remove Left", - TrimRegionCommand.TRIM_LEFT, - seqs, - column, - viewport.alignment, - viewport.colSel, - viewport.selectionGroup); + TrimRegionCommand.TRIM_LEFT, + seqs, + column, + viewport.alignment, + viewport.colSel, + viewport.selectionGroup); viewport.setStartRes(0); } - else - { - trimRegion = new TrimRegionCommand("Remove Right", - TrimRegionCommand.TRIM_RIGHT, - seqs, - column, - viewport.alignment, - viewport.colSel, - viewport.selectionGroup); - } - - statusBar.setText("Removed "+trimRegion.getSize()+" columns."); + else + { + trimRegion = new TrimRegionCommand("Remove Right", + TrimRegionCommand.TRIM_RIGHT, + seqs, + column, + viewport.alignment, + viewport.colSel, + viewport.selectionGroup); + } + statusBar.setText("Removed " + trimRegion.getSize() + " columns."); addHistoryItem(trimRegion); @@ -1267,59 +1708,64 @@ public void itemStateChanged(ItemEvent evt) } } - public void removeGappedColumnMenuItem_actionPerformed() { - int start = 0, end = viewport.alignment.getWidth()-1; + int start = 0, end = viewport.alignment.getWidth() - 1; SequenceI[] seqs; if (viewport.getSelectionGroup() != null) { - seqs = viewport.getSelectionGroup().getSequencesAsArray(true); + seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport. + hiddenRepSequences); start = viewport.getSelectionGroup().getStartRes(); end = viewport.getSelectionGroup().getEndRes(); } else + { seqs = viewport.alignment.getSequencesArray(); - + } RemoveGapColCommand removeGapCols = new RemoveGapColCommand("Remove Gapped Columns", seqs, start, end, - viewport.getGapCharacter()); + viewport.alignment); addHistoryItem(removeGapCols); - statusBar.setText("Removed "+removeGapCols.getSize()+" empty columns."); + statusBar.setText("Removed " + removeGapCols.getSize() + " empty columns."); //This is to maintain viewport position on first residue //of first sequence SequenceI seq = viewport.alignment.getSequenceAt(0); int startRes = seq.findPosition(viewport.startRes); - // ShiftList shifts; - // viewport.getAlignment().removeGaps(shifts=new ShiftList()); - // edit.alColumnChanges=shifts.getInverse(); - // if (viewport.hasHiddenColumns) - // viewport.getColumnSelection().compensateForEdits(shifts); - viewport.setStartRes(seq.findIndex(startRes)-1); - viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + // ShiftList shifts; + // viewport.getAlignment().removeGaps(shifts=new ShiftList()); + // edit.alColumnChanges=shifts.getInverse(); + // if (viewport.hasHiddenColumns) + // viewport.getColumnSelection().compensateForEdits(shifts); + viewport.setStartRes(seq.findIndex(startRes) - 1); + viewport.firePropertyChange("alignment", null, + viewport.getAlignment().getSequences()); } public void removeAllGapsMenuItem_actionPerformed() { - int start = 0, end = viewport.alignment.getWidth()-1; + int start = 0, end = viewport.alignment.getWidth() - 1; SequenceI[] seqs; if (viewport.getSelectionGroup() != null) { - seqs = viewport.getSelectionGroup().getSequencesAsArray(true); + seqs = viewport.getSelectionGroup().getSequencesAsArray(viewport. + hiddenRepSequences); start = viewport.getSelectionGroup().getStartRes(); end = viewport.getSelectionGroup().getEndRes(); } else + { seqs = viewport.alignment.getSequencesArray(); + } //This is to maintain viewport position on first residue //of first sequence @@ -1327,13 +1773,14 @@ public void itemStateChanged(ItemEvent evt) int startRes = seq.findPosition(viewport.startRes); addHistoryItem(new RemoveGapsCommand("Remove Gaps", - seqs, - start, end, - viewport.getGapCharacter())); + seqs, + start, end, + viewport.alignment)); - viewport.setStartRes(seq.findIndex(startRes)-1); + viewport.setStartRes(seq.findIndex(startRes) - 1); - viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences()); + viewport.firePropertyChange("alignment", null, + viewport.getAlignment().getSequences()); } @@ -1341,17 +1788,36 @@ public void itemStateChanged(ItemEvent evt) { new Finder(alignPanel); } - - public void newView() + /** + * create a new view derived from the current view + * @param viewtitle + * @return frame for the new view + */ + public AlignFrame newView(String viewtitle) { AlignmentI newal; if (viewport.hasHiddenRows) + { newal = new Alignment(viewport.getAlignment(). getHiddenSequences() .getFullAlignment(). getSequencesArray()); + } else + { newal = new Alignment(viewport.alignment.getSequencesArray()); + } + + if (viewport.alignment.getAlignmentAnnotation() != null) + { + for (int i = 0; i < viewport.alignment.getAlignmentAnnotation().length; i++) + { + if (!viewport.alignment.getAlignmentAnnotation()[i].autoCalculated) + { + newal.addAnnotation(viewport.alignment.getAlignmentAnnotation()[i]); + } + } + } AlignFrame newaf = new AlignFrame(newal, viewport.applet, @@ -1368,41 +1834,92 @@ public void itemStateChanged(ItemEvent evt) PaintRefresher.Register(newaf.alignPanel.seqPanel.seqCanvas, newaf.alignPanel.av.getSequenceSetId()); - Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId()); + Vector comps = (Vector) PaintRefresher.components.get(viewport. + getSequenceSetId()); int viewSize = -1; for (int i = 0; i < comps.size(); i++) { if (comps.elementAt(i) instanceof AlignmentPanel) + { viewSize++; + } } String title = new String(this.getTitle()); - if (title.indexOf("(View") > -1) - title = title.substring(0, title.indexOf("(View")); - - title+= "(View "+viewSize+")"; + if (viewtitle!=null) + { + title = viewtitle+" ( "+title+")"; + } else { + if (title.indexOf("(View") > -1) + { + title = title.substring(0, title.indexOf("(View")); + } + title += "(View " + viewSize + ")"; + } newaf.setTitle(title.toString()); - newaf.viewport.historyList = viewport.historyList; newaf.viewport.redoList = viewport.redoList; - - } - - + return newaf; + } + /** + * + * @return list of feature groups on the view + */ + public String[] getFeatureGroups() + { + FeatureRenderer fr = null; + if (alignPanel!=null && (fr=alignPanel.getFeatureRenderer())!=null) + { + return fr.getGroups(); + } + return null; + } + /** + * get sequence feature groups that are hidden or shown + * @param visible true is visible + * @return list + */ + public String[] getFeatureGroupsOfState(boolean visible) + { + FeatureRenderer fr = null; + if (alignPanel!=null && (fr=alignPanel.getFeatureRenderer())!=null) + { + return fr.getGroups(visible); + } + return null; + } + /** + * Change the display state for the given feature groups + * @param groups list of group strings + * @param state visible or invisible + */ + public void setFeatureGroupState(String[] groups, boolean state) { + FeatureRenderer fr = null; + this.sequenceFeatures.setState(true); + viewport.showSequenceFeatures(true); + if (alignPanel!=null && (fr=alignPanel.getFeatureRenderer())!=null) + { + fr.setGroupState(groups, state); + alignPanel.seqPanel.seqCanvas.repaint(); + if (alignPanel.overviewPanel != null) + { + alignPanel.overviewPanel.updateOverviewImage(); + } + } + } public void seqLimits_itemStateChanged() { viewport.setShowJVSuffix(seqLimits.getState()); alignPanel.fontChanged(); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } - protected void colourTextMenuItem_actionPerformed() { viewport.setColourText(colourTextMenuItem.getState()); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } protected void wrapMenuItem_actionPerformed() @@ -1412,10 +1929,9 @@ public void itemStateChanged(ItemEvent evt) scaleAbove.setEnabled(wrapMenuItem.getState()); scaleLeft.setEnabled(wrapMenuItem.getState()); scaleRight.setEnabled(wrapMenuItem.getState()); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } - public void overviewMenuItem_actionPerformed() { if (alignPanel.overviewPanel != null) @@ -1428,8 +1944,8 @@ public void itemStateChanged(ItemEvent evt) frame.add(overview); // +50 must allow for applet frame window jalview.bin.JalviewLite.addFrame(frame, "Overview " + this.getTitle(), - overview.preferredSize().width, - overview.preferredSize().height + 50); + overview.getPreferredSize().width, + overview.getPreferredSize().height + 50); frame.pack(); frame.addWindowListener(new WindowAdapter() @@ -1444,12 +1960,11 @@ public void itemStateChanged(ItemEvent evt) } - void changeColour(ColourSchemeI cs) { int threshold = 0; - if(cs!=null) + if (cs != null) { if (viewport.getAbovePIDThreshold()) { @@ -1499,14 +2014,16 @@ public void itemStateChanged(ItemEvent evt) { SequenceGroup sg = (SequenceGroup) groups.elementAt(i); - if(cs==null) + if (cs == null) { sg.cs = null; continue; } if (cs instanceof ClustalxColourScheme) { - sg.cs = new ClustalxColourScheme(sg.getSequences(true), sg.getWidth()); + sg.cs = new ClustalxColourScheme( + sg.getSequences(viewport.hiddenRepSequences), + sg.getWidth()); } else { @@ -1526,16 +2043,20 @@ public void itemStateChanged(ItemEvent evt) || cs instanceof Blosum62ColourScheme) { sg.cs.setThreshold(threshold, viewport.getIgnoreGapsConsensus()); - sg.cs.setConsensus(AAFrequency.calculate(sg.getSequences(true), 0, sg.getWidth())); + sg.cs.setConsensus(AAFrequency.calculate( + sg.getSequences(viewport.hiddenRepSequences), 0, sg.getWidth())); } else + { sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus()); + } if (viewport.getConservationSelected()) { Conservation c = new Conservation("Group", ResidueProperties.propHash, 3, - sg.getSequences(true), 0, + sg.getSequences(viewport. + hiddenRepSequences), 0, viewport.alignment.getWidth() - 1); c.calculate(); c.verdict(false, viewport.ConsPercGaps); @@ -1550,20 +2071,20 @@ public void itemStateChanged(ItemEvent evt) } } - if (alignPanel.getOverviewPanel() != null) { alignPanel.getOverviewPanel().updateOverviewImage(); } - alignPanel.repaint(); - } - + jalview.structure.StructureSelectionManager.getStructureSelectionManager() + .sequenceColoursChanged(alignPanel); + alignPanel.paintAlignment(true); + } protected void modifyPID_actionPerformed() { - if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null) + if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme != null) { SliderPanel.setPIDSliderSource(alignPanel, viewport.getGlobalColourScheme(), "Background"); @@ -1573,7 +2094,7 @@ public void itemStateChanged(ItemEvent evt) protected void modifyConservation_actionPerformed() { - if (viewport.getConservationSelected() && viewport.globalColourScheme!=null) + if (viewport.getConservationSelected() && viewport.globalColourScheme != null) { SliderPanel.setConservationSlider(alignPanel, viewport.globalColourScheme, "Background"); @@ -1605,43 +2126,42 @@ public void itemStateChanged(ItemEvent evt) modifyPID_actionPerformed(); } - - public void sortPairwiseMenuItem_actionPerformed() { - SequenceI [] oldOrder = viewport.getAlignment().getSequencesArray(); + SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray(); AlignmentSorter.sortByPID(viewport.getAlignment(), - viewport.getAlignment().getSequenceAt(0)); - addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder, viewport.alignment)); - alignPanel.repaint(); + viewport.getAlignment().getSequenceAt(0), null); + addHistoryItem(new OrderCommand("Pairwise Sort", oldOrder, + viewport.alignment)); + alignPanel.paintAlignment(true); } public void sortIDMenuItem_actionPerformed() { - // addHistoryItem(new HistoryItem("ID Sort", viewport.alignment, - // HistoryItem.SORT)); + // addHistoryItem(new HistoryItem("ID Sort", viewport.alignment, + // HistoryItem.SORT)); AlignmentSorter.sortByID(viewport.getAlignment()); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } public void sortGroupMenuItem_actionPerformed() { - // addHistoryItem(new HistoryItem("Group Sort", viewport.alignment, - // HistoryItem.SORT)); + // addHistoryItem(new HistoryItem("Group Sort", viewport.alignment, + // HistoryItem.SORT)); AlignmentSorter.sortByGroup(viewport.getAlignment()); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } public void removeRedundancyMenuItem_actionPerformed() { - new RedundancyPanel(alignPanel); + new RedundancyPanel(alignPanel); } public void pairwiseAlignmentMenuItem_actionPerformed() { - if (viewport.getSelectionGroup()!=null - && viewport.getSelectionGroup().getSize(false) > 1) + if (viewport.getSelectionGroup() != null + && viewport.getSelectionGroup().getSize() > 1) { Frame frame = new Frame(); frame.add(new PairwiseAlignPanel(alignPanel)); @@ -1667,12 +2187,12 @@ public void itemStateChanged(ItemEvent evt) current.insertCharAt(Width - 1, viewport.getGapCharacter()); } } - alignPanel.repaint(); + alignPanel.paintAlignment(true); } if ( (viewport.getSelectionGroup() != null && - viewport.getSelectionGroup().getSize(false) < 4 && - viewport.getSelectionGroup().getSize(false) > 0) + viewport.getSelectionGroup().getSize() < 4 && + viewport.getSelectionGroup().getSize() > 0) || viewport.getAlignment().getHeight() < 4) { return; @@ -1726,14 +2246,14 @@ public void itemStateChanged(ItemEvent evt) current.insertCharAt(Width - 1, viewport.getGapCharacter()); } } - alignPanel.repaint(); + alignPanel.paintAlignment(true); } if ( (viewport.getSelectionGroup() != null && - viewport.getSelectionGroup().getSize(false) > 1) - || (viewport.getSelectionGroup() == null - && viewport.alignment.getHeight() > 1)) + viewport.getSelectionGroup().getSize() > 1) + || (viewport.getSelectionGroup() == null + && viewport.alignment.getHeight() > 1)) { final TreePanel tp = new TreePanel(viewport, type, @@ -1747,12 +2267,12 @@ public void itemStateChanged(ItemEvent evt) void loadTree_actionPerformed() { - CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this); - cap.setText("Paste your Newick tree file here."); - cap.setTreeImport(); - Frame frame = new Frame(); - frame.add(cap); - jalview.bin.JalviewLite.addFrame(frame, "Paste Newick file ", 400, 300); + CutAndPasteTransfer cap = new CutAndPasteTransfer(true, this); + cap.setText("Paste your Newick tree file here."); + cap.setTreeImport(); + Frame frame = new Frame(); + frame.add(cap); + jalview.bin.JalviewLite.addFrame(frame, "Paste Newick file ", 400, 300); } public void loadTree(jalview.io.NewickFile tree, String treeFile) @@ -1773,10 +2293,10 @@ public void itemStateChanged(ItemEvent evt) { public void actionPerformed(ActionEvent evt) { - // addHistoryItem(new HistoryItem("Sort", viewport.alignment, - // HistoryItem.SORT)); + // addHistoryItem(new HistoryItem("Sort", viewport.alignment, + // HistoryItem.SORT)); AlignmentSorter.sortByTree(viewport.getAlignment(), treePanel.getTree()); - alignPanel.repaint(); + alignPanel.paintAlignment(true); } }); @@ -1797,11 +2317,14 @@ public void itemStateChanged(ItemEvent evt) protected void about_actionPerformed() { - class AboutPanel extends Canvas + class AboutPanel + extends Canvas { String version; public AboutPanel(String version) - { this.version = version; } + { + this.version = version; + } public void paint(Graphics g) { @@ -1813,7 +2336,7 @@ public void itemStateChanged(ItemEvent evt) int y = 5, x = 7; g.setColor(Color.black); g.setFont(new Font("Helvetica", Font.BOLD, 14)); - g.drawString("Jalview - Release "+version, 200, y += fh); + g.drawString("Jalview - Release " + version, 200, y += fh); g.setFont(new Font("Helvetica", Font.PLAIN, 12)); g.drawString("Authors: Michele Clamp, James Cuff, Steve Searle, Andrew Waterhouse, Jim Procter & Geoff Barton.", x, y += fh * 2); @@ -1852,7 +2375,6 @@ public void itemStateChanged(ItemEvent evt) } } - Frame frame = new Frame(); frame.add(new AboutPanel(version)); jalview.bin.JalviewLite.addFrame(frame, "Jalview", 580, 200); @@ -1869,9 +2391,9 @@ public void itemStateChanged(ItemEvent evt) { try { - System.out.println("Show url: "+url); + System.out.println("Show url: " + url); viewport.applet.getAppletContext().showDocument(new java.net.URL(url), - target); + target); } catch (Exception ex) { @@ -1880,266 +2402,271 @@ public void itemStateChanged(ItemEvent evt) } } - ////////////////////////////////////////////////////////////////////////////////// //JBuilder Graphics here - protected MenuBar alignFrameMenuBar = new MenuBar(); - protected Menu fileMenu = new Menu("File"); - protected MenuItem loadApplication = new MenuItem("View in Full Application"); - protected MenuItem loadTree = new MenuItem("Load Associated Tree"); - protected MenuItem closeMenuItem = new MenuItem("Close"); - protected Menu editMenu = new Menu("Edit"); - protected Menu viewMenu = new Menu("View"); - protected Menu colourMenu = new Menu("Colour"); - protected Menu calculateMenu = new Menu("Calculate"); - protected MenuItem selectAllSequenceMenuItem = new MenuItem("Select all"); - protected MenuItem deselectAllSequenceMenuItem = new MenuItem("Deselect All"); - protected MenuItem invertSequenceMenuItem = new MenuItem("Invert Selection"); - protected MenuItem remove2LeftMenuItem = new MenuItem(); - protected MenuItem remove2RightMenuItem = new MenuItem(); - protected MenuItem removeGappedColumnMenuItem = new MenuItem(); - protected MenuItem removeAllGapsMenuItem = new MenuItem(); - protected CheckboxMenuItem viewBoxesMenuItem = new CheckboxMenuItem(); - protected CheckboxMenuItem viewTextMenuItem = new CheckboxMenuItem(); - protected MenuItem sortPairwiseMenuItem = new MenuItem(); - protected MenuItem sortIDMenuItem = new MenuItem(); - protected MenuItem sortGroupMenuItem = new MenuItem(); - protected MenuItem removeRedundancyMenuItem = new MenuItem(); - protected MenuItem pairwiseAlignmentMenuItem = new MenuItem(); - protected MenuItem PCAMenuItem = new MenuItem(); - protected MenuItem averageDistanceTreeMenuItem = new MenuItem(); - protected MenuItem neighbourTreeMenuItem = new MenuItem(); - BorderLayout borderLayout1 = new BorderLayout(); - public Label statusBar = new Label(); - protected Menu outputTextboxMenu = new Menu(); - protected MenuItem clustalColour = new MenuItem(); - protected MenuItem zappoColour = new MenuItem(); - protected MenuItem taylorColour = new MenuItem(); - protected MenuItem hydrophobicityColour = new MenuItem(); - protected MenuItem helixColour = new MenuItem(); - protected MenuItem strandColour = new MenuItem(); - protected MenuItem turnColour = new MenuItem(); - protected MenuItem buriedColour = new MenuItem(); - protected MenuItem userDefinedColour = new MenuItem(); - protected MenuItem PIDColour = new MenuItem(); - protected MenuItem BLOSUM62Colour = new MenuItem(); - MenuItem njTreeBlosumMenuItem = new MenuItem(); - MenuItem avDistanceTreeBlosumMenuItem = new MenuItem(); - protected CheckboxMenuItem annotationPanelMenuItem = new CheckboxMenuItem(); - protected CheckboxMenuItem colourTextMenuItem = new CheckboxMenuItem(); - MenuItem overviewMenuItem = new MenuItem(); - protected MenuItem undoMenuItem = new MenuItem(); - protected MenuItem redoMenuItem = new MenuItem(); - protected CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem(); - MenuItem noColourmenuItem = new MenuItem(); - protected CheckboxMenuItem wrapMenuItem = new CheckboxMenuItem(); - protected CheckboxMenuItem renderGapsMenuItem = new CheckboxMenuItem(); - MenuItem findMenuItem = new MenuItem(); - protected CheckboxMenuItem abovePIDThreshold = new CheckboxMenuItem(); - protected MenuItem nucleotideColour = new MenuItem(); - MenuItem deleteGroups = new MenuItem(); - MenuItem delete = new MenuItem(); - MenuItem copy = new MenuItem(); - MenuItem cut = new MenuItem(); - Menu pasteMenu = new Menu(); - MenuItem pasteNew = new MenuItem(); - MenuItem pasteThis = new MenuItem(); - protected CheckboxMenuItem applyToAllGroups = new CheckboxMenuItem(); - protected MenuItem font = new MenuItem(); - protected CheckboxMenuItem scaleAbove = new CheckboxMenuItem(); - protected CheckboxMenuItem scaleLeft = new CheckboxMenuItem(); - protected CheckboxMenuItem scaleRight = new CheckboxMenuItem(); - MenuItem modifyPID = new MenuItem(); - MenuItem modifyConservation = new MenuItem(); - protected CheckboxMenuItem autoCalculate - = new CheckboxMenuItem("Autocalculate Consensus", true); - protected Menu sortByTreeMenu = new Menu(); - Menu sort = new Menu(); - Menu calculate = new Menu(); - MenuItem inputText = new MenuItem(); - Menu helpMenu = new Menu(); - MenuItem documentation = new MenuItem(); - MenuItem about = new MenuItem(); - protected CheckboxMenuItem seqLimits = new CheckboxMenuItem(); - Panel embeddedMenu; - Label embeddedEdit; - Label embeddedSelect; - Label embeddedView; - Label embeddedFormat; - Label embeddedColour; - Label embeddedFile; - Label embeddedHelp; - Label embeddedCalculate; - FlowLayout flowLayout1; - - private void jbInit() throws Exception { - - setMenuBar(alignFrameMenuBar); - - MenuItem item; - - // dynamically fill save as menu with available formats - for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length; i++) - { + MenuBar alignFrameMenuBar = new MenuBar(); + Menu fileMenu = new Menu("File"); + MenuItem loadApplication = new MenuItem("View in Full Application"); + MenuItem loadTree = new MenuItem("Load Associated Tree ..."); + MenuItem loadAnnotations = new MenuItem( + "Load Features/Annotations ..."); + MenuItem outputFeatures = new MenuItem("Export Features ..."); + MenuItem outputAnnotations = new MenuItem("Export Annotations ..."); + + MenuItem closeMenuItem = new MenuItem("Close"); + Menu editMenu = new Menu("Edit"); + Menu viewMenu = new Menu("View"); + Menu colourMenu = new Menu("Colour"); + Menu calculateMenu = new Menu("Calculate"); + MenuItem selectAllSequenceMenuItem = new MenuItem("Select all"); + MenuItem deselectAllSequenceMenuItem = new MenuItem("Deselect All"); + MenuItem invertSequenceMenuItem = new MenuItem("Invert Selection"); + MenuItem remove2LeftMenuItem = new MenuItem(); + MenuItem remove2RightMenuItem = new MenuItem(); + MenuItem removeGappedColumnMenuItem = new MenuItem(); + MenuItem removeAllGapsMenuItem = new MenuItem(); + CheckboxMenuItem viewBoxesMenuItem = new CheckboxMenuItem(); + CheckboxMenuItem viewTextMenuItem = new CheckboxMenuItem(); + MenuItem sortPairwiseMenuItem = new MenuItem(); + MenuItem sortIDMenuItem = new MenuItem(); + MenuItem sortGroupMenuItem = new MenuItem(); + MenuItem removeRedundancyMenuItem = new MenuItem(); + MenuItem pairwiseAlignmentMenuItem = new MenuItem(); + MenuItem PCAMenuItem = new MenuItem(); + MenuItem averageDistanceTreeMenuItem = new MenuItem(); + MenuItem neighbourTreeMenuItem = new MenuItem(); + BorderLayout borderLayout1 = new BorderLayout(); + public Label statusBar = new Label(); + Menu outputTextboxMenu = new Menu(); + MenuItem clustalColour = new MenuItem(); + MenuItem zappoColour = new MenuItem(); + MenuItem taylorColour = new MenuItem(); + MenuItem hydrophobicityColour = new MenuItem(); + MenuItem helixColour = new MenuItem(); + MenuItem strandColour = new MenuItem(); + MenuItem turnColour = new MenuItem(); + MenuItem buriedColour = new MenuItem(); + MenuItem userDefinedColour = new MenuItem(); + MenuItem PIDColour = new MenuItem(); + MenuItem BLOSUM62Colour = new MenuItem(); + MenuItem njTreeBlosumMenuItem = new MenuItem(); + MenuItem avDistanceTreeBlosumMenuItem = new MenuItem(); + CheckboxMenuItem annotationPanelMenuItem = new CheckboxMenuItem(); + CheckboxMenuItem colourTextMenuItem = new CheckboxMenuItem(); + MenuItem alProperties = new MenuItem("Alignment Properties..."); + MenuItem overviewMenuItem = new MenuItem(); + MenuItem undoMenuItem = new MenuItem(); + MenuItem redoMenuItem = new MenuItem(); + CheckboxMenuItem conservationMenuItem = new CheckboxMenuItem(); + MenuItem noColourmenuItem = new MenuItem(); + CheckboxMenuItem wrapMenuItem = new CheckboxMenuItem(); + CheckboxMenuItem renderGapsMenuItem = new CheckboxMenuItem(); + MenuItem findMenuItem = new MenuItem(); + CheckboxMenuItem abovePIDThreshold = new CheckboxMenuItem(); + MenuItem nucleotideColour = new MenuItem(); + MenuItem deleteGroups = new MenuItem(); + MenuItem delete = new MenuItem(); + MenuItem copy = new MenuItem(); + MenuItem cut = new MenuItem(); + Menu pasteMenu = new Menu(); + MenuItem pasteNew = new MenuItem(); + MenuItem pasteThis = new MenuItem(); + CheckboxMenuItem applyToAllGroups = new CheckboxMenuItem(); + MenuItem font = new MenuItem(); + CheckboxMenuItem scaleAbove = new CheckboxMenuItem(); + CheckboxMenuItem scaleLeft = new CheckboxMenuItem(); + CheckboxMenuItem scaleRight = new CheckboxMenuItem(); + MenuItem modifyPID = new MenuItem(); + MenuItem modifyConservation = new MenuItem(); + CheckboxMenuItem autoCalculate + = new CheckboxMenuItem("Autocalculate Consensus", true); + Menu sortByTreeMenu = new Menu(); + Menu sort = new Menu(); + Menu calculate = new Menu(); + MenuItem inputText = new MenuItem(); + Menu helpMenu = new Menu(); + MenuItem documentation = new MenuItem(); + MenuItem about = new MenuItem(); + CheckboxMenuItem seqLimits = new CheckboxMenuItem(); + CheckboxMenuItem centreColumnLabelFlag = new CheckboxMenuItem(); + + private void jbInit() + throws Exception + { - item = new MenuItem( jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]); + setMenuBar(alignFrameMenuBar); - item.addActionListener(new java.awt.event.ActionListener() - { - public void actionPerformed(ActionEvent e) - { - outputText_actionPerformed(e); - } - }); + MenuItem item; - outputTextboxMenu.add(item); - } - closeMenuItem.addActionListener(this); - loadApplication.addActionListener(this); - - loadTree.addActionListener(this); - selectAllSequenceMenuItem.addActionListener(this); - deselectAllSequenceMenuItem.addActionListener(this); - invertSequenceMenuItem.addActionListener(this); - remove2LeftMenuItem.setLabel("Remove Left"); - remove2LeftMenuItem.addActionListener(this); - remove2RightMenuItem.setLabel("Remove Right"); - remove2RightMenuItem.addActionListener(this); - removeGappedColumnMenuItem.setLabel("Remove Empty Columns"); - removeGappedColumnMenuItem.addActionListener(this); - removeAllGapsMenuItem.setLabel("Remove All Gaps"); - removeAllGapsMenuItem.addActionListener(this); - viewBoxesMenuItem.setLabel("Boxes"); - viewBoxesMenuItem.setState(true); - viewBoxesMenuItem.addItemListener(this); - viewTextMenuItem.setLabel("Text"); - viewTextMenuItem.setState(true); - viewTextMenuItem.addItemListener(this); - sortPairwiseMenuItem.setLabel("by Pairwise Identity"); - sortPairwiseMenuItem.addActionListener(this); - sortIDMenuItem.setLabel("by ID"); - sortIDMenuItem.addActionListener(this); - sortGroupMenuItem.setLabel("by Group"); - sortGroupMenuItem.addActionListener(this); - removeRedundancyMenuItem.setLabel("Remove Redundancy..."); - removeRedundancyMenuItem.addActionListener(this); - pairwiseAlignmentMenuItem.setLabel("Pairwise Alignments..."); - pairwiseAlignmentMenuItem.addActionListener(this); - PCAMenuItem.setLabel("Principal Component Analysis"); - PCAMenuItem.addActionListener(this); - averageDistanceTreeMenuItem.setLabel( - "Average Distance Using % Identity"); - averageDistanceTreeMenuItem.addActionListener(this); - neighbourTreeMenuItem.setLabel("Neighbour Joining Using % Identity"); - neighbourTreeMenuItem.addActionListener(this); - statusBar.setBackground(Color.white); - statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); - statusBar.setText("Status bar"); - outputTextboxMenu.setLabel("Output to Textbox"); - clustalColour.setLabel("Clustalx"); - - clustalColour.addActionListener(this); - zappoColour.setLabel("Zappo"); - zappoColour.addActionListener(this); - taylorColour.setLabel("Taylor"); - taylorColour.addActionListener(this); - hydrophobicityColour.setLabel("Hydrophobicity"); - hydrophobicityColour.addActionListener(this); - helixColour.setLabel("Helix Propensity"); - helixColour.addActionListener(this); - strandColour.setLabel("Strand Propensity"); - strandColour.addActionListener(this); - turnColour.setLabel("Turn Propensity"); - turnColour.addActionListener(this); - buriedColour.setLabel("Buried Index"); - buriedColour.addActionListener(this); - userDefinedColour.setLabel("User Defined..."); - userDefinedColour.addActionListener(this); - PIDColour.setLabel("Percentage Identity"); - PIDColour.addActionListener(this); - BLOSUM62Colour.setLabel("BLOSUM62 Score"); - BLOSUM62Colour.addActionListener(this); - avDistanceTreeBlosumMenuItem.setLabel( - "Average Distance Using BLOSUM62"); - avDistanceTreeBlosumMenuItem.addActionListener(this); - njTreeBlosumMenuItem.setLabel("Neighbour Joining Using BLOSUM62"); - njTreeBlosumMenuItem.addActionListener(this); - annotationPanelMenuItem.setLabel("Show Annotations"); - annotationPanelMenuItem.addItemListener(this); - colourTextMenuItem.setLabel("Colour Text"); - colourTextMenuItem.addItemListener(this); - overviewMenuItem.setLabel("Overview Window"); - overviewMenuItem.addActionListener(this); - undoMenuItem.setEnabled(false); - undoMenuItem.setLabel("Undo"); - undoMenuItem.addActionListener(this); - redoMenuItem.setEnabled(false); - redoMenuItem.setLabel("Redo"); - redoMenuItem.addActionListener(this); - conservationMenuItem.setLabel("by Conservation"); - conservationMenuItem.addItemListener(this); - noColourmenuItem.setLabel("None"); - noColourmenuItem.addActionListener(this); - wrapMenuItem.setLabel("Wrap"); - wrapMenuItem.addItemListener(this); - renderGapsMenuItem.setLabel("Show Gaps"); - renderGapsMenuItem.setState(true); - renderGapsMenuItem.addItemListener(this); - findMenuItem.setLabel("Find..."); - findMenuItem.addActionListener(this); + // dynamically fill save as menu with available formats + for (int i = 0; i < jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS.length; + i++) + { + + item = new MenuItem(jalview.io.AppletFormatAdapter.WRITEABLE_FORMATS[i]); + + item.addActionListener(new java.awt.event.ActionListener() + { + public void actionPerformed(ActionEvent e) + { + outputText_actionPerformed(e); + } + }); + + outputTextboxMenu.add(item); + } + closeMenuItem.addActionListener(this); + loadApplication.addActionListener(this); + + loadTree.addActionListener(this); + loadAnnotations.addActionListener(this); + outputFeatures.addActionListener(this); + outputAnnotations.addActionListener(this); + selectAllSequenceMenuItem.addActionListener(this); + deselectAllSequenceMenuItem.addActionListener(this); + invertSequenceMenuItem.addActionListener(this); + remove2LeftMenuItem.setLabel("Remove Left"); + remove2LeftMenuItem.addActionListener(this); + remove2RightMenuItem.setLabel("Remove Right"); + remove2RightMenuItem.addActionListener(this); + removeGappedColumnMenuItem.setLabel("Remove Empty Columns"); + removeGappedColumnMenuItem.addActionListener(this); + removeAllGapsMenuItem.setLabel("Remove All Gaps"); + removeAllGapsMenuItem.addActionListener(this); + viewBoxesMenuItem.setLabel("Boxes"); + viewBoxesMenuItem.setState(true); + viewBoxesMenuItem.addItemListener(this); + viewTextMenuItem.setLabel("Text"); + viewTextMenuItem.setState(true); + viewTextMenuItem.addItemListener(this); + sortPairwiseMenuItem.setLabel("by Pairwise Identity"); + sortPairwiseMenuItem.addActionListener(this); + sortIDMenuItem.setLabel("by ID"); + sortIDMenuItem.addActionListener(this); + sortGroupMenuItem.setLabel("by Group"); + sortGroupMenuItem.addActionListener(this); + removeRedundancyMenuItem.setLabel("Remove Redundancy..."); + removeRedundancyMenuItem.addActionListener(this); + pairwiseAlignmentMenuItem.setLabel("Pairwise Alignments..."); + pairwiseAlignmentMenuItem.addActionListener(this); + PCAMenuItem.setLabel("Principal Component Analysis"); + PCAMenuItem.addActionListener(this); + averageDistanceTreeMenuItem.setLabel( + "Average Distance Using % Identity"); + averageDistanceTreeMenuItem.addActionListener(this); + neighbourTreeMenuItem.setLabel("Neighbour Joining Using % Identity"); + neighbourTreeMenuItem.addActionListener(this); + statusBar.setBackground(Color.white); + statusBar.setFont(new java.awt.Font("Verdana", 0, 11)); + statusBar.setText("Status bar"); + outputTextboxMenu.setLabel("Output to Textbox"); + clustalColour.setLabel("Clustalx"); + + clustalColour.addActionListener(this); + zappoColour.setLabel("Zappo"); + zappoColour.addActionListener(this); + taylorColour.setLabel("Taylor"); + taylorColour.addActionListener(this); + hydrophobicityColour.setLabel("Hydrophobicity"); + hydrophobicityColour.addActionListener(this); + helixColour.setLabel("Helix Propensity"); + helixColour.addActionListener(this); + strandColour.setLabel("Strand Propensity"); + strandColour.addActionListener(this); + turnColour.setLabel("Turn Propensity"); + turnColour.addActionListener(this); + buriedColour.setLabel("Buried Index"); + buriedColour.addActionListener(this); + userDefinedColour.setLabel("User Defined..."); + userDefinedColour.addActionListener(this); + PIDColour.setLabel("Percentage Identity"); + PIDColour.addActionListener(this); + BLOSUM62Colour.setLabel("BLOSUM62 Score"); + BLOSUM62Colour.addActionListener(this); + avDistanceTreeBlosumMenuItem.setLabel( + "Average Distance Using BLOSUM62"); + avDistanceTreeBlosumMenuItem.addActionListener(this); + njTreeBlosumMenuItem.setLabel("Neighbour Joining Using BLOSUM62"); + njTreeBlosumMenuItem.addActionListener(this); + annotationPanelMenuItem.setLabel("Show Annotations"); + annotationPanelMenuItem.addItemListener(this); + colourTextMenuItem.setLabel("Colour Text"); + colourTextMenuItem.addItemListener(this); + alProperties.addActionListener(this); + overviewMenuItem.setLabel("Overview Window"); + overviewMenuItem.addActionListener(this); + undoMenuItem.setEnabled(false); + undoMenuItem.setLabel("Undo"); + undoMenuItem.addActionListener(this); + redoMenuItem.setEnabled(false); + redoMenuItem.setLabel("Redo"); + redoMenuItem.addActionListener(this); + conservationMenuItem.setLabel("by Conservation"); + conservationMenuItem.addItemListener(this); + noColourmenuItem.setLabel("None"); + noColourmenuItem.addActionListener(this); + wrapMenuItem.setLabel("Wrap"); + wrapMenuItem.addItemListener(this); + renderGapsMenuItem.setLabel("Show Gaps"); + renderGapsMenuItem.setState(true); + renderGapsMenuItem.addItemListener(this); + findMenuItem.setLabel("Find..."); + findMenuItem.addActionListener(this); abovePIDThreshold.setLabel("Above Identity Threshold"); - abovePIDThreshold.addItemListener(this); - nucleotideColour.setLabel("Nucleotide"); - nucleotideColour.addActionListener(this); - deleteGroups.setLabel("Undefine Groups"); - deleteGroups.addActionListener(this); - copy.setLabel("Copy"); - copy.addActionListener(this); - cut.setLabel("Cut"); - cut.addActionListener(this); - delete.setLabel("Delete"); - delete.addActionListener(this); - pasteMenu.setLabel("Paste"); - pasteNew.setLabel("To New Alignment"); - pasteNew.addActionListener(this); - pasteThis.setLabel("Add To This Alignment"); - pasteThis.addActionListener(this); - applyToAllGroups.setLabel("Apply Colour To All Groups"); - applyToAllGroups.setState(true); - applyToAllGroups.addItemListener(this); - font.setLabel("Font..."); - font.addActionListener(this); - scaleAbove.setLabel("Scale Above"); - scaleAbove.setState(true); - scaleAbove.setEnabled(false); - scaleAbove.addItemListener(this); - scaleLeft.setEnabled(false); - scaleLeft.setState(true); - scaleLeft.setLabel("Scale Left"); - scaleLeft.addItemListener(this); - scaleRight.setEnabled(false); - scaleRight.setState(true); - scaleRight.setLabel("Scale Right"); - scaleRight.addItemListener(this); - modifyPID.setLabel("Modify Identity Threshold..."); - modifyPID.addActionListener(this); - modifyConservation.setLabel("Modify Conservation Threshold..."); - modifyConservation.addActionListener(this); - sortByTreeMenu.setLabel("By Tree Order"); - sort.setLabel("Sort"); - calculate.setLabel("Calculate Tree"); - autoCalculate.addItemListener(this); - inputText.setLabel("Input from textbox"); - inputText.addActionListener(this); - - helpMenu.setLabel("Help"); - documentation.setLabel("Documentation"); - documentation.addActionListener(this); - - about.setLabel("About..."); - about.addActionListener(this); - seqLimits.setState(true); + abovePIDThreshold.addItemListener(this); + nucleotideColour.setLabel("Nucleotide"); + nucleotideColour.addActionListener(this); + deleteGroups.setLabel("Undefine Groups"); + deleteGroups.addActionListener(this); + copy.setLabel("Copy"); + copy.addActionListener(this); + cut.setLabel("Cut"); + cut.addActionListener(this); + delete.setLabel("Delete"); + delete.addActionListener(this); + pasteMenu.setLabel("Paste"); + pasteNew.setLabel("To New Alignment"); + pasteNew.addActionListener(this); + pasteThis.setLabel("Add To This Alignment"); + pasteThis.addActionListener(this); + applyToAllGroups.setLabel("Apply Colour To All Groups"); + applyToAllGroups.setState(true); + applyToAllGroups.addItemListener(this); + font.setLabel("Font..."); + font.addActionListener(this); + scaleAbove.setLabel("Scale Above"); + scaleAbove.setState(true); + scaleAbove.setEnabled(false); + scaleAbove.addItemListener(this); + scaleLeft.setEnabled(false); + scaleLeft.setState(true); + scaleLeft.setLabel("Scale Left"); + scaleLeft.addItemListener(this); + scaleRight.setEnabled(false); + scaleRight.setState(true); + scaleRight.setLabel("Scale Right"); + scaleRight.addItemListener(this); + modifyPID.setLabel("Modify Identity Threshold..."); + modifyPID.addActionListener(this); + modifyConservation.setLabel("Modify Conservation Threshold..."); + modifyConservation.addActionListener(this); + sortByTreeMenu.setLabel("By Tree Order"); + sort.setLabel("Sort"); + calculate.setLabel("Calculate Tree"); + autoCalculate.addItemListener(this); + inputText.setLabel("Input from textbox"); + inputText.addActionListener(this); + centreColumnLabelFlag.setLabel("Centre column labels"); + centreColumnLabelFlag.addItemListener(this); + + helpMenu.setLabel("Help"); + documentation.setLabel("Documentation"); + documentation.addActionListener(this); + + about.setLabel("About..."); + about.addActionListener(this); + seqLimits.setState(true); seqLimits.setLabel("Show Sequence Limits"); seqLimits.addItemListener(this); featureSettings.setLabel("Feature Settings..."); @@ -2167,32 +2694,43 @@ public void itemStateChanged(ItemEvent evt) newView.setLabel("New View"); newView.addActionListener(this); alignFrameMenuBar.add(fileMenu); - alignFrameMenuBar.add(editMenu); + alignFrameMenuBar.add(editMenu); alignFrameMenuBar.add(selectMenu); alignFrameMenuBar.add(viewMenu); alignFrameMenuBar.add(formatMenu); alignFrameMenuBar.add(colourMenu); - alignFrameMenuBar.add(calculateMenu); - alignFrameMenuBar.add(helpMenu); - fileMenu.add(inputText); - fileMenu.add(outputTextboxMenu); - if(jalviewServletURL!=null) - fileMenu.add(loadApplication); - fileMenu.addSeparator(); - fileMenu.add(loadTree); - fileMenu.add(closeMenuItem); - editMenu.add(undoMenuItem); - editMenu.add(redoMenuItem); - editMenu.add(cut); - editMenu.add(copy); - editMenu.add(pasteMenu); - editMenu.add(delete); + alignFrameMenuBar.add(calculateMenu); + alignFrameMenuBar.add(helpMenu); + + fileMenu.add(inputText); + fileMenu.add(loadTree); + fileMenu.add(loadAnnotations); + + fileMenu.addSeparator(); + fileMenu.add(outputTextboxMenu); + fileMenu.add(outputFeatures); + fileMenu.add(outputAnnotations); + + if (jalviewServletURL != null) + { + fileMenu.add(loadApplication); + } + + fileMenu.addSeparator(); + fileMenu.add(closeMenuItem); + + editMenu.add(undoMenuItem); + editMenu.add(redoMenuItem); + editMenu.add(cut); + editMenu.add(copy); + editMenu.add(pasteMenu); + editMenu.add(delete); editMenu.addSeparator(); - editMenu.add(remove2LeftMenuItem); - editMenu.add(remove2RightMenuItem); - editMenu.add(removeGappedColumnMenuItem); - editMenu.add(removeAllGapsMenuItem); - editMenu.add(removeRedundancyMenuItem); + editMenu.add(remove2LeftMenuItem); + editMenu.add(remove2RightMenuItem); + editMenu.add(removeGappedColumnMenuItem); + editMenu.add(removeAllGapsMenuItem); + editMenu.add(removeRedundancyMenuItem); viewMenu.add(newView); viewMenu.addSeparator(); viewMenu.add(menu1); @@ -2200,50 +2738,52 @@ public void itemStateChanged(ItemEvent evt) viewMenu.addSeparator(); viewMenu.add(annotationPanelMenuItem); viewMenu.addSeparator(); - viewMenu.add(sequenceFeatures); - viewMenu.add(featureSettings); + viewMenu.add(sequenceFeatures); + viewMenu.add(featureSettings); viewMenu.addSeparator(); - viewMenu.add(overviewMenuItem); - colourMenu.add(applyToAllGroups); - colourMenu.addSeparator(); - colourMenu.add(noColourmenuItem); - colourMenu.add(clustalColour); - colourMenu.add(BLOSUM62Colour); - colourMenu.add(PIDColour); - colourMenu.add(zappoColour); - colourMenu.add(taylorColour); - colourMenu.add(hydrophobicityColour); - colourMenu.add(helixColour); - colourMenu.add(strandColour); - colourMenu.add(turnColour); - colourMenu.add(buriedColour); - colourMenu.add(nucleotideColour); - colourMenu.add(userDefinedColour); - colourMenu.addSeparator(); - colourMenu.add(conservationMenuItem); - colourMenu.add(modifyConservation); - colourMenu.add(abovePIDThreshold); - colourMenu.add(modifyPID); + viewMenu.add(alProperties); + viewMenu.addSeparator(); + viewMenu.add(overviewMenuItem); + colourMenu.add(applyToAllGroups); + colourMenu.addSeparator(); + colourMenu.add(noColourmenuItem); + colourMenu.add(clustalColour); + colourMenu.add(BLOSUM62Colour); + colourMenu.add(PIDColour); + colourMenu.add(zappoColour); + colourMenu.add(taylorColour); + colourMenu.add(hydrophobicityColour); + colourMenu.add(helixColour); + colourMenu.add(strandColour); + colourMenu.add(turnColour); + colourMenu.add(buriedColour); + colourMenu.add(nucleotideColour); + colourMenu.add(userDefinedColour); + colourMenu.addSeparator(); + colourMenu.add(conservationMenuItem); + colourMenu.add(modifyConservation); + colourMenu.add(abovePIDThreshold); + colourMenu.add(modifyPID); colourMenu.add(annotationColour); calculateMenu.add(sort); - calculateMenu.add(calculate); - calculateMenu.addSeparator(); - calculateMenu.add(pairwiseAlignmentMenuItem); - calculateMenu.add(PCAMenuItem); - calculateMenu.add(autoCalculate); - this.add(statusBar, BorderLayout.SOUTH); - pasteMenu.add(pasteNew); - pasteMenu.add(pasteThis); - sort.add(sortIDMenuItem); - sort.add(sortByTreeMenu); - sort.add(sortGroupMenuItem); - sort.add(sortPairwiseMenuItem); - calculate.add(averageDistanceTreeMenuItem); - calculate.add(neighbourTreeMenuItem); - calculate.add(avDistanceTreeBlosumMenuItem); - calculate.add(njTreeBlosumMenuItem); - helpMenu.add(documentation); - helpMenu.add(about); + calculateMenu.add(calculate); + calculateMenu.addSeparator(); + calculateMenu.add(pairwiseAlignmentMenuItem); + calculateMenu.add(PCAMenuItem); + calculateMenu.add(autoCalculate); + this.add(statusBar, BorderLayout.SOUTH); + pasteMenu.add(pasteNew); + pasteMenu.add(pasteThis); + sort.add(sortIDMenuItem); + sort.add(sortByTreeMenu); + sort.add(sortGroupMenuItem); + sort.add(sortPairwiseMenuItem); + calculate.add(averageDistanceTreeMenuItem); + calculate.add(neighbourTreeMenuItem); + calculate.add(avDistanceTreeBlosumMenuItem); + calculate.add(njTreeBlosumMenuItem); + helpMenu.add(documentation); + helpMenu.add(about); menu1.add(showColumns); menu1.add(showSeqs); menu2.add(hideColumns); @@ -2258,6 +2798,7 @@ public void itemStateChanged(ItemEvent evt) formatMenu.add(viewTextMenuItem); formatMenu.add(colourTextMenuItem); formatMenu.add(renderGapsMenuItem); + formatMenu.add(centreColumnLabelFlag); selectMenu.add(findMenuItem); selectMenu.addSeparator(); selectMenu.add(selectAllSequenceMenuItem); @@ -2266,71 +2807,6 @@ public void itemStateChanged(ItemEvent evt) selectMenu.add(invertColSel); selectMenu.add(deleteGroups); } - - public void setEmbedded() - { - - embeddedMenu = new Panel(); - embeddedEdit = new Label("Edit"); - embeddedSelect = new Label("Select"); - embeddedView = new Label("View"); - embeddedFormat = new Label("Format"); - embeddedColour = new Label("Colour"); - embeddedFile = new Label("File"); - embeddedHelp = new Label("Help"); - embeddedCalculate = new Label("Calculate"); - flowLayout1 = new FlowLayout(); - embeddedMenu.setBackground(Color.lightGray); - embeddedMenu.setLayout(flowLayout1); - embeddedEdit.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedSelect.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedView.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedFormat.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedColour.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedFile.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedHelp.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedCalculate.setFont(new java.awt.Font("Arial", Font.PLAIN, 10)); - embeddedMenu.add(embeddedFile); - embeddedMenu.add(embeddedEdit); - embeddedMenu.add(embeddedSelect); - embeddedMenu.add(embeddedView); - embeddedMenu.add(embeddedFormat); - embeddedMenu.add(embeddedColour); - embeddedMenu.add(embeddedCalculate); - embeddedMenu.add(embeddedHelp); - flowLayout1.setAlignment(FlowLayout.LEFT); - flowLayout1.setHgap(2); - flowLayout1.setVgap(0); - embeddedFile.addMouseListener(this); - embeddedEdit.addMouseListener(this); - embeddedSelect.addMouseListener(this); - embeddedView.addMouseListener(this); - embeddedFormat.addMouseListener(this); - embeddedColour.addMouseListener(this); - embeddedCalculate.addMouseListener(this); - embeddedHelp.addMouseListener(this); - - // setVisible(false); - fileMenu.remove(closeMenuItem); - fileMenu.remove(3); // Seperator - - viewport.applet.setLayout(new BorderLayout()); - viewport.applet.add(embeddedMenu, BorderLayout.NORTH); - viewport.applet.add(statusBar, BorderLayout.SOUTH); - // viewport.applet.validate(); - - alignPanel.setSize(viewport.applet.size().width, viewport.applet.size().height - - embeddedMenu.HEIGHT - statusBar.HEIGHT); - - viewport.applet.add(alignPanel, BorderLayout.CENTER); - viewport.applet.validate(); - - } - - - - PopupMenu filePopup, editPopup, searchPopup, - viewPopup, formatPopup, colourPopup, calculatePopup, helpPopup; MenuItem featureSettings = new MenuItem(); CheckboxMenuItem sequenceFeatures = new CheckboxMenuItem(); MenuItem annotationColour = new MenuItem(); @@ -2345,74 +2821,49 @@ public void itemStateChanged(ItemEvent evt) Menu selectMenu = new Menu(); MenuItem newView = new MenuItem(); - public void mousePressed(MouseEvent evt) - { - PopupMenu popup = null; - Label source = (Label)evt.getSource(); - if(source==embeddedFile) - { - popup = filePopup = genPopupMenu(filePopup, fileMenu); - } - else if(source==embeddedEdit) - { - popup = editPopup = genPopupMenu(editPopup, editMenu); - } - else if(source==embeddedSelect) - { - popup = searchPopup = genPopupMenu(searchPopup, selectMenu); - } - else if(source==embeddedView) - { - popup = viewPopup = genPopupMenu(viewPopup, viewMenu); - } - else if (source ==embeddedFormat) - { - popup = formatPopup = genPopupMenu(formatPopup, formatMenu); - } - else if(source==embeddedColour) - { - popup = colourPopup = genPopupMenu(colourPopup, colourMenu); - } - else if(source==embeddedCalculate) - { - popup = calculatePopup = genPopupMenu(calculatePopup, calculateMenu); - } - else if(source==embeddedHelp) - { - popup = helpPopup = genPopupMenu(helpPopup, helpMenu); - } - - embeddedMenu.add(popup); - popup.show(embeddedMenu, - source.getBounds().x, - source.getBounds().y + source.getBounds().getSize().height); - } - - PopupMenu genPopupMenu(PopupMenu popup, Menu original) + /** + * Attach the alignFrame panels after embedding menus, if necessary. + * This used to be called setEmbedded, but is now creates the + * dropdown menus in a platform independent manner + * to avoid OSX/Mac menu appendage daftness. + * + * @param reallyEmbedded true to attach the view to the applet area on the page rather than in a new window + */ + public void createAlignFrameWindow(boolean reallyEmbedded, String title) { - if(popup!=null) - { - return popup; - } - popup = new PopupMenu(); - int m, mSize = original.getItemCount(); - for(m=0; m