*/\r
package jalview.gui;\r
\r
-import jalview.binding.*;\r
-\r
import jalview.io.*;\r
\r
import jalview.schemes.*;\r
import java.net.*;\r
\r
import java.util.*;\r
+\r
import java.util.jar.*;\r
\r
import javax.swing.*;\r
\r
+import jalview.binding.*;\r
+\r
\r
/**\r
* DOCUMENT ME!\r
AlignViewport av = af.viewport;\r
\r
JalviewModel object = new JalviewModel();\r
- object.setVamsasModel(new VamsasModel());\r
+ object.setVamsasModel(new jalview.binding.VamsasModel());\r
\r
object.setCreationDate(new java.util.Date(timeStamp));\r
object.setVersion(jalview.bin.Cache.getProperty("VERSION"));\r
tree.setThreshold(tp.treeCanvas.threshold);\r
\r
tree.setFitToWindow(tp.fitToWindow.getState());\r
- tree.setFontSize(tp.treeCanvas.fontSize);\r
+ tree.setFontName(tp.getTreeFont().getName());\r
+ tree.setFontSize(tp.getTreeFont().getSize());\r
+ tree.setFontStyle(tp.getTreeFont().getStyle());\r
tree.setMarkUnlinked(tp.placeholdersMenu.getState());\r
+\r
tree.setShowBootstrap(tp.bootstrapMenu.getState());\r
tree.setShowDistances(tp.distanceMenu.getState());\r
\r
groups[i].setStart(sg.getStartRes());\r
groups[i].setEnd(sg.getEndRes());\r
groups[i].setName(sg.getName());\r
-\r
- if (sg.cs instanceof ConservationColourScheme)\r
+ if(sg.cs!=null)\r
{\r
- groups[i].setConsThreshold(((ConservationColourScheme) sg.cs).inc);\r
- }\r
+ if (sg.cs.conservationApplied())\r
+ {\r
+ groups[i].setConsThreshold(sg.cs.getConservationInc());\r
\r
- if (sg.cs instanceof ResidueColourScheme)\r
- {\r
- groups[i].setPidThreshold(((ResidueColourScheme) sg.cs).getThreshold());\r
- }\r
- else if (sg.cs instanceof ScoreColourScheme)\r
- {\r
- groups[i].setPidThreshold(((ScoreColourScheme) sg.cs).getThreshold());\r
- }\r
-\r
- if (sg.cs instanceof jalview.schemes.UserColourScheme)\r
- {\r
+ if (sg.cs instanceof jalview.schemes.UserColourScheme)\r
+ {\r
+ groups[i].setColour(SetUserColourScheme(sg.cs,\r
+ userColours,\r
+ jms));\r
+ }\r
+ else\r
+ {\r
+ groups[i].setColour(ColourSchemeProperty.getColourName(sg.\r
+ cs));\r
+ }\r
+ }\r
+ else if (sg.cs instanceof jalview.schemes.UserColourScheme)\r
+ {\r
groups[i].setColour(SetUserColourScheme(sg.cs, userColours,\r
- jms));\r
- }\r
- else\r
- {\r
+ jms));\r
+ }\r
+ else\r
+ {\r
groups[i].setColour(ColourSchemeProperty.getColourName(\r
- sg.cs));\r
+ sg.cs));\r
+ }\r
+\r
+ groups[i].setPidThreshold(sg.cs.getThreshold());\r
}\r
\r
groups[i].setOutlineColour(sg.getOutlineColour().getRGB());\r
\r
ColourSchemeI cs = av.getGlobalColourScheme();\r
\r
- if (cs instanceof ConservationColourScheme)\r
+ if(cs!=null)\r
{\r
- view.setConsThreshold(((ConservationColourScheme) cs).inc);\r
- }\r
+ if (cs.conservationApplied())\r
+ {\r
+ view.setConsThreshold(cs.getConservationInc());\r
+ if (cs instanceof jalview.schemes.UserColourScheme)\r
+ view.setBgColour(SetUserColourScheme(cs, userColours, jms));\r
+ }\r
\r
- if (cs instanceof ResidueColourScheme)\r
- {\r
- view.setPidThreshold(((ResidueColourScheme) cs).getThreshold());\r
- }\r
- else if (cs instanceof ScoreColourScheme)\r
- {\r
- view.setPidThreshold(((ScoreColourScheme) cs).getThreshold());\r
+ if (cs instanceof ResidueColourScheme)\r
+ {\r
+ view.setPidThreshold(cs.getThreshold());\r
+ }\r
}\r
\r
view.setConservationSelected(av.getConservationSelected());\r
view.setShowBoxes(av.getShowBoxes());\r
view.setShowColourText(av.getColourText());\r
view.setShowConservation(av.showConservation);\r
- view.setShowFullId(av.getShowFullId());\r
+ view.setShowFullId(av.getShowJVSuffix());\r
view.setShowIdentity(av.showIdentity);\r
view.setShowQuality(av.showQuality);\r
view.setShowSequenceFeatures(av.showSequenceFeatures);\r
}\r
while (jarentry != null);\r
}\r
+ catch(java.net.UnknownHostException ex)\r
+ {\r
+ ex.printStackTrace();\r
+ System.err.println("Couldn't locate Jalview XML file : " +\r
+ ex + "\n");\r
+ JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
+ "Couldn't locate " + file,\r
+ "URL not found",\r
+ JOptionPane.WARNING_MESSAGE);\r
+\r
+ }\r
catch (Exception ex)\r
{\r
ex.printStackTrace();\r
System.err.println("Exception whilst loading jalview XML file : " +\r
ex + "\n");\r
JOptionPane.showInternalMessageDialog(Desktop.desktop,\r
- "Couldn't locate " + file,\r
- "URL not found",\r
+ "Error loading " + file,\r
+ "Error loading Jalview file",\r
JOptionPane.WARNING_MESSAGE);\r
\r
}\r
groups[i].getColour());\r
}\r
\r
- if (cs instanceof ResidueColourScheme)\r
- {\r
- ((ResidueColourScheme) cs).setThreshold(groups[i].getPidThreshold(), true);\r
- }\r
- else if (cs instanceof ScoreColourScheme)\r
- {\r
- ((ScoreColourScheme) cs).setThreshold(groups[i].getPidThreshold(), true);\r
- }\r
+ cs.setThreshold(groups[i].getPidThreshold(), true);\r
}\r
\r
Vector seqs = new Vector();\r
sg.getWidth() - 1);\r
c.calculate();\r
c.verdict(false, 25);\r
- cs = new ConservationColourScheme(c, cs);\r
- sg.cs = cs;\r
+ sg.cs.setConservation(c);\r
}\r
\r
al.addGroup(sg);\r
}\r
}\r
\r
- Desktop.addInternalFrame(af, view.getTitle(),\r
- AlignFrame.NEW_WINDOW_WIDTH, AlignFrame.NEW_WINDOW_HEIGHT);\r
+\r
af.setBounds(view.getXpos(), view.getYpos(), view.getWidth(),\r
view.getHeight());\r
af.viewport.setStartRes(view.getStartRes());\r
af.viewport.setConservationSelected(view.getConservationSelected());\r
af.conservationMenuItem.setSelected(view.getConservationSelected());\r
\r
- af.viewport.setShowFullId(view.getShowFullId());\r
- af.fullSeqId.setSelected(view.getShowFullId());\r
+ af.viewport.setShowJVSuffix(view.getShowFullId());\r
+ af.seqLimits.setSelected(view.getShowFullId());\r
\r
af.viewport.setFont(new java.awt.Font(view.getFontName(),\r
view.getFontStyle(), view.getFontSize()));\r
cs = ColourSchemeProperty.getColour(al, view.getBgColour());\r
}\r
\r
- if (cs instanceof ResidueColourScheme)\r
- {\r
- ((ResidueColourScheme) cs).setThreshold(view.getPidThreshold(), true);\r
- }\r
- else if (cs instanceof ScoreColourScheme)\r
- {\r
- ((ScoreColourScheme) cs).setThreshold(view.getPidThreshold(), true);\r
- }\r
-\r
if(cs!=null)\r
+ {\r
+ cs.setThreshold(view.getPidThreshold(), true);\r
cs.setConsensus(af.viewport.vconsensus);\r
+ }\r
}\r
\r
af.setColourSelected(view.getBgColour());\r
af.viewport.setGlobalColourScheme(cs);\r
af.viewport.setColourAppliesToAllGroups(false);\r
- af.changeColour(af.viewport.getGlobalColourScheme());\r
- if (view.getConservationSelected())\r
+ af.changeColour(cs);\r
+ if (view.getConservationSelected() && cs!=null)\r
{\r
- ( (ConservationColourScheme) af.viewport.getGlobalColourScheme()).inc = view.getConsThreshold();\r
+ cs.setConservationInc(view.getConsThreshold());\r
}\r
\r
af.viewport.setColourAppliesToAllGroups(true);\r
\r
if (view.getShowSequenceFeatures())\r
{\r
+ af.featureSettings.setEnabled(true);\r
af.viewport.showSequenceFeatures = true;\r
af.sequenceFeatures.setSelected(true);\r
new SequenceFeatureFetcher(al, af.alignPanel);\r
al.featuresAdded = true;\r
}\r
\r
+ Desktop.addInternalFrame(af, view.getTitle(),\r
+ view.getWidth(), view.getHeight());\r
+\r
//LOAD TREES\r
///////////////////////////////////////\r
if (jms.getTreeCount() > 0)\r
{\r
for (int t = 0; t < jms.getTreeCount(); t++)\r
{\r
+\r
Tree tree = jms.getTree(t);\r
\r
TreePanel tp = af.ShowNewickTree(new jalview.io.NewickFile(\r
- tree.getNewick()), tree.getTitle());\r
-\r
- tp.setBounds(tree.getXpos(), tree.getYpos(),\r
- tree.getWidth(), tree.getHeight());\r
+ tree.getNewick()), tree.getTitle(),\r
+ tree.getWidth(), tree.getHeight(),\r
+ tree.getXpos(), tree.getYpos());\r
\r
tp.fitToWindow.setState(tree.getFitToWindow());\r
tp.fitToWindow_actionPerformed(null);\r
- tp.treeCanvas.fontSize = tree.getFontSize();\r
- tp.fontSize.setText("Font Size - " + tree.getFontSize());\r
- tp.placeholdersMenu.setState(tree.getMarkUnlinked());\r
- tp.placeholdersMenu_actionPerformed(null);\r
- tp.bootstrapMenu.setState(tree.getShowBootstrap());\r
- tp.bootstrapMenu_actionPerformed(null);\r
- tp.distanceMenu.setState(tree.getShowDistances());\r
- tp.distanceMenu_actionPerformed(null);\r
+\r
+ if(tree.getFontName()!=null)\r
+ tp.setTreeFont(new java.awt.Font(tree.getFontName(),\r
+ tree.getFontStyle(),\r
+ tree.getFontSize()));\r
+ else\r
+ tp.setTreeFont(new java.awt.Font(view.getFontName(),\r
+ view.getFontStyle(),\r
+ tree.getFontSize()));\r
+\r
+ tp.showPlaceholders(tree.getMarkUnlinked());\r
+ tp.showBootstrap(tree.getShowBootstrap());\r
+ tp.showDistances(tree.getShowDistances());\r
+\r
tp.treeCanvas.threshold = tree.getThreshold();\r
\r
if (tree.getCurrentTree())\r
af.viewport.setCurrentTree(tp.getTree());\r
}\r
+\r
}\r
catch (Exception ex)\r
{\r
ex.printStackTrace();\r
}\r
+\r
}\r
+\r
return af;\r
}\r
}\r
git://source.jalview.org / jalview.git / blobdiff