X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAlignFrame.java;h=ada24212a7cde6f093560fbbd8e838934d3c36a1;hb=65310fba3ddf0942d5f868130bca9e093888ce7a;hp=e4ed302efb3e345694029be10ffc855d8be8b12b;hpb=97173a9190084b142021b3822e383de600a2e8a2;p=jalview.git

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index e4ed302..ada2421 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -13,7 +13,7 @@
  * 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
+ * along with this program; if not, write to the Free Softwarechang
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 package jalview.gui;
@@ -97,11 +97,9 @@ public class AlignFrame
   /* Set up intrinsic listeners for dynamically generated GUI bits. */
   private void addServiceListeners()
   {
-
-    final AlignFrame thisFrame = this;
     final java.beans.PropertyChangeListener thisListener;
     // Do this once to get current state
-    thisFrame.BuildWebServiceMenu();
+    BuildWebServiceMenu();
     Desktop.discoverer.addPropertyChangeListener(
         thisListener = new java.beans.PropertyChangeListener()
     {
@@ -111,7 +109,7 @@ public class AlignFrame
         if (evt.getPropertyName().equals("services"))
         {
           // System.out.println("Rebuilding web service menu");
-          thisFrame.BuildWebServiceMenu();
+          BuildWebServiceMenu();
         }
       }
     });
@@ -123,6 +121,7 @@ public class AlignFrame
       {
         // System.out.println("deregistering discoverer listener");
         Desktop.discoverer.removePropertyChangeListener(thisListener);
+        closeMenuItem_actionPerformed(null);
       }
       ;
     });
@@ -264,7 +263,8 @@ public class AlignFrame
       {
         java.io.PrintWriter out = new java.io.PrintWriter(
             new java.io.FileWriter(file));
-        out.println(output);
+
+        out.print(output);
         out.close();
         return true;
       }
@@ -348,6 +348,7 @@ public class AlignFrame
   {
     try
     {
+      PaintRefresher.components.remove(viewport.alignment);
       this.setClosed(true);
     }
     catch (Exception ex)
@@ -409,6 +410,7 @@ public class AlignFrame
     redoList.push(new HistoryItem(hi.getDescription(), viewport.alignment,
                                   HistoryItem.HIDE));
     restoreHistoryItem(hi);
+    resetAllColourSchemes();
   }
 
   /**
@@ -422,7 +424,7 @@ public class AlignFrame
     restoreHistoryItem(hi);
     updateEditMenuBar();
     viewport.updateConsensus();
-    alignPanel.repaint();
+    resetAllColourSchemes();
     alignPanel.repaint();
   }
 
@@ -705,6 +707,7 @@ public class AlignFrame
         viewport.alignment.getWidth();
         viewport.updateConservation();
         viewport.updateConsensus();
+        resetAllColourSchemes();
         alignPanel.repaint();
       }
     }
@@ -798,6 +801,7 @@ public class AlignFrame
 
     viewport.updateConservation();
     viewport.updateConsensus();
+    resetAllColourSchemes();
     alignPanel.repaint();
   }
 
@@ -907,6 +911,7 @@ public class AlignFrame
         }
       }
 
+      resetAllColourSchemes();
       alignPanel.repaint();
     }
   }
@@ -945,6 +950,7 @@ public class AlignFrame
         }
       }
 
+      resetAllColourSchemes();
       alignPanel.repaint();
     }
   }
@@ -959,7 +965,16 @@ public class AlignFrame
     addHistoryItem(new HistoryItem("Remove Gapped Columns",
                                    viewport.alignment, HistoryItem.HIDE));
 
+    //This is to maintain viewport position on first residue
+    //of first sequence
+    SequenceI seq = viewport.alignment.getSequenceAt(0);
+    int startRes = seq.findPosition(viewport.startRes);
+
     viewport.getAlignment().removeGaps();
+
+    viewport.setStartRes(seq.findIndex(startRes)-1);
+
+    resetAllColourSchemes();
     viewport.updateConservation();
     viewport.updateConsensus();
     alignPanel.repaint();
@@ -975,6 +990,12 @@ public class AlignFrame
     addHistoryItem(new HistoryItem("Remove Gaps", viewport.alignment,
                                    HistoryItem.HIDE));
 
+    //This is to maintain viewport position on first residue
+    //of first sequence
+    SequenceI seq = viewport.alignment.getSequenceAt(0);
+    int startRes = seq.findPosition(viewport.startRes);
+
+
     SequenceI current;
     int jSize;
 
@@ -1016,11 +1037,58 @@ public class AlignFrame
       while (j < end && j < jSize);
     }
 
+    viewport.setStartRes(seq.findIndex(startRes)-1);
+
+
     viewport.updateConservation();
     viewport.updateConsensus();
+    resetAllColourSchemes();
     alignPanel.repaint();
   }
 
+
+  void resetAllColourSchemes()
+  {
+    ColourSchemeI cs = viewport.globalColourScheme;
+    if(cs!=null)
+    {
+        cs.setConsensus(viewport.vconsensus);
+        if(cs.conservationApplied())
+        {
+          Alignment al = (Alignment) viewport.alignment;
+          Conservation c = new Conservation("All",
+                                            ResidueProperties.propHash, 3,
+                                            al.getSequences(), 0,
+                                            al.getWidth() - 1);
+          c.calculate();
+          c.verdict(false, viewport.ConsPercGaps);
+
+          cs.setConservation(c);
+        }
+    }
+
+    if(viewport.getGlobalColourScheme()!=null
+       && viewport.getGlobalColourScheme() instanceof ClustalxColourScheme)
+    {
+      ((ClustalxColourScheme)viewport.getGlobalColourScheme()).
+          resetClustalX(viewport.alignment.getSequences(),
+                        viewport.alignment.getWidth());
+    }
+
+    int s, sSize = viewport.alignment.getGroups().size();
+    for(s=0; s<sSize; s++)
+    {
+      SequenceGroup sg = (SequenceGroup)viewport.alignment.getGroups().elementAt(s);
+      if(sg.cs!=null && sg.cs instanceof ClustalxColourScheme)
+      {
+        ((ClustalxColourScheme)sg.cs).resetClustalX(sg.sequences, sg.getWidth());
+      }
+
+      sg.recalcConservation();
+
+    }
+  }
+
   /**
    * DOCUMENT ME!
    *
@@ -1371,66 +1439,50 @@ public class AlignFrame
   {
     int threshold = 0;
 
-    if (viewport.getAbovePIDThreshold())
+    if(cs!=null)
     {
-      threshold = SliderPanel.setPIDSliderSource(alignPanel, cs,
-                                                 "Background");
-
-      if (cs instanceof ResidueColourScheme)
+      if (viewport.getAbovePIDThreshold())
       {
-        ( (ResidueColourScheme) cs).setThreshold(threshold,
-                                                 viewport.
-                                                 getIgnoreGapsConsensus());
+        threshold = SliderPanel.setPIDSliderSource(alignPanel, cs,
+                                                   "Background");
+
+        cs.setThreshold(threshold,
+                        viewport.getIgnoreGapsConsensus());
+
+        viewport.setGlobalColourScheme(cs);
       }
-      else if (cs instanceof ScoreColourScheme)
+      else
       {
-        ( (ScoreColourScheme) cs).setThreshold(threshold,
-                                               viewport.getIgnoreGapsConsensus());
+        cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
       }
 
-      viewport.setGlobalColourScheme(cs);
-    }
-    else if (cs instanceof ResidueColourScheme)
-    {
-      ( (ResidueColourScheme) cs).setThreshold(0,
-                                               viewport.getIgnoreGapsConsensus());
-    }
-    else if (cs instanceof ScoreColourScheme)
-    {
-      ( (ScoreColourScheme) cs).setThreshold(0, viewport.getIgnoreGapsConsensus());
-    }
-
-    if (viewport.getConservationSelected())
-    {
-      ConservationColourScheme ccs = null;
-
-      Alignment al = (Alignment) viewport.alignment;
-      Conservation c = new Conservation("All",
-                                        ResidueProperties.propHash, 3,
-                                        al.getSequences(), 0,
-                                        al.getWidth() - 1);
+      if (viewport.getConservationSelected())
+      {
 
-      c.calculate();
-      c.verdict(false, viewport.ConsPercGaps);
+        Alignment al = (Alignment) viewport.alignment;
+        Conservation c = new Conservation("All",
+                                          ResidueProperties.propHash, 3,
+                                          al.getSequences(), 0,
+                                          al.getWidth() - 1);
 
-      ccs = new ConservationColourScheme(c, cs);
+        c.calculate();
+        c.verdict(false, viewport.ConsPercGaps);
 
-      viewport.setGlobalColourScheme(ccs);
+        cs.setConservation(c);
 
-      ccs.inc = SliderPanel.setConservationSlider(alignPanel, ccs,
-                                                  "Background");
-    }
-    else
-    {
-      // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-      if (cs != null)
+        cs.setConservationInc(SliderPanel.setConservationSlider(alignPanel, cs,
+            "Background"));
+      }
+      else
       {
-        cs.setConsensus(viewport.vconsensus);
+        cs.setConservation(null);
       }
 
-      viewport.setGlobalColourScheme(cs);
+      cs.setConsensus(viewport.vconsensus);
     }
 
+    viewport.setGlobalColourScheme(cs);
+
     if (viewport.getColourAppliesToAllGroups())
     {
       Vector groups = viewport.alignment.getGroups();
@@ -1442,8 +1494,10 @@ public class AlignFrame
         if (cs == null)
         {
           sg.cs = null;
+          continue;
         }
-        else if (cs instanceof ClustalxColourScheme)
+
+        if (cs instanceof ClustalxColourScheme)
         {
           sg.cs = new ClustalxColourScheme(sg.sequences, sg.getWidth());
         }
@@ -1462,22 +1516,19 @@ public class AlignFrame
           }
         }
 
-        if (viewport.getAbovePIDThreshold())
+        if (viewport.getAbovePIDThreshold()
+            || cs instanceof PIDColourScheme
+            || cs instanceof Blosum62ColourScheme)
         {
-          if (sg.cs instanceof ResidueColourScheme)
-          {
-            ( (ResidueColourScheme) sg.cs).setThreshold(threshold,
-                viewport.getIgnoreGapsConsensus());
-          }
-          else if (sg.cs instanceof ScoreColourScheme)
-          {
-            ( (ScoreColourScheme) sg.cs).setThreshold(threshold,
+         sg.cs.setThreshold(threshold,
                 viewport.getIgnoreGapsConsensus());
-          }
 
           sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
               sg.getWidth()));
         }
+        else
+          sg.cs.setThreshold(0, viewport.getIgnoreGapsConsensus());
+
 
         if (viewport.getConservationSelected())
         {
@@ -1487,21 +1538,10 @@ public class AlignFrame
                                             viewport.alignment.getWidth() - 1);
           c.calculate();
           c.verdict(false, viewport.ConsPercGaps);
-
-          ConservationColourScheme ccs = new ConservationColourScheme(c,
-              sg.cs);
-
-          // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-          ccs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-                                                 sg.getWidth()));
-          sg.cs = ccs;
-        }
-        else if (cs != null)
-        {
-          // MUST NOTIFY THE COLOURSCHEME OF CONSENSUS!
-          sg.cs.setConsensus(AAFrequency.calculate(sg.sequences, 0,
-              sg.getWidth()));
+          sg.cs.setConservation(c);
         }
+        else
+          sg.cs.setConservation(null);
       }
     }
 
@@ -1520,7 +1560,7 @@ public class AlignFrame
    */
   protected void modifyPID_actionPerformed(ActionEvent e)
   {
-    if (viewport.getAbovePIDThreshold())
+    if (viewport.getAbovePIDThreshold() && viewport.globalColourScheme!=null)
     {
       SliderPanel.setPIDSliderSource(alignPanel,
                                      viewport.getGlobalColourScheme(),
@@ -1536,7 +1576,7 @@ public class AlignFrame
    */
   protected void modifyConservation_actionPerformed(ActionEvent e)
   {
-    if (viewport.getConservationSelected())
+    if (viewport.getConservationSelected() && viewport.globalColourScheme!=null)
     {
       SliderPanel.setConservationSlider(alignPanel,
                                         viewport.globalColourScheme,
@@ -1557,16 +1597,7 @@ public class AlignFrame
     viewport.setAbovePIDThreshold(false);
     abovePIDThreshold.setSelected(false);
 
-    ColourSchemeI cs = viewport.getGlobalColourScheme();
-
-    if (cs instanceof ConservationColourScheme)
-    {
-      changeColour( ( (ConservationColourScheme) cs).cs);
-    }
-    else
-    {
-      changeColour(cs);
-    }
+    changeColour(viewport.getGlobalColourScheme());
 
     modifyConservation_actionPerformed(null);
   }
@@ -1585,14 +1616,7 @@ public class AlignFrame
 
     ColourSchemeI cs = viewport.getGlobalColourScheme();
 
-    if (cs instanceof ConservationColourScheme)
-    {
-      changeColour( ( (ConservationColourScheme) cs).cs);
-    }
-    else
-    {
-      changeColour(cs);
-    }
+    changeColour(viewport.getGlobalColourScheme());
 
     modifyPID_actionPerformed(null);
   }
@@ -1638,8 +1662,37 @@ public class AlignFrame
 
       while (userColours.hasMoreElements())
       {
-        JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.
+        final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(userColours.
             nextElement().toString());
+        radioItem.setName("USER_DEFINED");
+        radioItem.addMouseListener(new MouseAdapter()
+            {
+              public void mousePressed(MouseEvent evt)
+              {
+                if(evt.isControlDown() || SwingUtilities.isRightMouseButton(evt))
+                {
+                  radioItem.removeActionListener(radioItem.getActionListeners()[0]);
+
+                  int option = JOptionPane.showInternalConfirmDialog(jalview.gui.Desktop.desktop,
+                      "Remove from default list?",
+                      "Remove user defined colour",
+                      JOptionPane.YES_NO_OPTION);
+                  if(option == JOptionPane.YES_OPTION)
+                  {
+                    jalview.gui.UserDefinedColours.removeColourFromDefaults(radioItem.getText());
+                    colourMenu.remove(radioItem);
+                  }
+                  else
+                    radioItem.addActionListener(new ActionListener()
+                    {
+                      public void actionPerformed(ActionEvent evt)
+                      {
+                        userDefinedColour_actionPerformed(evt);
+                      }
+                    });
+                }
+              }
+            });
         radioItem.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent evt)
@@ -1647,6 +1700,7 @@ public class AlignFrame
             userDefinedColour_actionPerformed(evt);
           }
         });
+
         colourMenu.insert(radioItem, 15);
         colours.add(radioItem);
       }
@@ -2125,6 +2179,11 @@ public class AlignFrame
     }
   }
 
+
+  public TreePanel ShowNewickTree(NewickFile nf, String title)
+  {
+    return ShowNewickTree(nf,title,600,500,4,5);
+  }
   /**
    * DOCUMENT ME!
    *
@@ -2133,7 +2192,7 @@ public class AlignFrame
    *
    * @return DOCUMENT ME!
    */
-  public TreePanel ShowNewickTree(NewickFile nf, String title)
+  public TreePanel ShowNewickTree(NewickFile nf, String title, int w,int h,int x, int y)
   {
     TreePanel tp = null;
 
@@ -2147,7 +2206,14 @@ public class AlignFrame
                            viewport.getAlignment().getSequences(), nf,
                            "FromFile",
                            title);
-        Desktop.addInternalFrame(tp, title, 600, 500);
+
+        tp.setSize(w,h);
+
+        if(x>0 && y>0)
+          tp.setLocation(x,y);
+
+
+        Desktop.addInternalFrame(tp, title, w, h);
         addTreeMenuItem(tp, title);
       }
     }