\r
protected void htmlMenuItem_actionPerformed(ActionEvent e)\r
{\r
- HTMLOutput htmlOutput = new HTMLOutput(viewport.getAlignment(), alignPanel.seqPanel.getColourScheme());\r
+ HTMLOutput htmlOutput = new HTMLOutput(viewport);\r
htmlOutput = null;\r
}\r
\r
\r
public void setGapCharMenuItem_actionPerformed(ActionEvent e)\r
{\r
- String thisChar = "-";\r
- String nextChar = ".";\r
- if(viewport.getGapCharacter().equals("-"))\r
+ char thisChar = '-';\r
+ char nextChar = '.';\r
+ if(viewport.getGapCharacter()=='-')\r
{\r
- thisChar = ".";\r
- nextChar = "-";\r
+ thisChar = '.';\r
+ nextChar = '-';\r
}\r
setGapCharMenuItem.setText("Set gap character to \""+nextChar+"\"");\r
viewport.setGapCharacter(thisChar);\r
+ alignPanel.RefreshPanels();\r
+ }\r
+\r
+ public void findMenuItem_actionPerformed(ActionEvent e)\r
+ {\r
+ JOptionPane op = new JOptionPane();\r
+ JInternalFrame frame = op.createInternalFrame(this, "Find");\r
+ Finder finder = new Finder(viewport, alignPanel, frame);\r
+ frame.setContentPane(finder);\r
+ frame.setSize(300,110);\r
+ frame.setVisible(true);\r
}\r
\r
\r
+\r
public void fontNameMenuItem_actionPerformed(ActionEvent e)\r
{\r
String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();\r
\r
\r
- String selection = JOptionPane.showInputDialog(this,\r
+ String selection = JOptionPane.showInternalInputDialog(this,\r
"Select font",\r
"Font selection",\r
JOptionPane.QUESTION_MESSAGE,\r
\r
public void fontSizeMenuItem_actionPerformed(ActionEvent e)\r
{\r
- String selection = JOptionPane.showInputDialog(this,\r
+ String selection = JOptionPane.showInternalInputDialog(this,\r
"Select font size",\r
"Font size",\r
JOptionPane.QUESTION_MESSAGE,\r
\r
public void fontStyleMenuItem_actionPerformed(ActionEvent e)\r
{\r
- String selection = JOptionPane.showInputDialog(this,\r
+ String selection = JOptionPane.showInternalInputDialog(this,\r
"Select font style",\r
"Font style",\r
JOptionPane.QUESTION_MESSAGE,\r
\r
protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
{\r
- viewport.setColourText( colourTextMenuItem.isSelected() );\r
- alignPanel.RefreshPanels();\r
+ viewport.setColourText( colourTextMenuItem.isSelected() );\r
+ alignPanel.RefreshPanels();\r
}\r
\r
void SetFont()\r
protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
{\r
viewport.setWrapAlignment( wrapMenuItem.isSelected() );\r
- alignPanel.setWrapAlignment( wrapMenuItem.isSelected() );\r
+ alignPanel.RefreshPanels();\r
}\r
\r
\r
}\r
\r
\r
+ protected void renderGapsMenuItem_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.setRenderGaps(renderGapsMenuItem.isSelected());\r
+ alignPanel.RefreshPanels();\r
+ }\r
+\r
+\r
public void consensusGraphMenuItem_actionPerformed(ActionEvent e)\r
{\r
alignPanel.setGraphPanelVisible( consensusGraphMenuItem.isSelected() );\r
\r
}catch(java.lang.OutOfMemoryError ex)\r
{\r
- JOptionPane.showMessageDialog(this, "Sequence alignment too large to\nproduce overview image!!"\r
+ JOptionPane.showInternalMessageDialog(this, "Sequence alignment too large to\nproduce overview image!!"\r
+"\nTry reducing the font size.",\r
"Out of memory", JOptionPane.WARNING_MESSAGE);\r
}\r
\r
protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme(null, false);\r
+ viewport.setGlobalColourScheme( null );\r
+ alignPanel.setColourScheme();\r
}\r
\r
\r
\r
public void zappoColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new ZappoColourScheme(), conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme(new ZappoColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
public void taylorColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new TaylorColourScheme(),conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme(new TaylorColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
\r
public void hydrophobicityColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new HydrophobicColourScheme(),conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme( new HydrophobicColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
public void helixColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new HelixColourScheme(),conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme( new HelixColourScheme() );\r
+ alignPanel.setColourScheme();\r
}\r
\r
\r
public void strandColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new StrandColourScheme() ,conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme(new StrandColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
\r
public void turnColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new TurnColourScheme() ,conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme(new TurnColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
\r
public void buriedColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new BuriedColourScheme() ,conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme( new BuriedColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
\r
protected void conservationMenuItem_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme ( alignPanel.seqPanel.getColourScheme(),conservationMenuItem.isSelected() );\r
+ viewport.setConservationSelected(conservationMenuItem.isSelected());\r
conservationColourIncMenuItem.setEnabled( conservationMenuItem.isSelected() );\r
+ alignPanel.setColourScheme();\r
}\r
\r
-\r
-\r
public void conservationColourIncMenuItem_actionPerformed(ActionEvent e)\r
{\r
ConservationIncrementPanel cip = new ConservationIncrementPanel(viewport, alignPanel);\r
\r
public void abovePIDColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new PIDColourScheme() ,conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme(new PIDColourScheme());\r
+ alignPanel.setColourScheme( );\r
}\r
\r
\r
public void userDefinedColour_actionPerformed(ActionEvent e)\r
{\r
JInternalFrame frame = new JInternalFrame();\r
- UserDefinedColours chooser = new UserDefinedColours( frame, alignPanel.seqPanel );\r
+ UserDefinedColours chooser = new UserDefinedColours( frame, viewport );\r
frame.setContentPane(chooser);\r
Desktop.addInternalFrame(frame,"User defined colours", 450,540 );\r
frame.setResizable(false);\r
\r
public void PIDColour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new PIDColourScheme(),conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme(new PIDColourScheme() );\r
+ alignPanel.setColourScheme( );\r
}\r
\r
\r
public void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setColourScheme( new Blosum62ColourScheme(viewport) ,conservationMenuItem.isSelected() );\r
+ viewport.setGlobalColourScheme( new Blosum62ColourScheme(viewport) );\r
+ alignPanel.setColourScheme();\r
}\r
\r
\r
\r
protected void schemeKeyMenuItem_actionPerformed(ActionEvent e)\r
{\r
- ColourKey colourKey = new ColourKey( alignPanel.seqPanel.getColourScheme() );\r
+ ColourKey colourKey = new ColourKey( viewport.getGlobalColourScheme() );\r
Desktop.addInternalFrame(colourKey, "Colour scheme key", 400, 320);\r
}\r
\r
public void sortGroupMenuItem_actionPerformed(ActionEvent e)\r
{\r
addHistoryItem("sort");\r
- AlignmentSorter.sortGroups(viewport.getAlignment());\r
+ AlignmentSorter.sortByGroup(viewport.getAlignment());\r
AlignmentSorter.sortGroups(viewport.getAlignment());\r
alignPanel.RefreshPanels();\r
}\r
public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)\r
{\r
if(viewport.getSelection().size()<2)\r
- JOptionPane.showMessageDialog(this, "You must select at least 2 sequences.", "Invalid Selection", JOptionPane.WARNING_MESSAGE);\r
+ JOptionPane.showInternalMessageDialog(this, "You must select at least 2 sequences.", "Invalid Selection", JOptionPane.WARNING_MESSAGE);\r
else\r
{\r
JInternalFrame frame = new JInternalFrame();\r
if( (viewport.getSelection().size()<4 && viewport.getSelection().size()>0)\r
|| viewport.getAlignment().getHeight()<4)\r
{\r
- JOptionPane.showMessageDialog(this, "Principal component analysis must take\n"\r
+ JOptionPane.showInternalMessageDialog(this, "Principal component analysis must take\n"\r
+"at least 4 input sequences.",\r
"Sequence selection insufficient",\r
JOptionPane.WARNING_MESSAGE);\r
Desktop.addInternalFrame(frame, "Principal component analysis", 400, 400);\r
}catch(java.lang.OutOfMemoryError ex)\r
{\r
- JOptionPane.showMessageDialog(this, "Too many sequences selected\nfor Principal Component Analysis!!",\r
+ JOptionPane.showInternalMessageDialog(this, "Too many sequences selected\nfor Principal Component Analysis!!",\r
"Out of memory", JOptionPane.WARNING_MESSAGE);\r
}\r
\r
\r
public void clustalAlignMenuItem_actionPerformed(ActionEvent e)\r
{\r
- JOptionPane.showMessageDialog(this, "Jalview is currently being reengineered"\r
+ JOptionPane.showInternalMessageDialog(this, "Jalview is currently being reengineered"\r
+"\nwithin the Barton Group, Dundee University."\r
+"\nThis will be available as a web service 2005",\r
"Web service", JOptionPane.INFORMATION_MESSAGE);\r
\r
public void pdbTest_actionPerformed(ActionEvent e)\r
{\r
- String reply = JOptionPane.showInputDialog(this, "Enter pdb code", "PDB test viewer", JOptionPane.QUESTION_MESSAGE);\r
+ String reply = JOptionPane.showInternalInputDialog(this, "Enter pdb code", "PDB test viewer", JOptionPane.QUESTION_MESSAGE);\r
\r
String url = "http://www.ebi.ac.uk/cgi-bin/pdbfetch?id=1a4u";\r
if (reply.length()>1)\r
\r
}\r
\r
+\r
+ public void doKeyPressed(KeyEvent evt)\r
+ {\r
+\r
+ System.out.println(evt.getKeyChar());\r
+ if(evt.isControlDown() && evt.getKeyChar()=='f')\r
+ findMenuItem_actionPerformed(null);\r
+\r
+ }\r
+\r
+\r
}\r
git://source.jalview.org / jalview.git / blobdiff