Exact mapping for applet as well

[jalview.git] / src / MCview / AppletPDBViewer.java

diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java
index e704f15..3f4e42c 100755 (executable)
--- a/src/MCview/AppletPDBViewer.java
+++ b/src/MCview/AppletPDBViewer.java
@@ -87,61 +87,59 @@ public class AppletPDBViewer extends Frame
           }\r
         });\r
         charge.setLabel("Charge & Cysteine");\r
-        charge.addItemListener(new ItemListener()\r
+        charge.addActionListener(new ActionListener()\r
         {\r
-          public void itemStateChanged(ItemEvent e)\r
+          public void actionPerformed(ActionEvent e)\r
           {\r
             charge_actionPerformed();\r
           }\r
         });\r
         hydro.setLabel("Hydrophobicity");\r
-        hydro.addItemListener(new ItemListener()\r
+        hydro.addActionListener(new ActionListener()\r
         {\r
-          public void itemStateChanged(ItemEvent e)\r
+          public void actionPerformed(ActionEvent e)\r
           {\r
             hydro_actionPerformed();\r
           }\r
         });\r
         chain.setLabel("By Chain");\r
-        chain.addItemListener(new ItemListener()\r
+        chain.addActionListener(new ActionListener()\r
         {\r
-          public void itemStateChanged(ItemEvent e)\r
+          public void actionPerformed(ActionEvent e)\r
           {\r
             chain_actionPerformed();\r
           }\r
         });\r
-        seqButton.setState(true);\r
         seqButton.setLabel("By Sequence");\r
-        seqButton.addItemListener(new ItemListener()\r
+        seqButton.addActionListener(new ActionListener()\r
         {\r
-          public void itemStateChanged(ItemEvent e)\r
-          {\r
+          public void actionPerformed(ActionEvent e){\r
             seqButton_actionPerformed();\r
           }\r
         });\r
-        molecule.setLabel("By Molecule");\r
-        molecule.addItemListener(new ItemListener()\r
-        {\r
-          public void itemStateChanged(ItemEvent e)\r
-          {\r
-            molecule_actionPerformed();\r
-          }\r
-        });\r
-        jMenuBar1.add(fileMenu);\r
+    allchains.setLabel("All Chains Visible");\r
+    allchains.addItemListener(new ItemListener()\r
+    {\r
+      public void itemStateChanged(ItemEvent itemEvent)\r
+      {\r
+        allchains_itemStateChanged(itemEvent);\r
+      }\r
+    });\r
+    jMenuBar1.add(fileMenu);\r
         jMenuBar1.add(coloursMenu);\r
         fileMenu.add(mapping);;\r
 \r
         coloursMenu.add(seqButton);\r
         coloursMenu.add(chain);\r
-        coloursMenu.add(hydro);\r
-        coloursMenu.add(charge);\r
-        coloursMenu.addSeparator();\r
+    coloursMenu.add(hydro);\r
+    coloursMenu.add(charge);\r
+    coloursMenu.addSeparator();\r
         coloursMenu.add(wire);\r
         coloursMenu.add(depth);\r
         coloursMenu.add(zbuffer);\r
-        coloursMenu.add(molecule);\r
-\r
-      }\r
+    coloursMenu.add(allchains);\r
+    allchains.setState(true);\r
+  }\r
 \r
       MenuBar jMenuBar1 = new MenuBar();\r
       Menu fileMenu = new Menu();\r
@@ -151,15 +149,15 @@ public class AppletPDBViewer extends Frame
       CheckboxMenuItem wire = new CheckboxMenuItem();\r
       CheckboxMenuItem depth = new CheckboxMenuItem();\r
       CheckboxMenuItem zbuffer = new CheckboxMenuItem();\r
-      CheckboxMenuItem charge = new CheckboxMenuItem();\r
 \r
+      MenuItem charge = new MenuItem();\r
+      MenuItem hydro = new MenuItem();\r
+      MenuItem chain = new MenuItem();\r
+      MenuItem seqButton = new MenuItem();\r
 \r
-      CheckboxMenuItem hydro = new CheckboxMenuItem();\r
-      CheckboxMenuItem chain = new CheckboxMenuItem();\r
-      CheckboxMenuItem seqButton = new CheckboxMenuItem();\r
-      CheckboxMenuItem molecule = new CheckboxMenuItem();\r
+     CheckboxMenuItem allchains = new CheckboxMenuItem();\r
 \r
-       public void charge_actionPerformed()\r
+  public void charge_actionPerformed()\r
       {\r
         clearButtonGroup();\r
         pdbcanvas.pdb.setChargeColours();\r
@@ -190,13 +188,6 @@ public class AppletPDBViewer extends Frame
         pdbcanvas.repaint();\r
       }\r
 \r
-      public void molecule_actionPerformed()\r
-      {\r
-        pdbcanvas.bymolecule = ! pdbcanvas.bymolecule;\r
-        pdbcanvas.redrawneeded=true;\r
-        pdbcanvas.repaint();\r
-      }\r
-\r
       public void depth_actionPerformed()\r
       {\r
       pdbcanvas.depthcue = ! pdbcanvas.depthcue;\r
@@ -214,7 +205,7 @@ public class AppletPDBViewer extends Frame
       public void seqButton_actionPerformed()\r
       {\r
         clearButtonGroup();\r
-        pdbcanvas.bysequence = seqButton.getState();\r
+        pdbcanvas.bysequence = true;\r
         pdbcanvas.updateSeqColours();\r
       }\r
 \r
@@ -233,4 +224,9 @@ public class AppletPDBViewer extends Frame
         jalview.bin.JalviewLite.addFrame(frame, "PDB - Sequence Mapping", 500, 600);\r
         cap.setText(pdbcanvas.mappingDetails.toString());\r
       }\r
-    }\r
+\r
+      public void allchains_itemStateChanged(ItemEvent itemEvent)\r
+      {\r
+        pdbcanvas.setAllchainsVisible(allchains.getState());\r
+      }\r
+}\r