X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAppletPDBViewer.java;h=2c0080ee918a219a999eb8cece0d0ef914d36925;hb=c741c95ec8cb992908b6afb08dc86f9445a0ef27;hp=c3063a8bffa7008544e8f92966022c3498db6dce;hpb=8893c2ac9824d4c566ae69c73d34889c5316b058;p=jalview.git

diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java
index c3063a8..2c0080e 100755
--- a/src/MCview/AppletPDBViewer.java
+++ b/src/MCview/AppletPDBViewer.java
@@ -1,3 +1,21 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer
+ * Copyright (C) 2005 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
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program 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 PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
 package MCview;
 
 import java.awt.*;
@@ -5,6 +23,7 @@ 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;
 
@@ -103,7 +122,7 @@ public class AppletPDBViewer extends Frame
         {
           public void actionPerformed(ActionEvent e)
           {
-            hydro_actionPerformed();
+            pdbcanvas.setColours(new HydrophobicColourScheme());
           }
         });
         chain.setLabel("By Chain");
@@ -129,19 +148,84 @@ public class AppletPDBViewer extends Frame
         allchains_itemStateChanged(itemEvent);
       }
     });
+    viewMenu.setLabel("View");
+    zappo.setLabel("Zappo");
+    zappo.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        pdbcanvas.setColours(new ZappoColourScheme());
+      }
+    });
+    taylor.setLabel("Taylor");
+    taylor.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        pdbcanvas.setColours(new TaylorColourScheme());
+      }
+    });
+    helix.setLabel("Helix Propensity");
+    helix.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+       pdbcanvas.setColours(new HelixColourScheme());
+      }
+    });
+    strand.setLabel("Strand Propensity");
+    strand.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        pdbcanvas.setColours(new StrandColourScheme());
+      }
+    });
+    turn.setLabel("Turn Propensity");
+    turn.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        pdbcanvas.setColours(new TurnColourScheme());
+      }
+    });
+    buried.setLabel("Buried Index");
+    buried.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        pdbcanvas.setColours(new BuriedColourScheme());
+      }
+    });
+    user.setLabel("User Defined...");
+    user.addActionListener(new ActionListener()
+    {
+      public void actionPerformed(ActionEvent actionEvent)
+      {
+        pdbcanvas.bysequence = false;
+        new jalview.appletgui.UserDefinedColours(pdbcanvas);
+      }
+    });
     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);
   }
 
@@ -160,27 +244,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();
       }
@@ -208,17 +292,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()
       {
@@ -234,4 +312,5 @@ public class AppletPDBViewer extends Frame
       {
         pdbcanvas.setAllchainsVisible(allchains.getState());
       }
+
 }