X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAppletPDBViewer.java;h=ce2083ae91449e3008b3dc763b9b3903b496fc28;hb=182d6f907cbe252b377af82f0ab58dfd83c6d9b7;hp=b2931aeb464fa3b5d3c9a55047f080eb191f5a97;hpb=daeacba9a61069114333b550a987242d8e47e7f7;p=jalview.git diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java index b2931ae..ce2083a 100755 --- a/src/MCview/AppletPDBViewer.java +++ b/src/MCview/AppletPDBViewer.java @@ -1,6 +1,6 @@ /* * Jalview - A Sequence Alignment Editor and Viewer - * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle + * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -23,22 +23,18 @@ import java.awt.*; import java.awt.event.*; import jalview.datamodel.*; import jalview.appletgui.*; +import jalview.schemes.*; import java.awt.event.ActionListener; import java.awt.event.ActionEvent; -public class AppletPDBViewer extends Frame +public class AppletPDBViewer extends Frame implements ActionListener, ItemListener { - PDBEntry pdb; - Sequence sequence; AppletPDBCanvas pdbcanvas; - - public AppletPDBViewer(String pdbtext,String type, Sequence seq, SeqCanvas seqcanvas) { - sequence = seq; try { @@ -53,7 +49,7 @@ public class AppletPDBViewer extends Frame add(pdbcanvas, BorderLayout.CENTER); - StringBuffer title = new StringBuffer(sequence.getName() + ":"); + StringBuffer title = new StringBuffer(seq.getName() + ":"); jalview.bin.JalviewLite.addFrame(this,title.toString(),400, 400); @@ -62,104 +58,124 @@ public class AppletPDBViewer extends Frame pdbcanvas.setPDBFile(pdbfile); } catch(Exception ex){ + ex.printStackTrace(); pdbcanvas.errorLoading = true; pdbcanvas.repaint(); } } + public void actionPerformed(ActionEvent evt) + { + if(evt.getSource()==mapping) + mapping_actionPerformed(); + else if(evt.getSource()==wire) + wire_actionPerformed(); + else if(evt.getSource()==depth) + depth_actionPerformed(); + else if(evt.getSource()==zbuffer) + zbuffer_actionPerformed(); + else if(evt.getSource()==charge) + charge_actionPerformed(); + + else if(evt.getSource()==chain) + chain_actionPerformed(); + else if(evt.getSource()==seqButton) + seqButton_actionPerformed(); + else if(evt.getSource()==zappo) + pdbcanvas.setColours(new ZappoColourScheme()); + else if(evt.getSource()==taylor) + pdbcanvas.setColours(new TaylorColourScheme()); + else if(evt.getSource()==hydro) + pdbcanvas.setColours(new HydrophobicColourScheme()); + else if(evt.getSource()==helix) + pdbcanvas.setColours(new HelixColourScheme()); + else if(evt.getSource()==strand) + pdbcanvas.setColours(new StrandColourScheme()); + else if(evt.getSource()==turn) + pdbcanvas.setColours(new TurnColourScheme()); + else if(evt.getSource()==buried) + pdbcanvas.setColours(new BuriedColourScheme()); + else if(evt.getSource()==user) + { + pdbcanvas.bysequence = false; + new jalview.appletgui.UserDefinedColours(pdbcanvas); + } + } + + public void itemStateChanged(ItemEvent evt) + { + if (evt.getSource() == allchains) + allchains_itemStateChanged(); + else if (evt.getSource() == wire) + wire_actionPerformed(); + else if (evt.getSource() == depth) + depth_actionPerformed(); + else if (evt.getSource() == zbuffer) + zbuffer_actionPerformed(); + } + private void jbInit() throws Exception { - this.setMenuBar(jMenuBar1); + setMenuBar(jMenuBar1); fileMenu.setLabel("File"); coloursMenu.setLabel("Colours"); mapping.setLabel("View Mapping"); - mapping.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - mapping_actionPerformed(); - } - }); + mapping.addActionListener(this); wire.setLabel("Wireframe"); - wire.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - wire_actionPerformed(); - } - }); + wire.addItemListener(this); depth.setState(true); depth.setLabel("Depthcue"); - depth.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - depth_actionPerformed(); - } - }); + depth.addItemListener(this); zbuffer.setState(true); zbuffer.setLabel("Z Buffering"); - zbuffer.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent e) - { - zbuffer_actionPerformed(); - } - }); + zbuffer.addItemListener(this); charge.setLabel("Charge & Cysteine"); - charge.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - charge_actionPerformed(); - } - }); + charge.addActionListener(this); hydro.setLabel("Hydrophobicity"); - hydro.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - hydro_actionPerformed(); - } - }); + hydro.addActionListener(this); chain.setLabel("By Chain"); - chain.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e) - { - chain_actionPerformed(); - } - }); + chain.addActionListener(this); seqButton.setLabel("By Sequence"); - seqButton.addActionListener(new ActionListener() - { - public void actionPerformed(ActionEvent e){ - seqButton_actionPerformed(); - } - }); + seqButton.addActionListener(this); allchains.setLabel("All Chains Visible"); - allchains.addItemListener(new ItemListener() - { - public void itemStateChanged(ItemEvent itemEvent) - { - allchains_itemStateChanged(itemEvent); - } - }); + allchains.addItemListener(this); + viewMenu.setLabel("View"); + zappo.setLabel("Zappo"); + zappo.addActionListener(this); + taylor.setLabel("Taylor"); + taylor.addActionListener(this); + helix.setLabel("Helix Propensity"); + helix.addActionListener(this); + strand.setLabel("Strand Propensity"); + strand.addActionListener(this); + turn.setLabel("Turn Propensity"); + turn.addActionListener(this); + buried.setLabel("Buried Index"); + buried.addActionListener(this); + user.setLabel("User Defined..."); + user.addActionListener(this); jMenuBar1.add(fileMenu); jMenuBar1.add(coloursMenu); - fileMenu.add(mapping);; + jMenuBar1.add(viewMenu); + fileMenu.add(mapping);; coloursMenu.add(seqButton); coloursMenu.add(chain); - coloursMenu.add(hydro); coloursMenu.add(charge); - coloursMenu.addSeparator(); - coloursMenu.add(wire); - coloursMenu.add(depth); - coloursMenu.add(zbuffer); - coloursMenu.add(allchains); + coloursMenu.add(zappo); + coloursMenu.add(taylor); + coloursMenu.add(hydro); + coloursMenu.add(helix); + coloursMenu.add(strand); + coloursMenu.add(turn); + coloursMenu.add(buried); + coloursMenu.add(user); + viewMenu.add(wire); + viewMenu.add(depth); + viewMenu.add(zbuffer); + viewMenu.add(allchains); allchains.setState(true); } @@ -178,27 +194,27 @@ public class AppletPDBViewer extends Frame MenuItem seqButton = new MenuItem(); CheckboxMenuItem allchains = new CheckboxMenuItem(); + Menu viewMenu = new Menu(); + MenuItem turn = new MenuItem(); + MenuItem strand = new MenuItem(); + MenuItem helix = new MenuItem(); + MenuItem taylor = new MenuItem(); + MenuItem zappo = new MenuItem(); + MenuItem buried = new MenuItem(); + MenuItem user = new MenuItem(); public void charge_actionPerformed() { - clearButtonGroup(); + pdbcanvas.bysequence = false; pdbcanvas.pdb.setChargeColours(); pdbcanvas.redrawneeded=true; pdbcanvas.repaint(); } - public void hydro_actionPerformed() - { - clearButtonGroup(); - pdbcanvas.pdb.setHydrophobicityColours(); - pdbcanvas.redrawneeded=true; - pdbcanvas.repaint(); - } - public void chain_actionPerformed() { - clearButtonGroup(); - pdbcanvas.pdb.setChainColours(); + pdbcanvas.bysequence = false; + pdbcanvas.pdb.setChainColours(); pdbcanvas.redrawneeded=true; pdbcanvas.repaint(); } @@ -226,17 +242,11 @@ public class AppletPDBViewer extends Frame public void seqButton_actionPerformed() { - clearButtonGroup(); pdbcanvas.bysequence = true; pdbcanvas.updateSeqColours(); pdbcanvas.repaint(); } - void clearButtonGroup() - { - pdbcanvas.bysequence = false; - pdbcanvas.bymolecule = false; - } public void mapping_actionPerformed() { @@ -248,8 +258,9 @@ public class AppletPDBViewer extends Frame cap.setText(pdbcanvas.mappingDetails.toString()); } - public void allchains_itemStateChanged(ItemEvent itemEvent) + public void allchains_itemStateChanged() { pdbcanvas.setAllchainsVisible(allchains.getState()); } + }