import javax.swing.*;\r
import javax.swing.event.*;\r
import java.util.*;\r
-import java.awt.datatransfer.*;\r
+import java.awt.datatransfer.*;\r
\r
\r
public class AlignFrame extends GAlignFrame\r
{\r
final AlignmentPanel alignPanel;\r
final AlignViewport viewport;\r
+ public static final int NEW_WINDOW_WIDTH = 700;\r
+ public static final int NEW_WINDOW_HEIGHT = 500;\r
+\r
public AlignFrame(AlignmentI al)\r
{\r
- super();\r
- viewport = new AlignViewport(al,true,true,true,false);\r
+ try{\r
+ String ip = java.net.InetAddress.getLocalHost().getHostAddress();\r
+ if( !ip.startsWith("10."))\r
+ alignMenu.setVisible(false);\r
+ }\r
+ catch(java.net.UnknownHostException e){}\r
+ viewport = new AlignViewport(al,true,true,false);\r
+\r
+ String fontName = jalview.bin.Cache.getProperty("FONT_NAME");\r
+ String fontStyle= jalview.bin.Cache.getProperty("FONT_STYLE");\r
+ String fontSize = jalview.bin.Cache.getProperty("FONT_SIZE");\r
+ if(fontName!=null && fontStyle!=null && fontSize!=null)\r
+ viewport.setFont( new Font(fontName,Integer.parseInt(fontStyle),Integer.parseInt(fontSize)) );\r
+\r
+ // add conservation graph to alignment\r
+ viewport.updateConservation();\r
+ viewport.updateConsensus();\r
+\r
+\r
alignPanel = new AlignmentPanel(this, viewport);\r
+\r
+ alignPanel.annotationPanel.adjustPanelHeight();\r
+ alignPanel.annotationSpaceFillerHolder.setPreferredSize(alignPanel.annotationPanel.getPreferredSize());\r
+ alignPanel.annotationScroller.setPreferredSize(alignPanel.annotationPanel.getPreferredSize());\r
+\r
getContentPane().add(alignPanel, java.awt.BorderLayout.CENTER);\r
- fontNameMenuItem.setText(viewport.getFont().getName());\r
- fontSizeMenuItem.setText(viewport.getFont().getSize()+"");\r
+\r
\r
addInternalFrameListener(new InternalFrameAdapter()\r
{\r
}\r
});\r
\r
- AlignmentUtil.fetchSequenceFeatures(al, alignPanel);\r
}\r
\r
protected void saveAs_actionPerformed(ActionEvent e)\r
{\r
- JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
+ String suffix [] = null;\r
+ if(e.getActionCommand().equals("FASTA"))\r
+ suffix = new String[]{"fa", "fasta"};\r
+ else if(e.getActionCommand().equals("MSF"))\r
+ suffix = new String[]{"msf"};\r
+ else if(e.getActionCommand().equals("CLUSTAL"))\r
+ suffix = new String[]{"aln"};\r
+ else if(e.getActionCommand().equals("BLC"))\r
+ suffix = new String[]{"blc"};\r
+ else if(e.getActionCommand().equals("PIR"))\r
+ suffix = new String[]{"pir"};\r
+ else if(e.getActionCommand().equals("PFAM"))\r
+ suffix = new String[]{"pfam"};\r
+\r
+\r
+ JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")\r
+ , suffix, e.getActionCommand()+" file");\r
+ chooser.setFileView(new JalviewFileView());\r
chooser.setDialogTitle("Save Alignment to file - "+e.getActionCommand() +" format.");\r
chooser.setToolTipText("Save");\r
int value = chooser.showSaveDialog(this);\r
- if(value == JFileChooser.APPROVE_OPTION)\r
+ if(value == JalviewFileChooser.APPROVE_OPTION)\r
{\r
String choice = chooser.getSelectedFile().getPath();\r
jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);\r
htmlOutput = null;\r
}\r
\r
+ protected void createPNG_actionPerformed(ActionEvent e)\r
+ {\r
+ alignPanel.makePNG();\r
+ }\r
+\r
+ protected void epsFile_actionPerformed(ActionEvent e)\r
+ {\r
+ alignPanel.makeEPS();\r
+ }\r
+\r
+\r
public void printMenuItem_actionPerformed(ActionEvent e)\r
{\r
//Putting in a thread avoids Swing painting problems\r
}catch(Exception ex){}\r
}\r
\r
- ArrayList historyList = new ArrayList();\r
- ArrayList redoList = new ArrayList();\r
+ Stack historyList = new Stack();\r
+ Stack redoList = new Stack();\r
+ JMenuBar jMenuBar1 = new JMenuBar();\r
\r
void updateEditMenuBar()\r
{\r
seq = (SequenceI[]) history[1];\r
viewport.setAlignment( new Alignment(seq) );\r
updateEditMenuBar();\r
- alignPanel.RefreshPanels();\r
+ viewport.updateConsensus();\r
+ alignPanel.repaint();\r
}\r
\r
public void moveSelectedSequences(boolean up)\r
{\r
- SequenceGroup sg = viewport.getRubberbandGroup();\r
+ SequenceGroup sg = viewport.getSelectionGroup();\r
if (sg == null)\r
return;\r
\r
}\r
}\r
\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
\r
\r
protected void copy_actionPerformed(ActionEvent e)\r
{\r
- if(viewport.getRubberbandGroup()==null)\r
+ if(viewport.getSelectionGroup()==null)\r
return;\r
\r
- SequenceGroup sg = viewport.getRubberbandGroup();\r
+ SequenceGroup sg = viewport.getSelectionGroup();\r
\r
Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();\r
StringBuffer buffer= new StringBuffer();\r
\r
protected void pasteThis_actionPerformed(ActionEvent e)\r
{\r
+ addHistoryItem("Paste");\r
paste(false);\r
}\r
\r
SequenceI[] newSeqs = new SequenceI[seqs.size()];\r
seqs.toArray(newSeqs);\r
AlignFrame af = new AlignFrame(new Alignment(newSeqs));\r
- int newHeight = newSeqs.length * af.viewport.getCharHeight() + 200;\r
- if (newHeight > 500)\r
- newHeight = 500;\r
- Desktop.addInternalFrame(af, "Copied sequences", 700, newHeight);\r
+ Desktop.addInternalFrame(af, "Copied sequences", NEW_WINDOW_WIDTH, NEW_WINDOW_HEIGHT);\r
}\r
else\r
{\r
viewport.setEndSeq(viewport.alignment.getHeight());\r
viewport.alignment.getWidth();\r
- alignPanel.RefreshPanels();\r
+ viewport.updateConservation();\r
+ viewport.updateConsensus();\r
+ alignPanel.repaint();\r
}\r
\r
}catch(Exception ex){}// could be anything being pasted in here\r
\r
protected void delete_actionPerformed(ActionEvent e)\r
{\r
- if (viewport.getRubberbandGroup() == null)\r
+ addHistoryItem("Delete");\r
+ if (viewport.getSelectionGroup() == null)\r
return;\r
\r
- SequenceGroup sg = viewport.getRubberbandGroup();\r
+ SequenceGroup sg = viewport.getSelectionGroup();\r
for (int i=0;i < sg.sequences.size(); i++)\r
- viewport.getAlignment().deleteSequence(sg.getSequenceAt(i));\r
+ {\r
+ SequenceI seq = sg.getSequenceAt(i);\r
+ int index = viewport.getAlignment().findIndex(seq);\r
+ seq.deleteChars(sg.getStartRes(), sg.getEndRes()+1);\r
+\r
+ if(seq.getSequence().length()<1)\r
+ viewport.getAlignment().deleteSequence(seq);\r
+ else\r
+ viewport.getAlignment().getSequences().setElementAt(seq, index);\r
+ }\r
\r
+ viewport.setSelectionGroup(null);\r
viewport.alignment.deleteGroup(sg);\r
viewport.resetSeqLimits( alignPanel.seqPanel.seqCanvas.getHeight());\r
if(viewport.getAlignment().getHeight()<1)\r
{\r
this.setClosed(true);\r
}catch(Exception ex){}\r
- alignPanel.RefreshPanels();\r
+ viewport.updateConservation();\r
+ viewport.updateConsensus();\r
+ alignPanel.repaint();\r
\r
}\r
\r
SequenceI[] seq = (SequenceI[]) history[1];\r
viewport.setAlignment( new Alignment(seq) );\r
updateEditMenuBar();\r
- alignPanel.RefreshPanels();\r
+ viewport.updateConsensus();\r
+ alignPanel.repaint();\r
+ alignPanel.repaint();\r
}\r
\r
\r
- public void groupsMenuItem_actionPerformed(ActionEvent e)\r
- {\r
- GroupEditor geditor = new GroupEditor(viewport, alignPanel);\r
- JInternalFrame frame = new JInternalFrame();\r
- frame.setContentPane(geditor);\r
- Desktop.addInternalFrame(frame, "Group editor", 710, 410);\r
- frame.setResizable(false);\r
- }\r
-\r
protected void deleteGroups_actionPerformed(ActionEvent e)\r
{\r
viewport.alignment.deleteAllGroups();\r
- viewport.getSelection().clear();\r
+ viewport.setSelectionGroup(null);\r
\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
\r
\r
public void selectAllSequenceMenuItem_actionPerformed(ActionEvent e)\r
{\r
- Selection sel = viewport.getSelection();\r
+ SequenceGroup sg = new SequenceGroup();\r
for (int i=0; i<viewport.getAlignment().getSequences().size(); i++)\r
- sel.addElement( viewport.getAlignment().getSequenceAt(i));\r
+ sg.addSequence( viewport.getAlignment().getSequenceAt(i));\r
+ sg.setEndRes(viewport.alignment.getWidth());\r
+ viewport.setSelectionGroup(sg);\r
PaintRefresher.Refresh(null);\r
}\r
\r
public void deselectAllSequenceMenuItem_actionPerformed(ActionEvent e)\r
{\r
- viewport.setRubberbandGroup(null);\r
- viewport.getSelection().clear();\r
+ viewport.setSelectionGroup(null);\r
PaintRefresher.Refresh(null);\r
}\r
\r
public void invertSequenceMenuItem_actionPerformed(ActionEvent e)\r
{\r
- Selection sel = viewport.getSelection();\r
+ SequenceGroup sg = viewport.getSelectionGroup();\r
for (int i=0; i<viewport.getAlignment().getSequences().size(); i++)\r
- {\r
- if (sel.contains(viewport.getAlignment().getSequenceAt(i)))\r
- sel.removeElement(viewport.getAlignment().getSequenceAt(i));\r
- else\r
- sel.addElement(viewport.getAlignment().getSequenceAt(i));\r
- }\r
+ sg.addOrRemove (viewport.getAlignment().getSequenceAt(i));\r
+\r
PaintRefresher.Refresh(null);\r
}\r
\r
int min = colSel.getMin();\r
viewport.getAlignment().trimLeft(min);\r
colSel.compensateForEdit(0,min);\r
- alignPanel.RefreshPanels();\r
+\r
+ if(viewport.getSelectionGroup()!=null)\r
+ viewport.getSelectionGroup().adjustForRemoveLeft(min);\r
+\r
+ Vector groups = viewport.alignment.getGroups();\r
+ for(int i=0; i<groups.size(); i++)\r
+ {\r
+ SequenceGroup sg = (SequenceGroup) groups.get(i);\r
+ if(!sg.adjustForRemoveLeft(min))\r
+ viewport.alignment.deleteGroup(sg);\r
+ }\r
+\r
+ alignPanel.repaint();\r
}\r
}\r
\r
if (colSel.size() > 0)\r
{\r
int max = colSel.getMax();\r
- if(max>1)\r
- viewport.getAlignment().trimRight(max);\r
+ viewport.getAlignment().trimRight(max);\r
+ if(viewport.getSelectionGroup()!=null)\r
+ viewport.getSelectionGroup().adjustForRemoveRight(max);\r
+\r
+ Vector groups = viewport.alignment.getGroups();\r
+ for(int i=0; i<groups.size(); i++)\r
+ {\r
+ SequenceGroup sg = (SequenceGroup) groups.get(i);\r
+ if(!sg.adjustForRemoveRight(max))\r
+ viewport.alignment.deleteGroup(sg);\r
+ }\r
+\r
+\r
\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
}\r
{\r
addHistoryItem("delete gapped columns");\r
viewport.getAlignment().removeGaps();\r
- alignPanel.RefreshPanels();\r
+ viewport.updateConservation();\r
+ viewport.updateConsensus();\r
+ alignPanel.repaint();\r
}\r
\r
public void removeAllGapsMenuItem_actionPerformed(ActionEvent e)\r
jSize--;\r
}\r
}\r
-\r
- alignPanel.RefreshPanels();\r
+ viewport.updateConservation();\r
+ viewport.updateConsensus();\r
+ alignPanel.repaint();\r
}\r
\r
public void setGapCharMenuItem_actionPerformed(ActionEvent e)\r
}\r
setGapCharMenuItem.setText("Set gap character to \""+nextChar+"\"");\r
viewport.setGapCharacter(thisChar);\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
public void findMenuItem_actionPerformed(ActionEvent e)\r
{\r
- JOptionPane op = new JOptionPane();\r
- JInternalFrame frame = op.createInternalFrame(this, "Find");\r
+ JInternalFrame frame = new JInternalFrame();\r
Finder finder = new Finder(viewport, alignPanel, frame);\r
- frame.setClosable(true);\r
frame.setContentPane(finder);\r
- frame.setSize(340,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.showInternalInputDialog(this,\r
- "Select font",\r
- "Font selection",\r
- JOptionPane.QUESTION_MESSAGE,\r
- null,fonts\r
- ,fontNameMenuItem.getText()).toString();\r
- if(selection!=null)\r
- {\r
- fontNameMenuItem.setText(selection);\r
- SetFont();\r
- }\r
+ Desktop.addInternalFrame(frame, "Find", 340,110, false);\r
+ frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
\r
}\r
\r
- public void fontSizeMenuItem_actionPerformed(ActionEvent e)\r
+\r
+ public void font_actionPerformed(ActionEvent e)\r
{\r
- String selection = JOptionPane.showInternalInputDialog(this,\r
- "Select font size",\r
- "Font size",\r
- JOptionPane.QUESTION_MESSAGE,\r
- null, new String[]{"1","2","4","6","8","10","12","14","16","18","20"}\r
- ,fontSizeMenuItem.getText()).toString();\r
- if(selection!=null)\r
- {\r
- fontSizeMenuItem.setText(selection);\r
- SetFont();\r
- }\r
+ JInternalFrame frame = new JInternalFrame();\r
+ FontChooser fc = new FontChooser( alignPanel, frame );\r
+ frame.setContentPane(fc);\r
+ Desktop.addInternalFrame(frame, "Change Font", 480,100);\r
+ frame.setLayer(JLayeredPane.PALETTE_LAYER);\r
}\r
\r
- public void fontStyleMenuItem_actionPerformed(ActionEvent e)\r
+ protected void fullSeqId_actionPerformed(ActionEvent e)\r
{\r
- String selection = JOptionPane.showInternalInputDialog(this,\r
- "Select font style",\r
- "Font style",\r
- JOptionPane.QUESTION_MESSAGE,\r
- null, new String[]{"plain", "bold", "italic"}\r
- ,fontStyleMenuItem.getText()).toString();\r
- if(selection!=null)\r
- {\r
- fontStyleMenuItem.setText(selection);\r
- SetFont();\r
- }\r
+ viewport.setShowFullId( fullSeqId.isSelected() );\r
\r
+ alignPanel.idPanel.idCanvas.setPreferredSize( alignPanel.calculateIdWidth() );\r
+ alignPanel.repaint();\r
}\r
\r
protected void colourTextMenuItem_actionPerformed(ActionEvent e)\r
{\r
viewport.setColourText( colourTextMenuItem.isSelected() );\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
- void SetFont()\r
+ protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
{\r
- int style = java.awt.Font.PLAIN;\r
- if(fontStyleMenuItem.getText().equals("bold"))\r
- style = java.awt.Font.BOLD;\r
- else if(fontStyleMenuItem.getText().equals("italic"))\r
- style = java.awt.Font.ITALIC;\r
+ viewport.setWrapAlignment( wrapMenuItem.isSelected() );\r
+ alignPanel.setWrapAlignment( wrapMenuItem.isSelected() );\r
+ scaleAbove.setVisible( wrapMenuItem.isSelected() );\r
+ scaleLeft.setVisible( wrapMenuItem.isSelected() );\r
+ scaleRight.setVisible( wrapMenuItem.isSelected() );\r
+ alignPanel.repaint();\r
+ }\r
\r
- viewport.setFont(new java.awt.Font(fontNameMenuItem.getText(),\r
- style,\r
- Integer.parseInt(fontSizeMenuItem.getText())));\r
- alignPanel.RefreshPanels();\r
+ protected void scaleAbove_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.setScaleAboveWrapped(scaleAbove.isSelected());\r
+ alignPanel.repaint();\r
+ }\r
\r
+ protected void scaleLeft_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.setScaleLeftWrapped(scaleLeft.isSelected());\r
+ alignPanel.repaint();\r
}\r
\r
- protected void wrapMenuItem_actionPerformed(ActionEvent e)\r
+ protected void scaleRight_actionPerformed(ActionEvent e)\r
{\r
- viewport.setWrapAlignment( wrapMenuItem.isSelected() );\r
- alignPanel.setWrapAlignment( wrapMenuItem.isSelected() );\r
+ viewport.setScaleRightWrapped(scaleRight.isSelected());\r
+ alignPanel.repaint();\r
}\r
\r
\r
+\r
public void viewBoxesMenuItem_actionPerformed(ActionEvent e)\r
{\r
viewport.setShowBoxes( viewBoxesMenuItem.isSelected() );\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
public void viewTextMenuItem_actionPerformed(ActionEvent e)\r
{\r
viewport.setShowText( viewTextMenuItem.isSelected() );\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
\r
protected void renderGapsMenuItem_actionPerformed(ActionEvent e)\r
{\r
viewport.setRenderGaps(renderGapsMenuItem.isSelected());\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
public void sequenceFeatures_actionPerformed(ActionEvent evt)\r
{\r
viewport.showSequenceFeatures(sequenceFeatures.isSelected());\r
- alignPanel.RefreshPanels();\r
+ if(viewport.showSequenceFeatures && !((Alignment)viewport.alignment).featuresAdded)\r
+ {\r
+ AlignmentUtil.fetchSequenceFeatures( viewport.alignment , alignPanel);\r
+ ((Alignment)viewport.alignment).featuresAdded = true;\r
+ }\r
+ alignPanel.repaint();\r
}\r
\r
- public void consensusGraphMenuItem_actionPerformed(ActionEvent e)\r
+ public void annotationPanelMenuItem_actionPerformed(ActionEvent e)\r
{\r
- alignPanel.setGraphPanelVisible( consensusGraphMenuItem.isSelected() );\r
+ if(annotationPanelMenuItem.isSelected() && viewport.getWrapAlignment())\r
+ {\r
+ annotationPanelMenuItem.setSelected(false);\r
+ return;\r
+ }\r
+ viewport.setShowAnnotation( annotationPanelMenuItem.isSelected() );\r
+ alignPanel.setAnnotationVisible( annotationPanelMenuItem.isSelected() );\r
}\r
\r
public void overviewMenuItem_actionPerformed(ActionEvent e)\r
\r
protected void noColourmenuItem_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( null );\r
- changeColour();\r
+ changeColour( null );\r
}\r
\r
\r
public void clustalColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme(\r
- new ClustalxColourScheme(viewport.alignment.getSequences(), viewport.alignment.getWidth()));\r
abovePIDThreshold.setSelected(false);\r
- changeColour();\r
+ changeColour(new ClustalxColourScheme(viewport.alignment.getSequences(), viewport.alignment.getWidth()));\r
}\r
\r
public void zappoColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme(new ZappoColourScheme() );\r
- changeColour();\r
+ changeColour(new ZappoColourScheme());\r
}\r
\r
public void taylorColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme(new TaylorColourScheme() );\r
- changeColour();\r
+ changeColour(new TaylorColourScheme());\r
}\r
\r
\r
public void hydrophobicityColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( new HydrophobicColourScheme() );\r
- changeColour();\r
+ changeColour( new HydrophobicColourScheme() );\r
}\r
\r
public void helixColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( new HelixColourScheme() );\r
- changeColour();\r
+ changeColour(new HelixColourScheme() );\r
}\r
\r
\r
public void strandColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme(new StrandColourScheme() );\r
- changeColour();\r
+ changeColour(new StrandColourScheme());\r
}\r
\r
\r
public void turnColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme(new TurnColourScheme() );\r
- changeColour();\r
+ changeColour(new TurnColourScheme());\r
}\r
\r
\r
public void buriedColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( new BuriedColourScheme() );\r
- changeColour();\r
+ changeColour(new BuriedColourScheme() );\r
}\r
\r
public void nucleotideColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( new NucleotideColourScheme() );\r
- changeColour();\r
+ changeColour(new NucleotideColourScheme());\r
}\r
\r
\r
- void changeColour()\r
+ protected void applyToAllGroups_actionPerformed(ActionEvent e)\r
{\r
- if(abovePIDThreshold.isSelected())\r
- abovePIDThreshold_actionPerformed(null);\r
- else if(conservationMenuItem.isSelected())\r
- conservationMenuItem_actionPerformed(null);\r
-\r
- alignPanel.RefreshPanels();\r
+ viewport.setColourAppliesToAllGroups(applyToAllGroups.isSelected());\r
}\r
\r
\r
- protected void conservationMenuItem_actionPerformed(ActionEvent e)\r
+\r
+ void changeColour(ColourSchemeI cs)\r
{\r
- if(abovePIDThreshold.isSelected())\r
- {\r
- abovePIDThreshold.setSelected(false);\r
- Desktop.hidePIDSlider();\r
- }\r
+ int threshold = 0;\r
\r
- viewport.setConservationSelected(conservationMenuItem.isSelected());\r
+ if ( viewport.getAbovePIDThreshold() )\r
+ {\r
+ threshold = SliderPanel.setPIDSliderSource(alignPanel, cs, "Background");\r
\r
- ColourSchemeI oldCs = viewport.getGlobalColourScheme();\r
+ if (cs instanceof ResidueColourScheme)\r
+ ( (ResidueColourScheme) cs).setThreshold(threshold);\r
+ else if (cs instanceof ScoreColourScheme)\r
+ ( (ScoreColourScheme) cs).setThreshold(threshold);\r
\r
- ConservationColourScheme ccs = null;\r
- if (oldCs instanceof ConservationColourScheme)\r
- ccs = (ConservationColourScheme) oldCs;\r
+ viewport.setGlobalColourScheme(cs);\r
+ }\r
+ else if (cs instanceof ResidueColourScheme)\r
+ ( (ResidueColourScheme) cs).setThreshold(0);\r
+ else if (cs instanceof ScoreColourScheme)\r
+ ( (ScoreColourScheme) cs).setThreshold(0);\r
\r
- if (conservationMenuItem.isSelected())\r
- {\r
- Alignment al = (Alignment) viewport.alignment;\r
- Conservation c = new Conservation("All",\r
- ResidueProperties.propHash, 3,\r
- al.getSequences(), 0,\r
- al.getWidth());\r
\r
- c.calculate();\r
- c.verdict(false, 100);\r
\r
- if (ccs != null)\r
- ccs = new ConservationColourScheme(c, ccs.cs);\r
- else\r
- ccs = new ConservationColourScheme(c, oldCs);\r
+ if (viewport.getConservationSelected())\r
+ {\r
+ ConservationColourScheme ccs = null;\r
\r
+ Alignment al = (Alignment) viewport.alignment;\r
+ Conservation c = new Conservation("All",\r
+ ResidueProperties.propHash, 3,\r
+ al.getSequences(), 0,\r
+ al.getWidth() - 1);\r
\r
- int threshold = Desktop.setConservationSliderSource(alignPanel, ccs, "Background");\r
+ c.calculate();\r
+ c.verdict(false, viewport.ConsPercGaps);\r
\r
- ccs.inc = threshold;\r
+ ccs = new ConservationColourScheme(c, cs);\r
\r
- if (ccs.cs instanceof ResidueColourScheme)\r
- ((ResidueColourScheme) ccs.cs).setThreshold(0);\r
- else if (ccs.cs instanceof ScoreColourScheme)\r
- ((ScoreColourScheme)ccs.cs).setThreshold(0);\r
+ // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
+ ccs.setConsensus( viewport.vconsensus );\r
+ viewport.setGlobalColourScheme(ccs);\r
\r
- viewport.setGlobalColourScheme(ccs);\r
+ }\r
+ else\r
+ {\r
+ // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
+ if (cs != null)\r
+ cs.setConsensus(viewport.vconsensus);\r
+ viewport.setGlobalColourScheme(cs);\r
+ }\r
\r
\r
- }\r
- else if (oldCs instanceof ConservationColourScheme)\r
- {\r
- /// ie, if we remove ConservationColourScheme from backgroundColour\r
- oldCs = ccs.cs;\r
- viewport.setGlobalColourScheme(oldCs);\r
- Desktop.hideConservationSlider();\r
- }\r
+ if(viewport.getColourAppliesToAllGroups())\r
+ {\r
+ Vector groups = viewport.alignment.getGroups();\r
+ for(int i=0; i<groups.size(); i++)\r
+ {\r
+ SequenceGroup sg = (SequenceGroup)groups.elementAt(i);\r
+\r
+ if (cs instanceof ClustalxColourScheme)\r
+ {\r
+ sg.cs = new ClustalxColourScheme(sg.sequences, sg.getWidth());\r
+ }\r
+ else\r
+ try\r
+ {\r
+ sg.cs = (ColourSchemeI) cs.getClass().newInstance();\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ ex.printStackTrace();\r
+ sg.cs = cs;\r
+ }\r
+\r
+ if(viewport.getAbovePIDThreshold())\r
+ {\r
+ if (sg.cs instanceof ResidueColourScheme)\r
+ ( (ResidueColourScheme) sg.cs).setThreshold(threshold);\r
+ else if (sg.cs instanceof ScoreColourScheme)\r
+ ( (ScoreColourScheme) sg.cs).setThreshold(threshold);\r
+\r
+ sg.cs.setConsensus( AAFrequency.calculate(sg.sequences, 0, sg.getWidth()) );\r
+ }\r
+\r
+ if( viewport.getConservationSelected() )\r
+ {\r
+ Conservation c = new Conservation("Group",\r
+ ResidueProperties.propHash, 3,\r
+ sg.sequences, 0, viewport.alignment.getWidth()-1);\r
+ c.calculate();\r
+ c.verdict(false, viewport.ConsPercGaps);\r
+ ConservationColourScheme ccs = new ConservationColourScheme(c, sg.cs);\r
+\r
+ // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
+ ccs.setConsensus( AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));\r
+ sg.cs = ccs;\r
+ }\r
+ else\r
+ {\r
+ // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!\r
+ sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0, sg.getWidth()));\r
+ }\r
+\r
+ }\r
+ }\r
+\r
\r
- if(e!=null)\r
- alignPanel.RefreshPanels();\r
+\r
+ alignPanel.repaint();\r
}\r
\r
+ protected void modifyPID_actionPerformed(ActionEvent e)\r
+ {\r
+ if(viewport.getAbovePIDThreshold())\r
+ {\r
+ SliderPanel.setPIDSliderSource(alignPanel, viewport.getGlobalColourScheme(),\r
+ "Background");\r
+ SliderPanel.showPIDSlider();\r
+ }\r
+ }\r
\r
- public void abovePIDThreshold_actionPerformed(ActionEvent e)\r
+ protected void modifyConservation_actionPerformed(ActionEvent e)\r
{\r
- if(conservationMenuItem.isSelected())\r
- conservationMenuItem.setSelected(false);\r
+ if(viewport.getConservationSelected())\r
+ {\r
+ SliderPanel.setConservationSlider(alignPanel, viewport.globalColourScheme,\r
+ "Background");\r
+ SliderPanel.showConservationSlider();\r
+ }\r
+ }\r
\r
- ColourSchemeI oldCs = viewport.getGlobalColourScheme();\r
- int threshold = 0;\r
- if (oldCs instanceof ConservationColourScheme)\r
- {\r
- ConservationColourScheme ccs = (ConservationColourScheme) oldCs;\r
- oldCs = ccs.cs;\r
- }\r
\r
- if(abovePIDThreshold.isSelected())\r
- {\r
- threshold = Desktop.setPIDSliderSource(alignPanel, oldCs, "Background");\r
- Desktop.hideConservationSlider();\r
- }\r
- else\r
- Desktop.hidePIDSlider();\r
+ protected void conservationMenuItem_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.setConservationSelected(conservationMenuItem.isSelected());\r
+\r
+ viewport.setAbovePIDThreshold(false);\r
+ abovePIDThreshold.setSelected(false);\r
+\r
+ ColourSchemeI cs = viewport.getGlobalColourScheme();\r
+ if(cs instanceof ConservationColourScheme )\r
+ changeColour( ((ConservationColourScheme)cs).cs );\r
+ else\r
+ changeColour( cs );\r
\r
- if (oldCs instanceof ResidueColourScheme)\r
- ((ResidueColourScheme) oldCs).setThreshold(threshold);\r
- else if (oldCs instanceof ScoreColourScheme)\r
- ((ScoreColourScheme)oldCs).setThreshold(threshold);\r
+ }\r
+\r
+ // boolean coloursChanging = false;\r
+ public void abovePIDThreshold_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.setAbovePIDThreshold(abovePIDThreshold.isSelected());\r
\r
- viewport.setGlobalColourScheme(oldCs);\r
- if(e!=null)\r
- alignPanel.RefreshPanels();\r
+ conservationMenuItem.setSelected(false);\r
+ viewport.setConservationSelected(false);\r
+\r
+ ColourSchemeI cs = viewport.getGlobalColourScheme();\r
+\r
+ if(cs instanceof ConservationColourScheme )\r
+ changeColour( ((ConservationColourScheme)cs).cs );\r
+ else\r
+ changeColour( cs );\r
}\r
\r
\r
JInternalFrame frame = new JInternalFrame();\r
UserDefinedColours chooser = new UserDefinedColours( frame, alignPanel, null);\r
frame.setContentPane(chooser);\r
- Desktop.addInternalFrame(frame,"User defined colours", 450,540 );\r
- frame.setResizable(false);\r
- frame.setIconifiable(false);\r
- frame.setMaximizable(false);\r
+ Desktop.addInternalFrame(frame,"User defined colours", 450,540, false );\r
}\r
\r
public void PIDColour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( new PIDColourScheme() );\r
- alignPanel.setColourScheme( );\r
+ changeColour( new PIDColourScheme() );\r
}\r
\r
\r
public void BLOSUM62Colour_actionPerformed(ActionEvent e)\r
{\r
- viewport.setGlobalColourScheme( new Blosum62ColourScheme(viewport) );\r
- changeColour();\r
+ changeColour(new Blosum62ColourScheme() );\r
}\r
\r
\r
{\r
addHistoryItem("sort");\r
AlignmentSorter.sortByPID(viewport.getAlignment(), viewport.getAlignment().getSequenceAt(0));\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
public void sortIDMenuItem_actionPerformed(ActionEvent e)\r
{\r
addHistoryItem("sort");\r
AlignmentSorter.sortByID( viewport.getAlignment() );\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
public void sortGroupMenuItem_actionPerformed(ActionEvent e)\r
addHistoryItem("sort");\r
AlignmentSorter.sortByGroup(viewport.getAlignment());\r
AlignmentSorter.sortGroups(viewport.getAlignment());\r
- alignPanel.RefreshPanels();\r
- }\r
-\r
- public void sortTreeOrderMenuItem_actionPerformed(ActionEvent e)\r
- {\r
- addHistoryItem("sort");\r
- if(viewport.getCurrentTree()==null)\r
- return;\r
-\r
- AlignmentSorter.sortByTree(viewport.getAlignment(), viewport.getCurrentTree());\r
- alignPanel.RefreshPanels();\r
+ alignPanel.repaint();\r
}\r
\r
public void removeRedundancyMenuItem_actionPerformed(ActionEvent e)\r
RedundancyPanel sp = new RedundancyPanel(alignPanel);\r
JInternalFrame frame = new JInternalFrame();\r
frame.setContentPane(sp);\r
- Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400, 100);\r
- frame.setMaximizable(false);\r
- frame.setResizable(false);\r
+ Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400, 100, false);\r
\r
}\r
\r
public void pairwiseAlignmentMenuItem_actionPerformed(ActionEvent e)\r
{\r
- if(viewport.getSelection().size()<2)\r
+ if(viewport.getSelectionGroup().getSize()<2)\r
JOptionPane.showInternalMessageDialog(this, "You must select at least 2 sequences.", "Invalid Selection", JOptionPane.WARNING_MESSAGE);\r
else\r
{\r
\r
public void PCAMenuItem_actionPerformed(ActionEvent e)\r
{\r
- if( (viewport.getSelection().size()<4 && viewport.getSelection().size()>0)\r
+\r
+ if( (viewport.getSelectionGroup()!=null && viewport.getSelectionGroup().getSize()<4 && viewport.getSelectionGroup().getSize()>0)\r
|| viewport.getAlignment().getHeight()<4)\r
{\r
JOptionPane.showInternalMessageDialog(this, "Principal component analysis must take\n"\r
return;\r
}\r
\r
- JInternalFrame frame = new javax.swing.JInternalFrame();\r
- TreePanel tp=null;\r
- if (viewport.getSelection() != null && viewport.getSelection().size() > 3)\r
- {\r
- tp = new TreePanel(viewport, viewport.getSelection().asVector(),type, pwType,\r
- viewport.getStartRes(), viewport.getEndRes());\r
- }\r
- else\r
- {\r
- tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
- type, pwType, viewport.getStartRes(),\r
- viewport.getEndRes());\r
- }\r
+ final TreePanel tp;\r
+ if (viewport.getSelectionGroup() != null &&\r
+ viewport.getSelectionGroup().getSize() > 3)\r
+ {\r
+ tp = new TreePanel(viewport, viewport.getSelectionGroup().sequences, type,\r
+ pwType,\r
+ 0, viewport.alignment.getWidth());\r
+ }\r
+ else\r
+ {\r
+ tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
+ type, pwType, 0, viewport.alignment.getWidth());\r
+ }\r
\r
- frame.setContentPane(tp);\r
- Desktop.addInternalFrame(frame, title, 600, 500);\r
+ addTreeMenuItem(tp, title);\r
+\r
+ Desktop.addInternalFrame(tp, title, 600, 500);\r
}\r
\r
+ void addTreeMenuItem(final TreePanel treePanel, String title)\r
+ {\r
+ final JMenuItem item = new JMenuItem(title);\r
+ sortByTreeMenu.add(item);\r
+ item.addActionListener(new java.awt.event.ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent e)\r
+ {\r
+ addHistoryItem("sort");\r
+ AlignmentSorter.sortByTree(viewport.getAlignment(), treePanel.getTree());\r
+ alignPanel.repaint();\r
+ }\r
+ });\r
+\r
+ treePanel.addInternalFrameListener(new javax.swing.event.InternalFrameAdapter()\r
+ {\r
+ public void internalFrameClosed(javax.swing.event.InternalFrameEvent evt)\r
+ {\r
+ sortByTreeMenu.remove(item);\r
+ };\r
+ });\r
\r
+ }\r
\r
\r
public void clustalAlignMenuItem_actionPerformed(ActionEvent e)\r
{\r
- JInternalFrame frame = new JInternalFrame();\r
- ClustalThread ct = new ClustalThread(frame);\r
- Thread t = new Thread(ct);\r
- t.start();\r
- frame.setContentPane(ct);\r
- Desktop.addInternalFrame(frame, title, 300, 80);\r
+ WebserviceInfo info = new WebserviceInfo("Clustal web service",\r
+ "\"Thompson, J.D., Higgins, D.G. and Gibson, T.J. (1994) CLUSTAL W: improving the sensitivity of progressive multiple"+\r
+ " sequence alignment through sequence weighting, position specific gap penalties and weight matrix choice."\r
+ +" Nucleic Acids Research, submitted, June 1994.",\r
+ 450, 150);\r
\r
+ ClustalThread thread = new ClustalThread(info);\r
+ thread.start();\r
}\r
\r
- class ClustalThread extends JPanel implements Runnable\r
- {\r
- Image [] image;\r
- int imageIndex = 0;\r
- boolean webServiceRunning = false;\r
- JInternalFrame frame;\r
- public ClustalThread(JInternalFrame frame)\r
+ class ClustalThread extends Thread\r
{\r
- this.frame = frame;\r
- image = new Image[9];\r
- for(int i=0; i<9; i++)\r
+ WebserviceInfo info;\r
+ public ClustalThread(WebserviceInfo info)\r
+ {this.info = info; }\r
+\r
+ public void run()\r
{\r
- java.net.URL url = getClass().getResource("/dna" + (i+1) + ".gif");\r
- if (url != null)\r
+ info.setStatus(WebserviceInfo.STATE_RUNNING);\r
+ jalview.ws.Jemboss jemboss = new jalview.ws.Jemboss();\r
+ Vector sv = viewport.getAlignment().getSequences();\r
+ SequenceI[] seqs = new SequenceI[sv.size()];\r
+\r
+ int i = 0;\r
+ do\r
+ {\r
+ seqs[i] = (SequenceI) sv.elementAt(i);\r
+ }\r
+ while (++i < sv.size());\r
+\r
+ SequenceI[] alignment = jemboss.clustalW(seqs); // gaps removed within method\r
+ if (alignment != null)\r
+ {\r
+ AlignFrame af = new AlignFrame(new Alignment(alignment));\r
+ Desktop.addInternalFrame(af, title.concat(" - ClustalW Alignment"),\r
+ NEW_WINDOW_WIDTH, NEW_WINDOW_HEIGHT);\r
+ af.clustalColour_actionPerformed(null);\r
+ af.clustalColour.setSelected(true);\r
+ info.setStatus(WebserviceInfo.STATE_STOPPED_OK);\r
+ }\r
+ else\r
{\r
- image[i] = java.awt.Toolkit.getDefaultToolkit().createImage(url);\r
- MediaTracker mt = new MediaTracker(this);\r
- mt.addImage(image[i], i);\r
- try{mt.waitForID(i);}\r
- catch(Exception ex){}\r
+ info.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);\r
+ info.appendProgressText("Problem obtaining clustal alignment");\r
}\r
}\r
- DNATwirler twirler = new DNATwirler();\r
- twirler.start();\r
- webServiceRunning = true;\r
}\r
\r
- class DNATwirler extends Thread\r
+ protected void jpred_actionPerformed(ActionEvent e)\r
+{\r
+\r
+ if (viewport.getSelectionGroup() != null && viewport.getSelectionGroup().getSize()>0)\r
{\r
- public void run()\r
+ // JBPNote UGLY! To prettify, make SequenceGroup and Alignment conform to some common interface!\r
+ SequenceGroup seqs = viewport.getSelectionGroup();\r
+ if (seqs.getSize() == 1 || !viewport.alignment.isAligned())\r
+ {\r
+ JPredClient ct = new JPredClient( (SequenceI)seqs.getSequenceAt(0));\r
+ }\r
+ else\r
{\r
- while(webServiceRunning)\r
+ int sz;\r
+ SequenceI[] msa = new SequenceI[sz=seqs.getSize()];\r
+ for (int i = 0; i < sz; i++)\r
{\r
- try{\r
- Thread.sleep(100);\r
- imageIndex++;\r
- imageIndex %=9;\r
- repaint();\r
- }\r
- catch(Exception ex){}\r
+ msa[i] = (SequenceI) seqs.getSequenceAt(i);\r
}\r
+\r
+ JPredClient ct = new JPredClient(msa);\r
}\r
+\r
}\r
+ else\r
+ {\r
+ Vector seqs = viewport.getAlignment().getSequences();\r
\r
- // JBPNote\r
- // Should check to see if the server settings are valid\r
- // Need visual-delay indication here.\r
- public void run()\r
- {\r
- jalview.ws.Jemboss jemboss = new jalview.ws.Jemboss();\r
- Vector sv = viewport.getAlignment().getSequences();\r
- SequenceI[] seqs = new SequenceI[sv.size()];\r
-\r
- int i = 0;\r
- do\r
- {\r
- seqs[i] = (SequenceI) sv.elementAt(i);\r
- }\r
- while (++i < sv.size());\r
-\r
- SequenceI[] alignment = jemboss.clustalW(seqs); // gaps removed within method\r
-\r
- if (alignment != null)\r
- {\r
- AlignFrame af = new AlignFrame(new Alignment(alignment));\r
- af.clustalColour.setSelected(true);\r
- af.clustalColour_actionPerformed(null);\r
- Desktop.addInternalFrame(af, getTitle().concat(" - ClustalW Alignment"),\r
- 700, 500); // JBPNote - is there a new window geom. property ?\r
- }\r
- else\r
- JOptionPane.showMessageDialog(Desktop.desktop, "Problem obtaining clustal alignment", "Web service error",\r
- JOptionPane.WARNING_MESSAGE);\r
-\r
- webServiceRunning = false;\r
- try{\r
- frame.setClosed(true);\r
- }catch(Exception ex){}\r
- }\r
+ if (seqs.size() == 1 || !viewport.alignment.isAligned())\r
+ {\r
+ JPredClient ct = new JPredClient( (SequenceI)\r
+ seqs.elementAt(0));\r
+ }\r
+ else\r
+ {\r
+ SequenceI[] msa = new SequenceI[seqs.size()];\r
+ for (int i = 0; i < seqs.size(); i++)\r
+ {\r
+ msa[i] = (SequenceI) seqs.elementAt(i);\r
+ }\r
\r
- public void paintComponent(Graphics g)\r
- {\r
- g.setColor(Color.white);\r
- g.fillRect(0,0,getWidth(), getHeight());\r
- if(image!=null)\r
- {\r
- g.drawImage(image[imageIndex],10,10,this);\r
- }\r
- g.setFont(new Font("Arial", Font.BOLD, 12));\r
- g.setColor(Color.black);\r
- g.drawString("Clustal Alignment Web Service running", 30,30);\r
- }\r
+ JPredClient ct = new JPredClient(msa);\r
+ }\r
+\r
+ }\r
}\r
+\r
+ protected void LoadtreeMenuItem_actionPerformed(ActionEvent e) {\r
+ // Pick the tree file\r
+ JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.\r
+ getProperty("LAST_DIRECTORY"));\r
+ chooser.setFileView(new JalviewFileView());\r
+ chooser.setDialogTitle("Select a newick-like tree file");\r
+ chooser.setToolTipText("Load a tree file");\r
+ int value = chooser.showOpenDialog(null);\r
+ if (value == JalviewFileChooser.APPROVE_OPTION)\r
+ {\r
+ String choice = chooser.getSelectedFile().getPath();\r
+ jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);\r
+ TreePanel treepanel = null;\r
+ try\r
+ {\r
+ jalview.io.NewickFile fin = new jalview.io.NewickFile(choice, "File");\r
+ fin.parse();\r
+\r
+ if (fin.getTree() != null)\r
+ {\r
+ TreePanel tp = null;\r
+ tp = new TreePanel(viewport, viewport.getAlignment().getSequences(),\r
+ fin, "FromFile", choice);\r
+ Desktop.addInternalFrame(tp, title, 600, 500);\r
+ addTreeMenuItem(tp, title);\r
+ }\r
+ }\r
+ catch (Exception ex)\r
+ {\r
+ JOptionPane.showMessageDialog(Desktop.desktop,\r
+ "Problem reading tree file",\r
+ ex.getMessage(),\r
+ JOptionPane.WARNING_MESSAGE);\r
+ ex.printStackTrace();\r
+ }\r
+ }\r
+ }\r
+\r
}\r
git://source.jalview.org / jalview.git / blobdiff