import java.awt.dnd.*;\r
import org.biojava.dasobert.eventmodel.*;\r
\r
-\r
/**\r
* DOCUMENT ME!\r
*\r
*/\r
public AlignFrame(AlignmentI al)\r
{\r
+\r
viewport = new AlignViewport(al);\r
\r
this.setDropTarget(new java.awt.dnd.DropTarget(this, this));\r
\r
if (viewport.hasHiddenColumns)\r
{\r
- // System.out.println("PROMPT USER HERE");\r
- // omitHidden = viewport.getSelectionAsString();\r
+ int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,\r
+ "The Alignment contains hidden columns."\r
+ + "\nDo you want to save only the visible alignment?",\r
+ "Save / Omit Hidden Columns",\r
+ JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);\r
+\r
+ if (reply == JOptionPane.YES_OPTION)\r
+ omitHidden = viewport.getViewAsString(false);\r
}\r
\r
String output = new FormatAdapter().formatSequences(\r
format,\r
viewport.alignment.getSequencesArray(),\r
- null);\r
- //viewport.getSelectionAsNewSequence(),\r
- //omitHidden) ;\r
-\r
+ omitHidden);\r
\r
if (output == null)\r
{\r
*/\r
protected void outputText_actionPerformed(ActionEvent e)\r
{\r
- CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
- Desktop.addInternalFrame(cap,\r
- "Alignment output - " + e.getActionCommand(), 600,\r
- 500);\r
-\r
-\r
String [] omitHidden = null;\r
\r
if(viewport.hasHiddenColumns)\r
{\r
- // System.out.println("PROMPT USER HERE");\r
- // omitHidden = viewport.getSelectionAsString();\r
+ int reply = JOptionPane.showInternalConfirmDialog(Desktop.desktop,\r
+ "The Alignment contains hidden columns."\r
+ +"\nDo you want to output only the visible alignment?",\r
+ "Save / Omit Hidden Columns",\r
+ JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);\r
+\r
+ if(reply==JOptionPane.YES_OPTION)\r
+ {\r
+ omitHidden = viewport.getViewAsString(false);\r
+ }\r
}\r
\r
+ CutAndPasteTransfer cap = new CutAndPasteTransfer();\r
+ Desktop.addInternalFrame(cap,\r
+ "Alignment output - " + e.getActionCommand(), 600,\r
+ 500);\r
+\r
+\r
cap.setText(new FormatAdapter().formatSequences(\r
e.getActionCommand(),\r
- viewport.getSelectionAsNewSequence(),\r
+ viewport.alignment.getSequencesArray(),\r
omitHidden));\r
}\r
\r
new AnnotationExporter().exportFeatures(alignPanel);\r
}\r
\r
+\r
public void exportAnnotations_actionPerformed(ActionEvent e)\r
{\r
new AnnotationExporter().exportAnnotations(\r
\r
if (viewport.hasHiddenColumns)\r
{\r
- omitHidden = viewport.getSelectionAsString();\r
+ omitHidden = viewport.getViewAsString(true);\r
}\r
\r
String output = new FormatAdapter().formatSequences(\r
String format = new IdentifyFile().Identify(str, "Paste");\r
SequenceI[] sequences;\r
\r
+\r
if(Desktop.jalviewClipboard!=null)\r
{\r
// The clipboard was filled from within Jalview, we must use the sequences\r
\r
if (newAlignment)\r
{\r
+ System.out.println(format +" 2");\r
alignment = new Alignment(sequences);\r
\r
if(Desktop.jalviewClipboard!=null)\r
alignment.setDataset( (Alignment)Desktop.jalviewClipboard[1] );\r
else\r
alignment.setDataset( null );\r
+\r
}\r
else\r
{\r
+ System.out.println(format +" 24");\r
alignment = viewport.getAlignment();\r
\r
//!newAlignment\r
for (int i = 0; i < sequences.length; i++)\r
{\r
-\r
Sequence newseq = new Sequence(sequences[i].getName(),\r
sequences[i].getSequence(), sequences[i].getStart(),\r
sequences[i].getEnd());\r
\r
alignment.addSequence(newseq);\r
}\r
+\r
+\r
viewport.setEndSeq(alignment.getHeight());\r
alignment.getWidth();\r
viewport.firePropertyChange("alignment", null, alignment.getSequences());\r
}\r
\r
+\r
+\r
+\r
+\r
// Add any annotations attached to sequences\r
for (int i = 0; i < sequences.length; i++)\r
{\r
for(int i=0; i<hc.size(); i++)\r
{\r
int [] region = (int[]) hc.elementAt(i);\r
- for(int j=region[0]; j<region[1]+1; j++)\r
- af.viewport.getColumnSelection().addElement(j);\r
- af.viewport.getColumnSelection().hideColumns(region[0], af.viewport);\r
+ af.viewport.hideColumns(region[0], region[1]);\r
}\r
}\r
\r
alignPanel.setWrapAlignment(wrapMenuItem.isSelected());\r
}\r
\r
+ public void showAllSeqs_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.showAllHiddenSeqs();\r
+ repaint();\r
+ }\r
+\r
+ public void showAllColumns_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.showAllHiddenColumns();\r
+ }\r
+\r
+ public void hideSelSequences_actionPerformed(ActionEvent e)\r
+ {\r
+ if(viewport.getSelectionGroup()==null)\r
+ return;\r
+\r
+ SequenceI [] seqs = viewport.getSelectionGroup().getSequencesInOrder(\r
+ viewport.alignment\r
+ );\r
+\r
+ for(int i=0; i<seqs.length; i++)\r
+ {\r
+ viewport.hideSequence(seqs[i]);\r
+ }\r
+\r
+ alignPanel.repaint();\r
+ }\r
+\r
+ public void hideSelColumns_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.hideSelectedColumns();\r
+ alignPanel.repaint();\r
+ }\r
+\r
+ public void hiddenMarkers_actionPerformed(ActionEvent e)\r
+ {\r
+ viewport.setShowHiddenMarkers(hiddenMarkers.isSelected());\r
+ repaint();\r
+ }\r
+\r
/**\r
* DOCUMENT ME!\r
*\r
\r
\r
\r
-\r
public void showTranslation_actionPerformed(ActionEvent e)\r
{\r
SequenceI [] selection = viewport.getSelectionAsNewSequence();\r
- String [] seqstring = viewport.getSelectionAsString();\r
+ String [] seqstring = viewport.getViewAsString(true);\r
\r
int s, sSize = selection.length;\r
SequenceI [] newSeq = new SequenceI[sSize];\r
AppletFormatAdapter.FILE);\r
if (!isGroupsFile)\r
{\r
- String protocol = "File";\r
- String format = new IdentifyFile().Identify(file, protocol);\r
- SequenceI[] sequences = new FormatAdapter().readFile(file, protocol,\r
- format);\r
-\r
- FastaFile ff = new FastaFile();\r
- Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();\r
- c.setContents(new StringSelection(ff.print(sequences)), Desktop.instance);\r
-\r
- this.paste(false);\r
+ String format = new IdentifyFile().Identify(file, FormatAdapter.FILE);\r
+ new FileLoader().LoadFile(viewport, file, FormatAdapter.FILE, format);\r
}\r
}\r
else\r
git://source.jalview.org / jalview.git / blobdiff