import jalview.datamodel.AlignmentOrder;
import jalview.datamodel.AlignmentView;
import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenSequences;
import jalview.datamodel.PDBEntry;
import jalview.datamodel.SeqCigar;
import jalview.datamodel.Sequence;
updateEditMenuBar();
}
- // methods for implementing IProgressIndicator
- // need to refactor to a reusable stub class
- // Map<Long, JPanel> progressBars;
- //
- // Map<Long, IProgressIndicatorHandler> progressBarHandlers;
- private ProgressBar progressBar;
+ private IProgressIndicator progressBar;
/*
* (non-Javadoc)
.lastIndexOf(java.io.File.separatorChar) + 1);
}
- /*
- * First save any linked Chimera session.
- */
- Desktop.instance.saveChimeraSessions(file);
-
success = new Jalview2XML().saveAlignment(this, file, shortName);
statusBar.setText(MessageManager.formatMessage(
return false;
}
- String[] omitHidden = null;
-
- if (viewport.hasHiddenColumns())
- {
- int reply = JOptionPane
- .showInternalConfirmDialog(
- Desktop.desktop,
- MessageManager
- .getString("label.alignment_contains_hidden_columns"),
- MessageManager
- .getString("action.save_omit_hidden_columns"),
- JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
-
- if (reply == JOptionPane.YES_OPTION)
- {
- omitHidden = viewport.getViewAsString(false);
- }
- }
- FeatureRenderer fr = new FeatureRenderer(this.alignPanel);
- viewport.setFeatureRenderer(fr);
+ ExportData exportData = getAlignmentForExport();
FormatAdapter f = new FormatAdapter(viewport);
String output = f.formatSequences(format,
- viewport.getAlignment(), // class cast exceptions will
+ exportData.getAlignment(), // class cast exceptions will
// occur in the distant future
- omitHidden, f.getCacheSuffixDefault(format),
+ exportData.getOmitHidden(), f.getCacheSuffixDefault(format),
viewport.getColumnSelection());
if (output == null)
return success;
}
+
private void warningMessage(String warning, String title)
{
if (new jalview.util.Platform().isHeadless())
@Override
protected void outputText_actionPerformed(ActionEvent e)
{
+
+ ExportData exportData = getAlignmentForExport();
+ CutAndPasteTransfer cap = new CutAndPasteTransfer();
+ cap.setForInput(null);
+
+ try
+ {
+ cap.setText(new FormatAdapter(viewport).formatSequences(
+ e.getActionCommand(),
+ exportData.getAlignment(),
+ exportData.getOmitHidden(),
+ viewport.getColumnSelection()));
+ Desktop.addInternalFrame(cap, MessageManager.formatMessage(
+ "label.alignment_output_command", new Object[]
+ { e.getActionCommand() }), 600, 500);
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("Outputting alignment as " + e.getActionCommand(), oom);
+ cap.dispose();
+ }
+
+ }
+
+ public ExportData getAlignmentForExport()
+ {
+ AlignmentI alignmentToExport = null;
String[] omitHidden = null;
FeatureRenderer fr = new FeatureRenderer(this.alignPanel);
viewport.setFeatureRenderer(fr);
- if (viewport.hasHiddenColumns())
+ HiddenSequences hiddenSeqs = viewport.getAlignment()
+ .getHiddenSequences();
+ if (viewport.hasHiddenColumns() || hiddenSeqs.getSize() > 0)
{
int reply = JOptionPane
.showInternalConfirmDialog(
{
omitHidden = viewport.getViewAsString(false);
}
+ else
+ {
+ alignmentToExport = viewport.getAlignment().getHiddenSequences()
+ .getFullAlignment();
+ }
}
-
- CutAndPasteTransfer cap = new CutAndPasteTransfer();
- cap.setForInput(null);
-
- try
+ if (alignmentToExport == null)
{
- cap.setText(new FormatAdapter(viewport).formatSequences(
- e.getActionCommand(),
- viewport.getAlignment(), omitHidden,
- viewport.getColumnSelection()));
- Desktop.addInternalFrame(cap, MessageManager.formatMessage(
- "label.alignment_output_command", new Object[]
- { e.getActionCommand() }), 600, 500);
- } catch (OutOfMemoryError oom)
- {
- new OOMWarning("Outputting alignment as " + e.getActionCommand(), oom);
- cap.dispose();
+ alignmentToExport = viewport.getAlignment();
}
-
+ return new ExportData(alignmentToExport, omitHidden);
}
/**
sf.setComplementVisible(this, show);
}
}
+
+ public class ExportData
+ {
+ private AlignmentI alignment;
+
+ private String[] omitHidden;
+
+ public ExportData(AlignmentI align, String[] ommit)
+ {
+ this.alignment = align;
+ this.omitHidden = ommit;
+ System.out.println();
+ }
+
+ public AlignmentI getAlignment()
+ {
+ return alignment;
+ }
+
+ public void setAlignment(AlignmentI alignment)
+ {
+ this.alignment = alignment;
+ }
+
+ public String[] getOmitHidden()
+ {
+ return omitHidden;
+ }
+
+ public void setOmitHidden(String[] omitHidden)
+ {
+ this.omitHidden = omitHidden;
+ }
+ }
+
+ @Override
+ public void hideColumns(List<int[]> colsToHide)
+ {
+ for (int[] colRange : colsToHide)
+ {
+ viewport.hideColumns(colRange[0], colRange[1]);
+ }
+
+ }
+
+ @Override
+ public void syncHiddenSequences()
+ {
+ AlignmentI al = viewport.getAlignment();
+ HiddenSequences hiddenSeqs = al.getHiddenSequences();
+ for (SequenceI seq : al.getSequencesArray())
+ {
+ if (seq.isHidden())
+ {
+ hiddenSeqs.hideSequence(seq);
+ }
+ }
+ }
}
class PrintThread extends Thread