git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openjdk7 returns null for default value selected format if it hasn't been touched
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmol.java
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
e500240
..
b1f7e4c
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-1,13
+1,13
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
+ *
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@
-26,15
+26,14
@@
import java.awt.event.*;
import java.io.*;
import jalview.jbgui.GStructureViewer;
import java.io.*;
import jalview.jbgui.GStructureViewer;
-import jalview.api.AlignmentViewPanel;
import jalview.api.SequenceStructureBinding;
import jalview.bin.Cache;
import jalview.datamodel.*;
import jalview.gui.ViewSelectionMenu.ViewSetProvider;
import jalview.api.SequenceStructureBinding;
import jalview.bin.Cache;
import jalview.datamodel.*;
import jalview.gui.ViewSelectionMenu.ViewSetProvider;
-import jalview.structure.*;
import jalview.datamodel.PDBEntry;
import jalview.io.*;
import jalview.schemes.*;
import jalview.datamodel.PDBEntry;
import jalview.io.*;
import jalview.schemes.*;
+import jalview.util.Platform;
public class AppJmol extends GStructureViewer implements Runnable,
SequenceStructureBinding, ViewSetProvider
public class AppJmol extends GStructureViewer implements Runnable,
SequenceStructureBinding, ViewSetProvider
@@
-98,14
+97,16
@@
public class AppJmol extends GStructureViewer implements Runnable,
* - add the alignment panel to the list used for aligning these
* structures
* @param leaveColouringToJmol
* - add the alignment panel to the list used for aligning these
* structures
* @param leaveColouringToJmol
- * - do not update the colours from any other source. Jmol is handling them
+ * - do not update the colours from any other source. Jmol is
+ * handling them
* @param loadStatus
* @param bounds
* @param viewid
*/
public AppJmol(String[] files, String[] ids, SequenceI[][] seqs,
* @param loadStatus
* @param bounds
* @param viewid
*/
public AppJmol(String[] files, String[] ids, SequenceI[][] seqs,
- AlignmentPanel ap, boolean usetoColour, boolean useToAlign, boolean leaveColouringToJmol,
- String loadStatus, Rectangle bounds, String viewid)
+ AlignmentPanel ap, boolean usetoColour, boolean useToAlign,
+ boolean leaveColouringToJmol, String loadStatus,
+ Rectangle bounds, String viewid)
{
PDBEntry[] pdbentrys = new PDBEntry[files.length];
for (int i = 0; i < pdbentrys.length; i++)
{
PDBEntry[] pdbentrys = new PDBEntry[files.length];
for (int i = 0; i < pdbentrys.length; i++)
@@
-117,7
+118,8
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
// / TODO: check if protocol is needed to be set, and if chains are
// autodiscovered.
}
// / TODO: check if protocol is needed to be set, and if chains are
// autodiscovered.
- jmb = new AppJmolBinding(this, ap.getStructureSelectionManager(), pdbentrys, seqs, null, null);
+ jmb = new AppJmolBinding(this, ap.getStructureSelectionManager(),
+ pdbentrys, seqs, null, null);
jmb.setLoadingFromArchive(true);
addAlignmentPanel(ap);
jmb.setLoadingFromArchive(true);
addAlignmentPanel(ap);
@@
-159,15
+161,15
@@
public class AppJmol extends GStructureViewer implements Runnable,
{
seqColour.setSelected(jmb.isColourBySequence());
jmolColour.setSelected(!jmb.isColourBySequence());
{
seqColour.setSelected(jmb.isColourBySequence());
jmolColour.setSelected(!jmb.isColourBySequence());
- if (_colourwith==null)
+ if (_colourwith == null)
{
{
- _colourwith=new Vector<AlignmentPanel>();
+ _colourwith = new Vector<AlignmentPanel>();
}
}
- if (_alignwith==null)
+ if (_alignwith == null)
{
{
- _alignwith=new Vector<AlignmentPanel>();
+ _alignwith = new Vector<AlignmentPanel>();
}
}
-
+
seqColourBy = new ViewSelectionMenu("Colour by ..", this, _colourwith,
new ItemListener()
{
seqColourBy = new ViewSelectionMenu("Colour by ..", this, _colourwith,
new ItemListener()
{
@@
-226,10
+228,12
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
});
}
}
});
}
+
IProgressIndicator progressBar = null;
/**
* add a single PDB structure to a new or existing Jmol view
IProgressIndicator progressBar = null;
/**
* add a single PDB structure to a new or existing Jmol view
+ *
* @param pdbentry
* @param seq
* @param chains
* @param pdbentry
* @param seq
* @param chains
@@
-241,8
+245,8
@@
public class AppJmol extends GStructureViewer implements Runnable,
progressBar = ap.alignFrame;
// ////////////////////////////////
// Is the pdb file already loaded?
progressBar = ap.alignFrame;
// ////////////////////////////////
// Is the pdb file already loaded?
- String alreadyMapped = ap.getStructureSelectionManager().alreadyMappedToFile(
- pdbentry.getId());
+ String alreadyMapped = ap.getStructureSelectionManager()
+ .alreadyMappedToFile(pdbentry.getId());
if (alreadyMapped != null)
{
if (alreadyMapped != null)
{
@@
-255,8
+259,8
@@
public class AppJmol extends GStructureViewer implements Runnable,
if (option == JOptionPane.YES_OPTION)
{
// TODO : Fix multiple seq to one chain issue here.
if (option == JOptionPane.YES_OPTION)
{
// TODO : Fix multiple seq to one chain issue here.
- ap.getStructureSelectionManager().setMapping(seq, chains, alreadyMapped,
- AppletFormatAdapter.FILE);
+ ap.getStructureSelectionManager().setMapping(seq, chains,
+ alreadyMapped, AppletFormatAdapter.FILE);
if (ap.seqPanel.seqCanvas.fr != null)
{
ap.seqPanel.seqCanvas.fr.featuresAdded();
if (ap.seqPanel.seqCanvas.fr != null)
{
ap.seqPanel.seqCanvas.fr.featuresAdded();
@@
-283,7
+287,8
@@
public class AppJmol extends GStructureViewer implements Runnable,
// add it to the set used for colouring
topJmol.useAlignmentPanelForColourbyseq(ap);
topJmol.buildJmolActionMenu();
// add it to the set used for colouring
topJmol.useAlignmentPanelForColourbyseq(ap);
topJmol.buildJmolActionMenu();
- ap.getStructureSelectionManager().sequenceColoursChanged(ap);
+ ap.getStructureSelectionManager()
+ .sequenceColoursChanged(ap);
break;
}
}
break;
}
}
@@
-318,41
+323,33
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
}
// /////////////////////////////////
}
}
// /////////////////////////////////
- openNewJmol(ap, new PDBEntry[] { pdbentry }, new SequenceI[][] { seq });
+ openNewJmol(ap, new PDBEntry[]
+ { pdbentry }, new SequenceI[][]
+ { seq });
}
}
- private void openNewJmol(AlignmentPanel ap, PDBEntry[] pdbentrys, SequenceI[][] seqs) {
- boolean promptUser=pdbentrys.length==1;
+
+ private void openNewJmol(AlignmentPanel ap, PDBEntry[] pdbentrys,
+ SequenceI[][] seqs)
+ {
progressBar = ap.alignFrame;
progressBar = ap.alignFrame;
- jmb = new AppJmolBinding(this, ap.getStructureSelectionManager(), pdbentrys, seqs, null, null);
+ jmb = new AppJmolBinding(this, ap.getStructureSelectionManager(),
+ pdbentrys, seqs, null, null);
addAlignmentPanel(ap);
useAlignmentPanelForColourbyseq(ap);
addAlignmentPanel(ap);
useAlignmentPanelForColourbyseq(ap);
- if (pdbentrys.length>1)
+ if (pdbentrys.length > 1)
{
{
- alignAddedStructures=true;
+ alignAddedStructures = true;
useAlignmentPanelForSuperposition(ap);
}
jmb.setColourBySequence(true);
setSize(400, 400); // probably should be a configurable/dynamic default here
initMenus();
useAlignmentPanelForSuperposition(ap);
}
jmb.setColourBySequence(true);
setSize(400, 400); // probably should be a configurable/dynamic default here
initMenus();
- worker=null;
- String filelist="";
-// for (PDBEntry pe: pdbentrys)
-// {
-// if (pe.getFile()==null)
- {
- addingStructures = false;
- worker = new Thread(this);
- worker.start();
-// break;
- }
-// filelist+=" \""+pe.getFile()+"\"";
-
-/* }
- if (worker==null)
+ worker = null;
{
{
- initJmol("load"+(pdbentrys.length>1 ? " APPEND" : "") + filelist);
+ addingStructures = false;
+ worker = new Thread(this);
+ worker.start();
}
}
-*/
this.addInternalFrameListener(new InternalFrameAdapter()
{
public void internalFrameClosing(InternalFrameEvent internalFrameEvent)
this.addInternalFrameListener(new InternalFrameAdapter()
{
public void internalFrameClosing(InternalFrameEvent internalFrameEvent)
@@
-364,7
+361,9
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
/**
}
/**
- * create a new Jmol containing several structures superimposed using the given alignPanel.
+ * create a new Jmol containing several structures superimposed using the
+ * given alignPanel.
+ *
* @param ap
* @param pe
* @param seqs
* @param ap
* @param pe
* @param seqs
@@
-475,13
+474,15
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
}
}
}
- public void useAlignmentPanelForColourbyseq(AlignmentPanel nap, boolean enableColourBySeq)
+ public void useAlignmentPanelForColourbyseq(AlignmentPanel nap,
+ boolean enableColourBySeq)
{
useAlignmentPanelForColourbyseq(nap);
jmb.setColourBySequence(enableColourBySeq);
seqColour.setSelected(enableColourBySeq);
jmolColour.setSelected(!enableColourBySeq);
}
{
useAlignmentPanelForColourbyseq(nap);
jmb.setColourBySequence(enableColourBySeq);
seqColour.setSelected(enableColourBySeq);
jmolColour.setSelected(!enableColourBySeq);
}
+
public void useAlignmentPanelForColourbyseq(AlignmentPanel nap)
{
addAlignmentPanel(nap);
public void useAlignmentPanelForColourbyseq(AlignmentPanel nap)
{
addAlignmentPanel(nap);
@@
-602,9
+603,9
@@
public class AppJmol extends GStructureViewer implements Runnable,
jmb.allocateViewer(renderPanel, true, "", null, null, "", scriptWindow,
null);
jmb.newJmolPopup(true, "Jmol", true);
jmb.allocateViewer(renderPanel, true, "", null, null, "", scriptWindow,
null);
jmb.newJmolPopup(true, "Jmol", true);
- if (command==null)
+ if (command == null)
{
{
- command="";
+ command = "";
}
jmb.evalStateCommand(command);
jmb.setFinishedInit(true);
}
jmb.evalStateCommand(command);
jmb.setFinishedInit(true);
@@
-736,9
+737,11
@@
public class AppJmol extends GStructureViewer implements Runnable,
{
// just transfer the file name from the first sequence's first
// PDBEntry
{
// just transfer the file name from the first sequence's first
// PDBEntry
- jmb.pdbentry[pi].setFile(file = ((PDBEntry) pdbseq
- .getSequenceAt(0).getPDBId().elementAt(0)).getFile());
- files.append(" \"" + file + "\"");
+ file = new File(((PDBEntry) pdbseq.getSequenceAt(0).getPDBId()
+ .elementAt(0)).getFile()).getAbsolutePath();
+ jmb.pdbentry[pi].setFile(file);
+
+ files.append(" \"" + Platform.escapeString(file) + "\"");
}
else
{
}
else
{
@@
-761,7
+764,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
}
if (file != null)
{
}
if (file != null)
{
- files.append(" \"" + file + "\"");
+ files.append(" \"" + Platform.escapeString(file) + "\"");
}
}
}
}
}
}
@@
-811,7
+814,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
final String command = cmd.toString();
cmd = null;
lastnotify = jmb.getLoadNotifiesHandled();
final String command = cmd.toString();
cmd = null;
lastnotify = jmb.getLoadNotifiesHandled();
-
+
try
{
jmb.evalStateCommand(command);
try
{
jmb.evalStateCommand(command);
@@
-826,10
+829,10
@@
public class AppJmol extends GStructureViewer implements Runnable,
Cache.log.error("Couldn't add files to Jmol viewer!", ex);
}
}
Cache.log.error("Couldn't add files to Jmol viewer!", ex);
}
}
-
+
// need to wait around until script has finished
while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
// need to wait around until script has finished
while (addingStructures ? lastnotify >= jmb.getLoadNotifiesHandled()
- : (jmb.isFinishedInit() && jmb.getPdbFile().length!=jmb.pdbentry.length))
+ : (jmb.isFinishedInit() && jmb.getPdbFile().length != jmb.pdbentry.length))
{
try
{
{
try
{
@@
-908,8
+911,7
@@
public class AppJmol extends GStructureViewer implements Runnable,
{
for (int pdbe = 0; pdbe < jmb.pdbentry.length; pdbe++)
{
{
for (int pdbe = 0; pdbe < jmb.pdbentry.length; pdbe++)
{
- cap.appendText(jmb.printMapping(
- jmb.pdbentry[pdbe].getFile()));
+ cap.appendText(jmb.printMapping(jmb.pdbentry[pdbe].getFile()));
cap.appendText("\n");
}
} catch (OutOfMemoryError e)
cap.appendText("\n");
}
} catch (OutOfMemoryError e)
@@
-972,13
+974,16
@@
public class AppJmol extends GStructureViewer implements Runnable,
im.writeImage();
}
}
im.writeImage();
}
}
+
public void jmolColour_actionPerformed(ActionEvent actionEvent)
{
public void jmolColour_actionPerformed(ActionEvent actionEvent)
{
- if (jmolColour.isSelected()) {
+ if (jmolColour.isSelected())
+ {
// disable automatic sequence colouring.
jmb.setColourBySequence(false);
}
}
// disable automatic sequence colouring.
jmb.setColourBySequence(false);
}
}
+
public void seqColour_actionPerformed(ActionEvent actionEvent)
{
jmb.setColourBySequence(seqColour.isSelected());
public void seqColour_actionPerformed(ActionEvent actionEvent)
{
jmb.setColourBySequence(seqColour.isSelected());
@@
-990,7
+995,8
@@
public class AppJmol extends GStructureViewer implements Runnable,
{
if (!jmb.isLoadingFromArchive())
{
{
if (!jmb.isLoadingFromArchive())
{
- if (_colourwith.size()==0 && ap!=null) {
+ if (_colourwith.size() == 0 && ap != null)
+ {
// Make the currently displayed alignment panel the associated view
_colourwith.add(ap.alignFrame.alignPanel);
}
// Make the currently displayed alignment panel the associated view
_colourwith.add(ap.alignFrame.alignPanel);
}
@@
-1057,6
+1063,11
@@
public class AppJmol extends GStructureViewer implements Runnable,
jmb.setJalviewColourScheme(new BuriedColourScheme());
}
jmb.setJalviewColourScheme(new BuriedColourScheme());
}
+ public void purinePyrimidineColour_actionPerformed(ActionEvent actionEvent)
+ {
+ setJalviewColourScheme(new PurinePyrimidineColourScheme());
+ }
+
public void userColour_actionPerformed(ActionEvent actionEvent)
{
userColour.setSelected(true);
public void userColour_actionPerformed(ActionEvent actionEvent)
{
userColour.setSelected(true);
@@
-1325,7
+1336,6
@@
public class AppJmol extends GStructureViewer implements Runnable,
public boolean isColouredByJmol()
{
return !jmb.isColourBySequence();
public boolean isColouredByJmol()
{
return !jmb.isColourBySequence();
- }
-
+ }
}
}