{\r
alignPanel.seqPanel.seqCanvas.fr.featuresAdded();\r
alignPanel.repaint();\r
+ if(featureSettings!=null)\r
+ featureSettings.setTableData();\r
}\r
}\r
\r
}\r
else\r
{\r
- String output = new FormatAdapter().formatSequences(format,\r
- viewport.getAlignment().\r
- getSequences());\r
+\r
+ String[] omitHidden = null;\r
+\r
+ if (viewport.hasHiddenColumns)\r
+ {\r
+ System.out.println("PROMPT USER HERE");\r
+ omitHidden = viewport.getSelectionAsString();\r
+ }\r
+\r
+ String output = new FormatAdapter().formatSequences(\r
+ format,\r
+ viewport.getSelectionAsNewSequence(),\r
+ omitHidden) ;\r
+\r
+\r
+\r
if (output == null)\r
{\r
return false;\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
- cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),\r
- viewport.getAlignment().\r
- getSequences()));\r
+\r
+\r
+ String [] omitHidden = null;\r
+\r
+ if(viewport.hasHiddenColumns)\r
+ {\r
+ System.out.println("PROMPT USER HERE");\r
+ omitHidden = viewport.getSelectionAsString();\r
+ }\r
+\r
+ cap.setText(new FormatAdapter().formatSequences(\r
+ e.getActionCommand(),\r
+ viewport.getSelectionAsNewSequence(),\r
+ omitHidden));\r
}\r
\r
/**\r
return;\r
}\r
\r
- SequenceGroup sg = viewport.getSelectionGroup();\r
+ SequenceI [] seqs = viewport.getSelectionAsNewSequence();\r
\r
Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();\r
\r
- Hashtable orderedSeqs = new Hashtable();\r
- SequenceI[] seqs = new SequenceI[sg.getSize(false)];\r
-\r
- for (int i = 0; i < sg.getSize(false); i++)\r
- {\r
- SequenceI seq = sg.getSequenceAt(i);\r
- int index = viewport.alignment.findIndex(seq);\r
- orderedSeqs.put(index + "", seq);\r
- }\r
+ FastaFile ff = new FastaFile();\r
+ ff.addJVSuffix( viewport.showJVSuffix );\r
\r
- int index = 0, startRes, endRes;\r
- char ch;\r
+ c.setContents(new StringSelection(ff.print(seqs)), Desktop.instance);\r
\r
- for (int i = 0; i < sg.getSize(false); i++)\r
+ Vector hiddenColumns = null;\r
+ if(viewport.hasHiddenColumns && viewport.getSelectionGroup()!=null)\r
{\r
- SequenceI seq = null;\r
-\r
- while (seq == null)\r
+ hiddenColumns =new Vector();\r
+ int hiddenOffset = viewport.getSelectionGroup().getStartRes();\r
+ for(int i=0; i<viewport.getColumnSelection().getHiddenColumns().size(); i++)\r
{\r
- if (orderedSeqs.containsKey(index + ""))\r
- {\r
- seq = (SequenceI) orderedSeqs.get(index + "");\r
- index++;\r
+ int[] region = (int[])\r
+ viewport.getColumnSelection().getHiddenColumns().elementAt(i);\r
\r
- break;\r
- }\r
- else\r
- {\r
- index++;\r
- }\r
- }\r
-\r
- //FIND START RES\r
- //Returns residue following index if gap\r
- startRes = seq.findPosition(sg.getStartRes());\r
-\r
- //FIND END RES\r
- //Need to find the residue preceeding index if gap\r
- endRes = 0;\r
-\r
- for (int j = 0; j < sg.getEndRes() + 1 && j < seq.getLength(); j++)\r
- {\r
- ch = seq.getCharAt(j);\r
- if (!jalview.util.Comparison.isGap( (ch)))\r
- {\r
- endRes++;\r
- }\r
- }\r
-\r
- if (endRes > 0)\r
- {\r
- endRes += seq.getStart() - 1;\r
- }\r
-\r
- seqs[i] = new Sequence(seq.getName(),\r
- seq.getSequence(sg.getStartRes(), sg.getEndRes() + 1),\r
- startRes,\r
- endRes);\r
- seqs[i].setDescription(seq.getDescription());\r
- seqs[i].setDBRef(seq.getDBRef());\r
- seqs[i].setSequenceFeatures(seq.getSequenceFeatures());\r
- seqs[i].setDatasetSequence(seq.getDatasetSequence());\r
- if(seq.getAnnotation()!=null)\r
- {\r
- for(int a=0; a<seq.getAnnotation().length; a++)\r
- seqs[i].addAlignmentAnnotation(seq.getAnnotation()[a]);\r
+ hiddenColumns.addElement(new int[]{region[0]-hiddenOffset,\r
+ region[1]-hiddenOffset});\r
}\r
}\r
-\r
- FastaFile ff = new FastaFile();\r
- ff.addJVSuffix( viewport.showJVSuffix );\r
- c.setContents(new StringSelection( ff.print(seqs)), Desktop.instance);\r
- Desktop.jalviewClipboard = new Object[]{seqs, viewport.alignment.getDataset()};\r
+ Desktop.jalviewClipboard = new Object[]{ seqs,\r
+ viewport.alignment.getDataset(),\r
+ hiddenColumns};\r
}\r
\r
/**\r
AlignFrame af = new AlignFrame(alignment);\r
String newtitle = new String("Copied sequences");\r
\r
+ if(Desktop.jalviewClipboard[2]!=null)\r
+ {\r
+ Vector hc = (Vector)Desktop.jalviewClipboard[2];\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
+ }\r
+ }\r
+\r
\r
//>>>This is a fix for the moment, until a better solution is found!!<<<\r
af.alignPanel.seqPanel.seqCanvas.getFeatureRenderer().transferSettings(\r
}\r
\r
\r
- public void dbRefs_actionPerformed(ActionEvent e)\r
- {\r
- new DBRefFetcher(viewport.alignment, this);\r
- }\r
-\r
- public void defaultDASSource_actionPerformed(ActionEvent e)\r
- {\r
- new DasSequenceFeatureFetcher(viewport.alignment, this);\r
- viewport.setShowSequenceFeatures(true);\r
- showSeqFeatures.setSelected(true);\r
- }\r
-\r
- public void modifyDASSource_actionPerformed(ActionEvent e)\r
- {\r
- DasSourceBrowser dsb = new DasSourceBrowser();\r
- JInternalFrame frame = new JInternalFrame();\r
- frame.setContentPane(dsb);\r
- Desktop.addInternalFrame(frame, "Modify DAS Source",\r
- 600,370);\r
- }\r
-\r
-\r
+ FeatureSettings featureSettings;\r
public void featureSettings_actionPerformed(ActionEvent e)\r
{\r
- new FeatureSettings(viewport, alignPanel);\r
+ if(featureSettings !=null )\r
+ {\r
+ featureSettings.close();\r
+ featureSettings = null;\r
+ }\r
+ featureSettings = new FeatureSettings(this);\r
}\r
\r
/**\r
}\r
\r
title = title + " on region";\r
- tp = new TreePanel(viewport,\r
- viewport.getSelectionGroup().getSequences(false),\r
- type, pwType,\r
- sg.getStartRes(), sg.getEndRes());\r
+ tp = new TreePanel(viewport, type, pwType);\r
}\r
else\r
{\r
return;\r
}\r
\r
- tp = new TreePanel(viewport,\r
- viewport.getAlignment().getSequences(), type, pwType,\r
- 0,\r
- viewport.alignment.getWidth());\r
+ tp = new TreePanel(viewport, type, pwType);\r
}\r
\r
addTreeMenuItem(tp, title);\r
if (nf.getTree() != null)\r
{\r
tp = new TreePanel(viewport,\r
- viewport.getAlignment().getSequences(), nf,\r
"FromFile",\r
- title);\r
+ title,\r
+ nf);\r
\r
tp.setSize(w,h);\r
\r
git://source.jalview.org / jalview.git / blobdiff