/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
*/\r
package jalview.gui;\r
\r
-import jalview.datamodel.*;\r
-import jalview.jbgui.*;\r
-import jalview.util.Comparison;\r
-import jalview.commands.*;\r
-\r
-import java.awt.event.*;\r
-\r
import java.util.*;\r
\r
-import javax.swing.event.*;\r
-\r
+import java.awt.event.*;\r
import javax.swing.*;\r
+import javax.swing.event.*;\r
\r
+import jalview.commands.*;\r
+import jalview.datamodel.*;\r
+import jalview.jbgui.*;\r
+import jalview.util.*;\r
\r
/**\r
* DOCUMENT ME!\r
* @author $author$\r
* @version $Revision$\r
*/\r
-public class RedundancyPanel extends GSliderPanel implements Runnable\r
+public class RedundancyPanel\r
+ extends GSliderPanel implements Runnable\r
{\r
- AlignFrame af;\r
- AlignmentPanel ap;\r
- Stack historyList = new Stack(); // simpler than synching with alignFrame.\r
- float [] redundancy;\r
- SequenceI [] originalSequences;\r
- JInternalFrame frame;\r
- Vector redundantSeqs;\r
-\r
- /**\r
- * Creates a new RedundancyPanel object.\r
- *\r
- * @param ap DOCUMENT ME!\r
- * @param af DOCUMENT ME!\r
- */\r
- public RedundancyPanel(final AlignmentPanel ap, AlignFrame af)\r
+ AlignFrame af;\r
+ AlignmentPanel ap;\r
+ Stack historyList = new Stack(); // simpler than synching with alignFrame.\r
+ float[] redundancy;\r
+ SequenceI[] originalSequences;\r
+ JInternalFrame frame;\r
+ Vector redundantSeqs;\r
+\r
+ /**\r
+ * Creates a new RedundancyPanel object.\r
+ *\r
+ * @param ap DOCUMENT ME!\r
+ * @param af DOCUMENT ME!\r
+ */\r
+ public RedundancyPanel(final AlignmentPanel ap, AlignFrame af)\r
+ {\r
+ this.ap = ap;\r
+ this.af = af;\r
+ redundantSeqs = new Vector();\r
+\r
+ slider.addChangeListener(new ChangeListener()\r
{\r
- this.ap = ap;\r
- this.af = af;\r
- redundantSeqs = new Vector();\r
-\r
- slider.addChangeListener(new ChangeListener()\r
- {\r
- public void stateChanged(ChangeEvent evt)\r
- {\r
- valueField.setText(slider.getValue() + "");\r
- sliderValueChanged();\r
- }\r
- });\r
-\r
- applyButton.setText("Remove");\r
- allGroupsCheck.setVisible(false);\r
- slider.setMinimum(0);\r
- slider.setMaximum(100);\r
- slider.setValue(100);\r
-\r
- Thread worker = new Thread(this);\r
- worker.start();\r
-\r
- frame = new JInternalFrame();\r
- frame.setContentPane(this);\r
- Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,\r
- 100, false);\r
- frame.addInternalFrameListener(new InternalFrameAdapter()\r
- {\r
- public void internalFrameClosing(InternalFrameEvent evt)\r
- {\r
- ap.idPanel.idCanvas.setHighlighted(null);\r
- }\r
- }\r
- );\r
-\r
+ public void stateChanged(ChangeEvent evt)\r
+ {\r
+ valueField.setText(slider.getValue() + "");\r
+ sliderValueChanged();\r
+ }\r
+ });\r
+\r
+ applyButton.setText("Remove");\r
+ allGroupsCheck.setVisible(false);\r
+ slider.setMinimum(0);\r
+ slider.setMaximum(100);\r
+ slider.setValue(100);\r
+\r
+ Thread worker = new Thread(this);\r
+ worker.start();\r
+\r
+ frame = new JInternalFrame();\r
+ frame.setContentPane(this);\r
+ Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,\r
+ 100, false);\r
+ frame.addInternalFrameListener(new InternalFrameAdapter()\r
+ {\r
+ public void internalFrameClosing(InternalFrameEvent evt)\r
+ {\r
+ ap.idPanel.idCanvas.setHighlighted(null);\r
+ }\r
}\r
+ );\r
+\r
+ }\r
+\r
+ /**\r
+ * This is a copy of remove redundancy in jalivew.datamodel.Alignment\r
+ * except we dont want to remove redundancy, just calculate once\r
+ * so we can use the slider to dynamically hide redundant sequences\r
+ *\r
+ * @param threshold DOCUMENT ME!\r
+ * @param sel DOCUMENT ME!\r
+ *\r
+ * @return DOCUMENT ME!\r
+ */\r
+ public void run()\r
+ {\r
+ JProgressBar progress = new JProgressBar();\r
+ progress.setIndeterminate(true);\r
+ southPanel.add(progress, java.awt.BorderLayout.SOUTH);\r
\r
+ label.setText("Calculating....");\r
\r
- /**\r
- * This is a copy of remove redundancy in jalivew.datamodel.Alignment\r
- * except we dont want to remove redundancy, just calculate once\r
- * so we can use the slider to dynamically hide redundant sequences\r
- *\r
- * @param threshold DOCUMENT ME!\r
- * @param sel DOCUMENT ME!\r
- *\r
- * @return DOCUMENT ME!\r
- */\r
- public void run()\r
+ slider.setVisible(false);\r
+ applyButton.setEnabled(false);\r
+ valueField.setVisible(false);\r
+\r
+ validate();\r
+\r
+ String[] omitHidden = null;\r
+\r
+ SequenceGroup sg = ap.av.getSelectionGroup();\r
+ int height;\r
+\r
+ int start, end;\r
+\r
+ if ( (sg != null) && (sg.getSize() >= 1))\r
{\r
- JProgressBar progress = new JProgressBar();\r
- progress.setIndeterminate(true);\r
- southPanel.add(progress, java.awt.BorderLayout.SOUTH);\r
+ originalSequences = sg.getSequencesInOrder(ap.av.alignment);\r
+ start = sg.getStartRes();\r
+ end = sg.getEndRes();\r
+ }\r
+ else\r
+ {\r
+ originalSequences = ap.av.alignment.getSequencesArray();\r
+ start = 0;\r
+ end = ap.av.alignment.getWidth();\r
+ }\r
\r
- label.setText("Calculating....");\r
+ height = originalSequences.length;\r
\r
- slider.setVisible(false);\r
- applyButton.setEnabled(false);\r
- valueField.setVisible(false);\r
+ redundancy = new float[height];\r
+ for (int i = 0; i < height; i++)\r
+ {\r
+ redundancy[i] = 0f;\r
+ }\r
\r
- validate();\r
+ if (ap.av.hasHiddenColumns)\r
+ {\r
+ omitHidden = ap.av.getViewAsString(sg != null);\r
+ }\r
\r
- String[] omitHidden = null;\r
+ // long start = System.currentTimeMillis();\r
\r
- SequenceGroup sg = ap.av.getSelectionGroup();\r
- int height;\r
+ float pid;\r
+ String seqi, seqj;\r
+ for (int i = 0; i < height; i++)\r
+ {\r
\r
- int start, end;\r
+ for (int j = 0; j < i; j++)\r
+ {\r
+ if (i == j)\r
+ {\r
+ continue;\r
+ }\r
\r
- if ( (sg != null) && (sg.getSize(false) >= 1))\r
+ if (omitHidden == null)\r
{\r
- originalSequences = sg.getSequencesInOrder(ap.av.alignment);\r
- start = sg.getStartRes();\r
- end = sg.getEndRes();\r
+ seqi = originalSequences[i].getSequenceAsString(start, end);\r
+ seqj = originalSequences[j].getSequenceAsString(start, end);\r
}\r
else\r
{\r
- originalSequences = ap.av.alignment.getSequencesArray();\r
- start = 0;\r
- end = ap.av.alignment.getWidth();\r
+ seqi = omitHidden[i];\r
+ seqj = omitHidden[j];\r
}\r
\r
- height = originalSequences.length;\r
+ pid = Comparison.PID(seqi, seqj);\r
\r
- redundancy = new float[height];\r
- for (int i = 0; i < height; i++)\r
+ if (seqj.length() < seqi.length())\r
{\r
- redundancy[i] = 0f;\r
+ redundancy[j] = Math.max(pid, redundancy[j]);\r
}\r
-\r
- if (ap.av.hasHiddenColumns)\r
+ else\r
{\r
- omitHidden = ap.av.getViewAsString(sg!=null);\r
+ redundancy[i] = Math.max(pid, redundancy[i]);\r
}\r
\r
+ }\r
+ }\r
\r
- // long start = System.currentTimeMillis();\r
+ progress.setIndeterminate(false);\r
+ progress.setVisible(false);\r
+ progress = null;\r
\r
- float pid;\r
- String seqi, seqj;\r
- for (int i = 0; i < height; i++)\r
- {\r
+ label.setText("Enter the redundancy threshold");\r
+ slider.setVisible(true);\r
+ applyButton.setEnabled(true);\r
+ valueField.setVisible(true);\r
\r
- for (int j = 0; j < i; j++)\r
- {\r
- if(i==j)\r
- continue;\r
-\r
- if(omitHidden==null)\r
- {\r
- seqi = originalSequences[i].getSequence(start, end);\r
- seqj = originalSequences[j].getSequence(start, end);\r
- }\r
- else\r
- {\r
- seqi = omitHidden[i];\r
- seqj = omitHidden[j];\r
- }\r
-\r
- pid = Comparison.PID( seqi, seqj );\r
-\r
- if(seqj.length() < seqi.length())\r
- redundancy[j] = Math.max(pid, redundancy[j]);\r
- else\r
- redundancy[i] = Math.max(pid, redundancy[i]);\r
-\r
- }\r
- }\r
+ validate();\r
+ // System.out.println((System.currentTimeMillis()-start));\r
+ }\r
+\r
+ void sliderValueChanged()\r
+ {\r
+ if (redundancy == null)\r
+ {\r
+ return;\r
+ }\r
\r
- progress.setIndeterminate(false);\r
- progress.setVisible(false);\r
- progress = null;\r
+ float value = slider.getValue();\r
\r
- label.setText("Enter the redundancy threshold");\r
- slider.setVisible(true);\r
- applyButton.setEnabled(true);\r
- valueField.setVisible(true);\r
+ for (int i = 0; i < redundancy.length; i++)\r
+ {\r
+ if (value > redundancy[i])\r
+ {\r
+ redundantSeqs.remove(originalSequences[i]);\r
+ }\r
+ else if (!redundantSeqs.contains(originalSequences[i]))\r
+ {\r
+ redundantSeqs.add(originalSequences[i]);\r
+ }\r
\r
- validate();\r
- // System.out.println((System.currentTimeMillis()-start));\r
}\r
\r
- void sliderValueChanged()\r
- {\r
- if(redundancy==null)\r
- return;\r
+ ap.idPanel.idCanvas.setHighlighted(redundantSeqs);\r
+ }\r
\r
- float value = slider.getValue();\r
+ /**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @param e DOCUMENT ME!\r
+ */\r
+ public void applyButton_actionPerformed(ActionEvent e)\r
+ {\r
+ Vector del = new Vector();\r
\r
- for(int i=0; i<redundancy.length; i++)\r
- {\r
- if (value > redundancy[i])\r
- redundantSeqs.remove(originalSequences[i]);\r
- else if(!redundantSeqs.contains(originalSequences[i]))\r
- redundantSeqs.add(originalSequences[i]);\r
+ undoButton.setEnabled(true);\r
\r
- }\r
+ float value = slider.getValue();\r
+ SequenceGroup sg = ap.av.getSelectionGroup();\r
\r
- ap.idPanel.idCanvas.setHighlighted(redundantSeqs);\r
+ for (int i = 0; i < redundancy.length; i++)\r
+ {\r
+ if (value <= redundancy[i])\r
+ {\r
+ del.addElement(originalSequences[i]);\r
+ }\r
}\r
\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param e DOCUMENT ME!\r
- */\r
- public void applyButton_actionPerformed(ActionEvent e)\r
+ // This has to be done before the restoreHistoryItem method of alignFrame will\r
+ // actually restore these sequences.\r
+ if (del.size() > 0)\r
{\r
- Vector del = new Vector();\r
-\r
- undoButton.setEnabled(true);\r
-\r
- float value = slider.getValue();\r
- SequenceGroup sg = ap.av.getSelectionGroup();\r
+ SequenceI[] deleted = new SequenceI[del.size()];\r
\r
- for (int i = 0; i < redundancy.length; i++)\r
+ int width = 0;\r
+ for (int i = 0; i < del.size(); i++)\r
+ {\r
+ deleted[i] = (SequenceI) del.elementAt(i);\r
+ if (deleted[i].getLength() > width)\r
{\r
- if (value <= redundancy[i])\r
- {\r
- del.addElement(originalSequences[i]);\r
- }\r
+ width = deleted[i].getLength();\r
}\r
+ }\r
\r
- // This has to be done before the restoreHistoryItem method of alignFrame will\r
- // actually restore these sequences.\r
- if (del.size() > 0)\r
+ EditCommand cut = new EditCommand("Remove Redundancy",\r
+ EditCommand.CUT, deleted, 0, width,\r
+ ap.av.alignment);\r
+\r
+ for (int i = 0; i < del.size(); i++)\r
+ {\r
+ ap.av.alignment.deleteSequence(deleted[i]);\r
+ PaintRefresher.Refresh(this,\r
+ ap.av.getSequenceSetId(),\r
+ true,\r
+ true);\r
+ if (sg != null)\r
{\r
- SequenceI [] deleted = new SequenceI[del.size()];\r
-\r
- int width = 0;\r
- for (int i = 0; i < del.size(); i++)\r
- {\r
- deleted[i] = (SequenceI)del.elementAt(i);\r
- if(deleted[i].getLength()>width)\r
- width = deleted[i].getLength();\r
- }\r
-\r
- EditCommand cut = new EditCommand("Remove Redundancy",\r
- EditCommand.CUT, deleted,0,width,ap.av.alignment);\r
-\r
- for (int i = 0; i < del.size(); i++)\r
- {\r
- ap.av.alignment.deleteSequence( deleted[i] );\r
- PaintRefresher.Refresh(this,\r
- ap.av.getSequenceSetId(),\r
- deleted[i], null);\r
- if (sg != null)\r
- {\r
- sg.deleteSequence(deleted[i], false);\r
- }\r
- }\r
-\r
- historyList.push(cut);\r
-\r
- ap.alignFrame.addHistoryItem(cut);\r
-\r
- ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences());\r
+ sg.deleteSequence(deleted[i], false);\r
}\r
+ }\r
\r
+ historyList.push(cut);\r
\r
+ ap.alignFrame.addHistoryItem(cut);\r
+\r
+ ap.av.firePropertyChange("alignment", null,\r
+ ap.av.getAlignment().getSequences());\r
}\r
\r
+ }\r
\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param e DOCUMENT ME!\r
- */\r
- public void undoButton_actionPerformed(ActionEvent e)\r
- {\r
- CommandI command = (CommandI) historyList.pop();\r
- command.undoCommand();\r
+ /**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @param e DOCUMENT ME!\r
+ */\r
+ public void undoButton_actionPerformed(ActionEvent e)\r
+ {\r
+ CommandI command = (CommandI) historyList.pop();\r
+ command.undoCommand();\r
\r
- if (af.historyList.contains(command))\r
- {\r
- af.historyList.remove(command);\r
- af.updateEditMenuBar();\r
- }\r
+ if (ap.av.historyList.contains(command))\r
+ {\r
+ ap.av.historyList.remove(command);\r
+ af.updateEditMenuBar();\r
+ }\r
\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
\r
- if (historyList.size() == 0)\r
- {\r
- undoButton.setEnabled(false);\r
- }\r
+ if (historyList.size() == 0)\r
+ {\r
+ undoButton.setEnabled(false);\r
}\r
-\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param e DOCUMENT ME!\r
- */\r
- public void valueField_actionPerformed(ActionEvent e)\r
+ }\r
+\r
+ /**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @param e DOCUMENT ME!\r
+ */\r
+ public void valueField_actionPerformed(ActionEvent e)\r
+ {\r
+ try\r
{\r
- try\r
- {\r
- int i = Integer.parseInt(valueField.getText());\r
- slider.setValue(i);\r
- }\r
- catch (Exception ex)\r
- {\r
- valueField.setText(slider.getValue() + "");\r
- }\r
+ int i = Integer.parseInt(valueField.getText());\r
+ slider.setValue(i);\r
}\r
-\r
+ catch (Exception ex)\r
+ {\r
+ valueField.setText(slider.getValue() + "");\r
+ }\r
+ }\r
\r
}\r
git://source.jalview.org / jalview.git / blobdiff