X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=cc9ad28312997976a4a26471e0062bc4640603b1;hb=237972562c84b83dbd287071cdd839d97aaf7d4b;hp=42934b91ebbd51b329810c55e841d3ab91fe37c3;hpb=6fcda37468514274f893bd4ccf39480ee36ee31d;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 42934b9..cc9ad28 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -64,7 +64,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   String fileName = null;
 
-  private int treeCount = 0;
 
   /**
    * Creates a new AlignFrame object.
@@ -159,7 +158,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   void addKeyListener()
   {
-      final AlignFrame af = this;
       addKeyListener(new KeyAdapter()
       {
         public void keyPressed(KeyEvent evt)
@@ -173,17 +171,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
           switch (evt.getKeyCode())
           {
-            case KeyEvent.VK_G:
-              Desktop.instance.gatherViews(af);
-              break;
-
-            case KeyEvent.VK_X:
-              if (!evt.isControlDown())
-              {
-                Desktop.instance.explodeViews(af);
-              }
-              break;
-
 
             case 27: // escape key
               deselectAllSequenceMenuItem_actionPerformed(null);
@@ -388,13 +375,12 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       if (aSize == 2)
       {
-        AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
-        tabbedPane.addTab(first.av.viewName==null?"Original":first.av.viewName,first);
-
-        this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+        setInitialTabVisible();
       }
 
-      tabbedPane.addTab(ap.av.viewName==null?"Original":ap.av.viewName, ap);
+      expandViews.setEnabled(true);
+      gatherViews.setEnabled(true);
+      tabbedPane.addTab(ap.av.viewName, ap);
 
       ap.setVisible(false);
     }
@@ -408,6 +394,16 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     }
   }
 
+  public void setInitialTabVisible()
+  {
+    expandViews.setEnabled(true);
+    gatherViews.setEnabled(true);
+    tabbedPane.setVisible(true);
+    AlignmentPanel first = (AlignmentPanel) alignPanels.firstElement();
+    tabbedPane.addTab(first.av.viewName,first);
+    this.getContentPane().add(tabbedPane, BorderLayout.CENTER);
+  }
+
 
   public AlignViewport getViewport()
   {
@@ -473,7 +469,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     abovePIDThreshold.setSelected(av.getAbovePIDThreshold());
     conservationMenuItem.setSelected(av.getConservationSelected());
     seqLimits.setSelected(av.getShowJVSuffix());
-    idRightAlign.setSelected(av.idsAlignRight);
+    idRightAlign.setSelected(av.rightAlignIds);
     renderGapsMenuItem.setSelected(av.renderGaps);
     wrapMenuItem.setSelected(av.wrapAlignment);
     annotationPanelMenuItem.setState(av.showAnnotation);
@@ -562,7 +558,22 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     {
       if(currentFileFormat.equals("Jalview"))
       {
-        this.closeMenuItem_actionPerformed(true);
+        JInternalFrame [] frames = Desktop.desktop.getAllFrames();
+        for(int i=0; i<frames.length; i++)
+        {
+          if (frames[i] instanceof AlignFrame
+              && frames[i] != this
+              && ( (AlignFrame) frames[i]).fileName.equals(fileName))
+          {
+            try{
+              frames[i].setSelected(true);
+              Desktop.instance.closeAssociatedWindows();
+            }catch(java.beans.PropertyVetoException ex){}
+          }
+
+        }
+        Desktop.instance.closeAssociatedWindows();
+
       }
       else
       {
@@ -878,13 +889,14 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         {
           int index = tabbedPane.getSelectedIndex();
 
-          tabbedPane.removeTabAt(index);
           alignPanels.removeElement(alignPanel);
           PaintRefresher.RemoveComponent(alignPanel.seqPanel.seqCanvas);
           PaintRefresher.RemoveComponent(alignPanel.idPanel.idCanvas);
           PaintRefresher.RemoveComponent(alignPanel);
           alignPanel = null;
           viewport = null;
+
+          tabbedPane.removeTabAt(index);
           tabbedPane.validate();
 
           if(index==tabbedPane.getTabCount())
@@ -962,10 +974,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     command.undoCommand();
 
     AlignViewport originalSource = getOriginatingSource(command);
-
-    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
     updateEditMenuBar();
-    originalSource.firePropertyChange("alignment", null,null);
+
+    if(originalSource!=null)
+    {
+      originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+      originalSource.firePropertyChange("alignment", null,null);
+    }
   }
 
   /**
@@ -980,15 +995,18 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     command.doCommand();
 
     AlignViewport originalSource = getOriginatingSource(command);
-    originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns()!=null;
-
     updateEditMenuBar();
-    originalSource.firePropertyChange("alignment", null, null);
+
+    if(originalSource!=null)
+    {
+      originalSource.hasHiddenColumns = viewport.colSel.getHiddenColumns() != null;
+      originalSource.firePropertyChange("alignment", null,null);
+    }
   }
 
   AlignViewport getOriginatingSource(CommandI command)
   {
-    AlignViewport originalSource = viewport;
+    AlignViewport originalSource = null;
     //For sequence removal and addition, we need to fire
    //the property change event FROM the viewport where the
    //original alignment was altered
@@ -998,6 +1016,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       AlignmentI al = editCommand.getAlignment();
       Vector comps = (Vector) PaintRefresher.components
           .get(viewport.getSequenceSetId());
+      System.out.println(comps.size());
       for (int i = 0; i < comps.size(); i++)
       {
         if (comps.elementAt(i) instanceof AlignmentPanel)
@@ -1009,7 +1028,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
           }
         }
       }
+      if (originalSource == null && al!=null)
+      {
+        //The original view is closed, we must validate
+        //the current view against the closed view first
+        PaintRefresher.validateSequences(al, viewport.alignment);
+        originalSource = viewport;
+      }
+
     }
+
+
     return originalSource;
   }
 
@@ -1708,11 +1737,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    */
   public void findMenuItem_actionPerformed(ActionEvent e)
   {
-    JInternalFrame frame = new JInternalFrame();
-    Finder finder = new Finder(viewport, alignPanel, frame);
-    frame.setContentPane(finder);
-    frame.setLayer(JLayeredPane.PALETTE_LAYER);
-    Desktop.addInternalFrame(frame, "Find", 340, 110);
+    new Finder();
   }
 
   public void newView_actionPerformed(ActionEvent e)
@@ -1721,12 +1746,32 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
         new Jalview2XML().copyAlignPanel(alignPanel, true);
 
     if (viewport.viewName == null)
-      viewport.viewName = "View 1";
+      viewport.viewName = "Original";
 
     newap.av.historyList = viewport.historyList;
     newap.av.redoList = viewport.redoList;
-    newap.av.viewName = "View " +
-        (Desktop.getViewCount(viewport.getSequenceSetId()) + 1);
+
+    int index = Desktop.getViewCount(viewport.getSequenceSetId());
+    String newViewName = "View " +index;
+
+    Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId());
+    Vector existingNames = new Vector();
+    for(int i=0; i<comps.size(); i++)
+    {
+      if(comps.elementAt(i) instanceof AlignmentPanel)
+      {
+        AlignmentPanel ap = (AlignmentPanel)comps.elementAt(i);
+        if(!existingNames.contains(ap.av.viewName))
+          existingNames.addElement(ap.av.viewName);
+      }
+    }
+
+    while(existingNames.contains(newViewName))
+    {
+      newViewName = "View "+ (++index);
+    }
+
+    newap.av.viewName = newViewName;
 
     addAlignmentPanel(newap, false);
 
@@ -1737,6 +1782,17 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
     tabbedPane.setSelectedIndex(tabbedPane.getTabCount() - 1);
   }
 
+  public void expandViews_actionPerformed(ActionEvent e)
+  {
+        Desktop.instance.explodeViews(this);
+  }
+
+  public void gatherViews_actionPerformed(ActionEvent e)
+  {
+    Desktop.instance.gatherViews(this);
+  }
+
+
 
   /**
    * DOCUMENT ME!
@@ -1764,7 +1820,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   public void idRightAlign_actionPerformed(ActionEvent e)
   {
-    viewport.idsAlignRight = idRightAlign.isSelected();
+    viewport.rightAlignIds = idRightAlign.isSelected();
     alignPanel.repaint();
   }
 
@@ -1962,112 +2018,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
   public void textColour_actionPerformed(ActionEvent e)
   {
-    int original1 = viewport.textColour.getRGB();
-    int original2 = viewport.textColour2.getRGB();
-    int thresh = viewport.thresholdTextColour;
-    final JSlider slider = new JSlider(0, 750, viewport.thresholdTextColour);
-    final JButton col1 = new JButton("DARK");
-    col1.setBackground(viewport.textColour);
-    col1.setForeground(viewport.textColour);
-    final JButton col2 = new JButton("LIGHT");
-    col2.setBackground(viewport.textColour2);
-    col2.setForeground(viewport.textColour2);
-    final JPanel bigpanel = new JPanel(new BorderLayout());
-    JPanel panel = new JPanel();
-    bigpanel.add(panel, BorderLayout.CENTER);
-    bigpanel.add(new JLabel(
-      "<html><i>Select a dark and light text colour, then set the threshold to"
-     +"<br>switch between colours, based on background colour</i></html>"),
-                 BorderLayout.NORTH);
-    panel.add(col1);
-    panel.add(slider);
-    panel.add(col2);
-
-    col1.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent e)
-          {
-            Color col = JColorChooser.showDialog(bigpanel,
-                                                 "Select Colour for Text",
-                                                 viewport.textColour);
-            if (col != null)
-            {
-              viewport.textColour = col;
-              col1.setBackground(col);
-              col1.setForeground(col);
-              if(viewport.colourAppliesToAllGroups)
-                setGroupTextColour();
-            }
-            alignPanel.repaint();
-          }
-        });
-
-    col2.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent e)
-      {
-        Color col = JColorChooser.showDialog(bigpanel,
-                                             "Select Colour for Text",
-                                             viewport.textColour);
-        if (col != null)
-        {
-          viewport.textColour2 = col;
-          col2.setBackground(col);
-          col2.setForeground(col);
-          if(viewport.colourAppliesToAllGroups)
-                setGroupTextColour();
-        }
-        alignPanel.repaint();
-      }
-    });
-
-
-    slider.addChangeListener(new ChangeListener()
-    {
-      public void stateChanged(ChangeEvent evt)
-      {
-        viewport.thresholdTextColour = slider.getValue();
-        if(viewport.colourAppliesToAllGroups)
-                setGroupTextColour();
-        alignPanel.repaint();
-      }
-    });
-
-    int reply = JOptionPane.showInternalOptionDialog(this,
-                                                 bigpanel,
-                                                 "Adjust Foreground Text Colour Threshold",
-                                                 JOptionPane.OK_CANCEL_OPTION,
-                                                 JOptionPane.QUESTION_MESSAGE,
-                                                 null,
-                                                 null, null);
-
-    if(reply==JOptionPane.CANCEL_OPTION)
-    {
-      viewport.textColour = new Color(original1);
-      viewport.textColour2 = new Color(original2);
-      viewport.thresholdTextColour = thresh;
-    }
+    new TextColourChooser().chooseColour(alignPanel, null);
   }
 
-  void setGroupTextColour()
-  {
-    if(viewport.alignment.getGroups()==null)
-      return;
-
-    Vector groups = viewport.alignment.getGroups();
-
-    for(int i=0; i<groups.size(); i++)
-    {
-      SequenceGroup sg = (SequenceGroup)groups.elementAt(i);
-      sg.textColour = viewport.textColour;
-      sg.textColour2 = viewport.textColour2;
-      sg.thresholdTextColour = viewport.thresholdTextColour;
-    }
-
-
-  }
-
-
   /**
    * DOCUMENT ME!
    *
@@ -2579,7 +2532,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       return;
     }
 
-     new PCAPanel(viewport);
+     new PCAPanel(alignPanel);
   }
 
 
@@ -2699,9 +2652,11 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
       tp = new TreePanel(alignPanel, type, pwType);
     }
 
-    addTreeMenuItem(tp, title);
+    title = title + " from " + this.title;
+    if(viewport.viewName!=null)
+      title+= " ("+viewport.viewName+")";
 
-    Desktop.addInternalFrame(tp, title + " from " + this.title, 600, 500);
+    Desktop.addInternalFrame(tp, title, 600, 500);
   }
 
   /**
@@ -2739,51 +2694,53 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
    * @param treePanel Displayed tree window.
    * @param title SortBy menu item title.
    */
-  void addTreeMenuItem(final TreePanel treePanel, String title)
+  public void buildTreeMenu()
   {
-    final JMenuItem item = new JMenuItem(title);
-
-    treeCount++;
-
-    if (treeCount == 1)
-    {
-      sort.add(sortByTreeMenu);
-    }
+    sortByTreeMenu.removeAll();
 
-    sortByTreeMenu.add(item);
-    item.addActionListener(new java.awt.event.ActionListener()
+    Vector comps = (Vector)PaintRefresher.components.get(viewport.getSequenceSetId());
+    Vector treePanels = new Vector();
+    int i, iSize = comps.size();
+    for(i=0; i<iSize; i++)
     {
-      public void actionPerformed(ActionEvent e)
+      if(comps.elementAt(i) instanceof TreePanel)
       {
-        SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
-        AlignmentSorter.sortByTree(viewport.getAlignment(),
-                                   treePanel.getTree());
+        treePanels.add(comps.elementAt(i));
+      }
+    }
 
-        addHistoryItem(new OrderCommand("Tree Sort",
-                                        oldOrder,
-                                        viewport.alignment));
+    iSize = treePanels.size();
 
+    if(iSize<1)
+    {
+      sortByTreeMenu.setVisible(false);
+      return;
+    }
 
-        alignPanel.repaint();
-      }
-    });
+    sortByTreeMenu.setVisible(true);
 
-    treePanel.addInternalFrameListener(new javax.swing.event.
-                                       InternalFrameAdapter()
+    for(i=0; i<treePanels.size(); i++)
     {
-      public void internalFrameClosed(
-          javax.swing.event.InternalFrameEvent evt)
+      TreePanel tp = (TreePanel)treePanels.elementAt(i);
+      final JMenuItem item = new JMenuItem(tp.getTitle());
+      final NJTree tree = ((TreePanel)treePanels.elementAt(i)).getTree();
+      item.addActionListener(new java.awt.event.ActionListener()
       {
-        treeCount--;
-        sortByTreeMenu.remove(item);
-
-        if (treeCount == 0)
+        public void actionPerformed(ActionEvent e)
         {
-          sort.remove(sortByTreeMenu);
+          SequenceI[] oldOrder = viewport.getAlignment().getSequencesArray();
+          AlignmentSorter.sortByTree(viewport.getAlignment(), tree);
+
+          addHistoryItem(new OrderCommand("Tree Sort",
+                                          oldOrder,
+                                          viewport.alignment));
+
+          alignPanel.repaint();
         }
-      }
-      ;
-    });
+      });
+
+      sortByTreeMenu.add(item);
+    }
   }
 
   /**
@@ -2939,7 +2896,6 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
 
 
         Desktop.addInternalFrame(tp, title, w, h);
-        addTreeMenuItem(tp, title);
       }
     }
     catch (Exception ex)