From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 23 Nov 2006 11:57:32 +0000 (+0000)
Subject: Associate PCA with multiple views
X-Git-Tag: Release_2_2~46
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=291f2e12795d442d6b0bf9e4fb9570b258194925;p=jalview.git

Associate PCA with multiple views
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index c1d1087..3291dca 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -2515,7 +2515,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       return;
     }
 
-     new PCAPanel(viewport);
+     new PCAPanel(alignPanel);
   }
 
 
diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java
index 1abeb4f..90cd8e6 100755
--- a/src/jalview/gui/PCAPanel.java
+++ b/src/jalview/gui/PCAPanel.java
@@ -43,6 +43,7 @@ public class PCAPanel extends GPCAPanel implements Runnable
     PCA pca;
     int top;
     RotatableCanvas rc;
+    AlignmentPanel ap;
     AlignViewport av;
     AlignmentView seqstrings;
     SequenceI  [] seqs;
@@ -53,9 +54,10 @@ public class PCAPanel extends GPCAPanel implements Runnable
      * @param av DOCUMENT ME!
      * @param s DOCUMENT ME!
      */
-    public PCAPanel(AlignViewport av)
+    public PCAPanel(AlignmentPanel ap)
     {
-        this.av = av;
+        this.av = ap.av;
+        this.ap = ap;
 
         boolean sameLength = true;
 
@@ -97,7 +99,10 @@ public class PCAPanel extends GPCAPanel implements Runnable
                                400, 400);
 
 
-        rc = new RotatableCanvas(av);
+
+        PaintRefresher.Register(this, av.getSequenceSetId());
+
+        rc = new RotatableCanvas(ap);
         this.getContentPane().add(rc, BorderLayout.CENTER);
         Thread worker = new Thread(this);
         worker.start();
@@ -413,4 +418,68 @@ public class PCAPanel extends GPCAPanel implements Runnable
          im.writeImage();
        }
     }
+
+
+    public void viewMenu_menuSelected()
+    {
+      buildAssociatedViewMenu();
+    }
+
+
+    void buildAssociatedViewMenu()
+    {
+      AlignmentPanel [] aps = PaintRefresher.getAssociatedPanels(av.getSequenceSetId());
+      if(aps.length==1 && rc.av ==aps[0].av)
+      {
+        associateViewsMenu.setVisible(false);
+        return;
+      }
+
+      associateViewsMenu.setVisible(true);
+
+      if( (viewMenu.getItem(viewMenu.getItemCount()-2) instanceof JMenuItem))
+      {
+        viewMenu.insertSeparator(viewMenu.getItemCount()-1);
+      }
+
+      associateViewsMenu.removeAll();
+
+
+      JRadioButtonMenuItem item;
+      ButtonGroup buttonGroup = new ButtonGroup();
+      int i, iSize = aps.length;
+      final PCAPanel thisPCAPanel = this;
+      for(i=0; i<iSize; i++)
+      {
+          final AlignmentPanel ap = aps[i];
+          item = new JRadioButtonMenuItem(ap.av.viewName, ap.av==rc.av );
+          buttonGroup.add(item);
+          item.addActionListener(new ActionListener()
+              {
+                public void actionPerformed(ActionEvent evt)
+                {
+                  rc.applyToAllViews = false;
+                  rc.av = ap.av;
+                  rc.ap = ap;
+                  PaintRefresher.Register(thisPCAPanel, ap.av.getSequenceSetId());
+                }
+              });
+
+          associateViewsMenu.add(item);
+      }
+
+      final JRadioButtonMenuItem itemf =
+          new JRadioButtonMenuItem("All Views", rc.applyToAllViews);
+      buttonGroup.add(itemf);
+      itemf.addActionListener(new ActionListener()
+      {
+        public void actionPerformed(ActionEvent evt)
+        {
+          rc.applyToAllViews = itemf.isSelected();
+        }
+      });
+      associateViewsMenu.add(itemf);
+
+    }
+
   }
diff --git a/src/jalview/gui/RotatableCanvas.java b/src/jalview/gui/RotatableCanvas.java
index 9007e4f..be1d3f5 100755
--- a/src/jalview/gui/RotatableCanvas.java
+++ b/src/jalview/gui/RotatableCanvas.java
@@ -72,13 +72,16 @@ public class RotatableCanvas extends JPanel implements MouseListener,
     int recty2;
     float scalefactor = 1;
     AlignViewport av;
+    AlignmentPanel ap;
     boolean showLabels = false;
     Color bgColour = Color.black;
+    boolean applyToAllViews = false;
 
     //  Controller    controller;
-    public RotatableCanvas(AlignViewport av)
+    public RotatableCanvas(AlignmentPanel ap)
     {
-      this.av = av;
+      this.av = ap.av;
+      this.ap = ap;
 
       addMouseWheelListener(new MouseWheelListener()
       {
@@ -113,7 +116,6 @@ public class RotatableCanvas extends JPanel implements MouseListener,
         ToolTipManager.sharedInstance().registerComponent(this);
         ToolTipManager.sharedInstance().setInitialDelay(0);
         ToolTipManager.sharedInstance().setDismissDelay(10000);
-        PaintRefresher.Register(this, av.getSequenceSetId());
 
         prefsize = getPreferredSize();
         orig = new float[npoint][3];
@@ -591,17 +593,24 @@ public class RotatableCanvas extends JPanel implements MouseListener,
 
         if (found != null)
         {
-            if (av.getSelectionGroup() != null)
+          AlignmentPanel[] aps = getAssociatedPanels();
+
+          for (int a = 0; a < aps.length; a++)
+          {
+            if (aps[a].av.getSelectionGroup() != null)
             {
-                av.getSelectionGroup().addOrRemove(found, true);
-                PaintRefresher.Refresh(this, av.getSequenceSetId());
+              aps[a].av.getSelectionGroup().addOrRemove(found, true);
             }
             else
             {
-                av.setSelectionGroup(new SequenceGroup());
-                av.getSelectionGroup().addOrRemove(found, true);
-                av.getSelectionGroup().setEndRes(av.alignment.getWidth()-1);
+              aps[a].av.setSelectionGroup(new SequenceGroup());
+              aps[a].av.getSelectionGroup().addOrRemove(found, true);
+              aps[a].av.getSelectionGroup().setEndRes(
+                  aps[a].av.alignment.getWidth() - 1);
             }
+          }
+
+          PaintRefresher.Refresh(this, av.getSequenceSetId());
         }
 
         repaint();
@@ -749,25 +758,14 @@ public class RotatableCanvas extends JPanel implements MouseListener,
         }
     }
 
-    /*  public boolean handleRubberbandEvent(RubberbandEvent evt) {
-        System.out.println("Rubberband handler called in RotatableCanvas with " +
-                           evt.getBounds());
-
-        Rubberband rb = (Rubberband)evt.getSource();
-
-        // Clear the current selection (instance variable)
-        //if ((rb.getModifiers() & Event.SHIFT_MASK) == 0) {
-        //   clearSelection();
-        //}
-
-        if (rb.getComponent() == this) {
-          Rectangle bounds = evt.getBounds();
-     rectSelect(bounds.x,bounds.y,bounds.x+bounds.width,bounds.y+bounds.height);
-        }
-
-        redrawneeded = true;
-        paint(this.getGraphics());
-
-        return true;
-      }*/
+    AlignmentPanel[] getAssociatedPanels()
+    {
+      if (applyToAllViews)
+      {
+        return PaintRefresher.getAssociatedPanels(av.getSequenceSetId());
+      }
+      else
+        return new AlignmentPanel[]
+            { ap };
+    }
 }
diff --git a/src/jalview/jbgui/GPCAPanel.java b/src/jalview/jbgui/GPCAPanel.java
index 0f88b75..74182f3 100755
--- a/src/jalview/jbgui/GPCAPanel.java
+++ b/src/jalview/jbgui/GPCAPanel.java
@@ -21,6 +21,8 @@ package jalview.jbgui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+import javax.swing.event.MenuListener;
+import javax.swing.event.MenuEvent;
 
 public class GPCAPanel
     extends JInternalFrame
@@ -41,10 +43,11 @@ public class GPCAPanel
   JMenuItem png = new JMenuItem();
   JMenuItem print = new JMenuItem();
   JMenuItem outputValues = new JMenuItem();
-  JMenu viewMenu = new JMenu();
+  protected JMenu viewMenu = new JMenu();
   protected JCheckBoxMenuItem showLabels = new JCheckBoxMenuItem();
   JMenuItem bgcolour = new JMenuItem();
   JMenuItem originalSeqData = new JMenuItem();
+  protected JMenu associateViewsMenu = new JMenu();
 
   public GPCAPanel()
   {
@@ -139,6 +142,21 @@ public class GPCAPanel
       }
     });
     viewMenu.setText("View");
+    viewMenu.addMenuListener(new MenuListener()
+    {
+      public void menuSelected(MenuEvent e)
+      {
+        viewMenu_menuSelected();
+      }
+
+      public void menuDeselected(MenuEvent e)
+      {
+      }
+
+      public void menuCanceled(MenuEvent e)
+      {
+      }
+    });
     showLabels.setText("Show Labels");
     showLabels.addActionListener(new ActionListener()
     {
@@ -164,6 +182,7 @@ public class GPCAPanel
         originalSeqData_actionPerformed(e);
       }
     });
+    associateViewsMenu.setText("Associate Nodes With");
     this.getContentPane().add(jPanel2, BorderLayout.SOUTH);
     jPanel2.add(jLabel1, null);
     jPanel2.add(xCombobox, null);
@@ -181,6 +200,7 @@ public class GPCAPanel
     saveMenu.add(png);
     viewMenu.add(showLabels);
     viewMenu.add(bgcolour);
+    viewMenu.add(associateViewsMenu);
   }
 
   protected void xCombobox_actionPerformed(ActionEvent e)
@@ -229,4 +249,9 @@ public class GPCAPanel
   {
 
   }
+
+  public void viewMenu_menuSelected()
+  {
+
+  }
 }