public class AlignViewport extends AlignmentViewport
implements SelectionSource
{
+
+ public final static int NO_SPLIT = 0;
+
+ public final static int SPLIT_FRAME = 1;
+
+ public final static int NEW_WINDOW = 2;
+
+
Font font;
boolean cursorMode = false;
* @param hiddenColumns
* @param seqsetid
* (may be null)
- */
+f */
public AlignViewport(AlignmentI al, HiddenColumns hiddenColumns,
String seqsetid)
{
{
if (AlignmentUtils.isMappable(toAdd, getAlignment()))
{
- if (openLinkedAlignment(toAdd, title))
- {
- return;
- }
+ openLinkedAlignment(toAdd, title);
+ return;
}
}
+ addDataToAlignment(toAdd);
+ }
- /*
- * No mappings, or offer declined - add sequences to this alignment
- */
+ /**
+ * adds sequences to this alignment
+ *
+ * @param toAdd
+ */
+ void addDataToAlignment(AlignmentI toAdd)
+ {
// TODO: JAL-407 regardless of above - identical sequences (based on ID and
// provenance) should share the same dataset sequence
}
}
- ranges.setEndSeq(getAlignment().getHeight());
+ ranges.setEndSeq(getAlignment().getHeight() - 1); // BH 2019.04.18
firePropertyChange("alignment", null, getAlignment().getSequences());
}
* @param al
* @param title
*/
- protected boolean openLinkedAlignment(AlignmentI al, String title)
+ protected void openLinkedAlignment(AlignmentI al, String title)
{
String[] options = new String[] { MessageManager.getString("action.no"),
MessageManager.getString("label.split_window"),
MessageManager.getString("label.new_window"), };
final String question = JvSwingUtils.wrapTooltip(true,
MessageManager.getString("label.open_split_window?"));
- int response = JvOptionPane.showOptionDialog(Desktop.desktop, question,
+ final AlignViewport us = this;
+
+ /*
+ * options No, Split Window, New Window correspond to
+ * dialog responses 0, 1, 2 (even though JOptionPane shows them
+ * in reverse order)
+ */
+ JvOptionPane dialog = JvOptionPane.newOptionDialog(Desktop.desktop)
+ .setResponseHandler(NO_SPLIT, new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ addDataToAlignment(al);
+ }
+ }).setResponseHandler(SPLIT_FRAME, new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ openLinkedAlignmentAs(getAlignPanel().alignFrame,
+ new Alignment(getAlignment()), al, title,
+ SPLIT_FRAME);
+// us.openLinkedAlignmentAs(al, title, true);
+ }
+ }).setResponseHandler(NEW_WINDOW, new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ openLinkedAlignmentAs(null, getAlignment(), al, title,
+ NEW_WINDOW);
+ }
+ });
+ dialog.showDialog(question,
MessageManager.getString("label.open_split_window"),
JvOptionPane.DEFAULT_OPTION, JvOptionPane.PLAIN_MESSAGE, null,
options, options[0]);
-
- if (response != 1 && response != 2)
- {
- return false;
- }
- final boolean openSplitPane = (response == 1);
- final boolean openInNewWindow = (response == 2);
-
+ }
+ /**
+ * Open a split frame or a new window
+ *
+ * @param al
+ * @param title
+ * @param mode
+ * SPLIT_FRAME or NEW_WINDOW
+ */
+ public static void openLinkedAlignmentAs(AlignFrame thisFrame,
+ AlignmentI thisAlignment, AlignmentI al, String title, int mode)
+ {
/*
* Identify protein and dna alignments. Make a copy of this one if opening
* in a new split pane.
*/
- AlignmentI thisAlignment = openSplitPane ? new Alignment(getAlignment())
- : getAlignment();
AlignmentI protein = al.isNucleotide() ? thisAlignment : al;
- final AlignmentI cdna = al.isNucleotide() ? al : thisAlignment;
-
+ AlignmentI cdna = al.isNucleotide() ? al : thisAlignment;
/*
* Map sequences. At least one should get mapped as we have already passed
* the test for 'mappability'. Any mappings made will be added to the
// alignFrame.setFileName(file, format);
// }
- if (openInNewWindow)
+ if (mode == NEW_WINDOW)
{
Desktop.addInternalFrame(newAlignFrame, title,
AlignFrame.DEFAULT_WIDTH, AlignFrame.DEFAULT_HEIGHT);
{
}
- if (openSplitPane)
+ if (mode == SPLIT_FRAME)
{
al.alignAs(thisAlignment);
- protein = openSplitFrame(newAlignFrame, thisAlignment);
+ openSplitFrame(thisFrame, newAlignFrame, thisAlignment);
}
-
- return true;
}
/**
* cdna/protein complement alignment to show in the other split half
* @return the protein alignment in the split frame
*/
- protected AlignmentI openSplitFrame(AlignFrame newAlignFrame,
- AlignmentI complement)
+ static protected AlignmentI openSplitFrame(AlignFrame thisFrame,
+ AlignFrame newAlignFrame, AlignmentI complement)
{
/*
* Make a new frame with a copy of the alignment we are adding to. If this
*/
AlignFrame copyMe = new AlignFrame(complement, AlignFrame.DEFAULT_WIDTH,
AlignFrame.DEFAULT_HEIGHT);
- copyMe.setTitle(getAlignPanel().alignFrame.getTitle());
+ copyMe.setTitle(thisFrame.getTitle());
+
AlignmentI al = newAlignFrame.viewport.getAlignment();
final AlignFrame proteinFrame = al.isNucleotide() ? copyMe