X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=b275611b74cd426731f481678960d0655f120c4d;hb=7cf75b5b379dd71b3480726419c7dc55d8e01f0e;hp=05a52dd26e0d9a58b2bb7f96906ccb1e6adf0c26;hpb=f4fd7b0e74572c8fddbfe9e3e55bc624f8ba0c6a;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 05a52dd..b275611 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -51,9 +51,6 @@ public class AlignViewport
     boolean renderGaps = true;
     boolean showSequenceFeatures = false;
     boolean showAnnotation = true;
-    boolean showConservation = true;
-    boolean showQuality = true;
-    boolean showIdentity = true;
     boolean colourAppliesToAllGroups = true;
     ColourSchemeI globalColourScheme = null;
     boolean conservationColourSelected = false;
@@ -84,7 +81,7 @@ public class AlignViewport
 
 
     /** DOCUMENT ME!! */
-    public Vector vconsensus;
+    public Hashtable [] hconsensus;
     AlignmentAnnotation consensus;
     AlignmentAnnotation conservation;
     AlignmentAnnotation quality;
@@ -104,13 +101,17 @@ public class AlignViewport
 
     boolean padGaps = false;
 
+    Rectangle explodedPosition;
+
+    String viewName;
+
+    String sequenceSetID;
+
+    boolean gatherViewsHere = false;
+
+    Stack historyList = new Stack();
+    Stack redoList = new Stack();
 
-    public AlignViewport(AlignmentI al, boolean dataset)
-    {
-      isDataset = dataset;
-      setAlignment(al);
-      init();
-    }
     /**
      * Creates a new AlignViewport object.
      *
@@ -147,14 +148,10 @@ public class AlignViewport
 
       showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
       showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
-      showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
-
-      showQuality = Cache.getDefault("SHOW_QUALITY", true);
-      showIdentity = Cache.getDefault("SHOW_IDENTITY", true);
 
       autoCalculateConsensus = Cache.getDefault("AUTO_CALC_CONSENSUS", true);
 
-      padGaps = Cache.getDefault("PAD_GAPS", false);
+      padGaps = Cache.getDefault("PAD_GAPS", true);
 
        String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
        String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "") ;
@@ -173,16 +170,52 @@ public class AlignViewport
 
        setFont(new Font(fontName, style, Integer.parseInt(fontSize)));
 
-
        alignment.setGapCharacter( Cache.getDefault("GAP_SYMBOL", "-").charAt(0) );
 
 
         // We must set conservation and consensus before setting colour,
         // as Blosum and Clustal require this to be done
-        if(vconsensus==null && !isDataset)
+        if(hconsensus==null && !isDataset)
         {
-          updateConservation();
-          updateConsensus();
+          if(!alignment.isNucleotide())
+          {
+            conservation = new AlignmentAnnotation("Conservation",
+                "Conservation of total alignment less than " +
+                ConsPercGaps + "% gaps",
+                new Annotation[1], 0f,
+                11f,
+                AlignmentAnnotation.BAR_GRAPH);
+            conservation.hasText = true;
+
+
+            if (Cache.getDefault("SHOW_CONSERVATION", true))
+            {
+              alignment.addAnnotation(conservation);
+            }
+
+            if (Cache.getDefault("SHOW_QUALITY", true))
+            {
+              quality = new AlignmentAnnotation("Quality",
+                                                "Alignment Quality based on Blosum62 scores",
+                                                new Annotation[1],
+                                                0f,
+                                                11f,
+                                                AlignmentAnnotation.BAR_GRAPH);
+              quality.hasText = true;
+
+              alignment.addAnnotation(quality);
+            }
+          }
+
+          consensus = new AlignmentAnnotation("Consensus", "PID",
+                                               new Annotation[1], 0f, 100f,
+                                               AlignmentAnnotation.BAR_GRAPH);
+          consensus.hasText = true;
+
+           if (Cache.getDefault("SHOW_IDENTITY", true))
+           {
+             alignment.addAnnotation(consensus);
+           }
         }
 
         if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
@@ -198,9 +231,11 @@ public class AlignViewport
 
             if (globalColourScheme != null)
             {
-                globalColourScheme.setConsensus(vconsensus);
+                globalColourScheme.setConsensus(hconsensus);
             }
         }
+
+        wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false);
     }
 
 
@@ -220,229 +255,301 @@ public class AlignViewport
       return showSequenceFeatures;
     }
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void updateConservation()
-    {
-      if(alignment.isNucleotide())
-          return;
 
-      try{
-        Conservation cons = new jalview.analysis.Conservation("All",
-            jalview.schemes.ResidueProperties.propHash, 3,
-            alignment.getSequences(), 0, alignment.getWidth() - 1);
-        cons.calculate();
-        cons.verdict(false, ConsPercGaps);
-        cons.findQuality();
 
-        int alWidth = alignment.getWidth();
-        Annotation[] annotations = new Annotation[alWidth];
-        Annotation[] qannotations = new Annotation[alWidth];
-        String sequence = cons.getConsSequence().getSequence();
-        float minR;
-        float minG;
-        float minB;
-        float maxR;
-        float maxG;
-        float maxB;
-        minR = 0.3f;
-        minG = 0.0f;
-        minB = 0f;
-        maxR = 1.0f - minR;
-        maxG = 0.9f - minG;
-        maxB = 0f - minB; // scalable range for colouring both Conservation and Quality
-
-        float min = 0f;
-        float max = 11f;
-        float qmin = cons.qualityRange[0].floatValue();
-        float qmax = cons.qualityRange[1].floatValue();
-
-        for (int i = 0; i < alWidth; i++)
+    class ConservationThread extends Thread
+    {
+      AlignmentPanel ap;
+      public ConservationThread(AlignmentPanel ap)
+      {
+        this.ap = ap;
+      }
+
+      public void run()
+      {
+        try
         {
-          float value = 0;
+          updatingConservation = true;
 
-          try
+          while (UPDATING_CONSERVATION)
           {
-            value = Integer.parseInt(sequence.charAt(i) + "");
-          }
-          catch (Exception ex)
-          {
-            if (sequence.charAt(i) == '*')
+            try
             {
-              value = 11;
+              if (ap != null)
+              {
+                ap.repaint();
+              }
+              Thread.sleep(200);
             }
-
-            if (sequence.charAt(i) == '+')
+            catch (Exception ex)
             {
-              value = 10;
+              ex.printStackTrace();
             }
           }
 
-          float vprop = value - min;
-          vprop /= max;
-          annotations[i] = new Annotation(sequence.charAt(i) + "",
-                                          String.valueOf(value), ' ', value,
-                                          new Color(minR + (maxR * vprop),
-              minG + (maxG * vprop),
-              minB + (maxB * vprop)));
-
-          // Quality calc
-          value = ( (Double) cons.quality.get(i)).floatValue();
-          vprop = value - qmin;
-          vprop /= qmax;
-          qannotations[i] = new Annotation(" ", String.valueOf(value), ' ',
-                                           value,
-                                           new Color(minR + (maxR * vprop),
-              minG + (maxG * vprop),
-              minB + (maxB * vprop)));
-        }
+          UPDATING_CONSERVATION = true;
 
-        if (conservation == null)
-        {
-          conservation = new AlignmentAnnotation("Conservation",
-                                                 "Conservation of total alignment less than " +
-                                                 ConsPercGaps + "% gaps",
-                                                 annotations, 0f, // cons.qualityRange[0].floatValue(),
-                                                 11f, // cons.qualityRange[1].floatValue()
-                                                 AlignmentAnnotation.BAR_GRAPH);
-
-          if (showConservation)
+
+          int alWidth = alignment.getWidth();
+          if(alWidth<0)
+            return;
+
+          Conservation cons = new jalview.analysis.Conservation("All",
+              jalview.schemes.ResidueProperties.propHash, 3,
+              alignment.getSequences(), 0, alWidth -1);
+
+          cons.calculate();
+          cons.verdict(false, ConsPercGaps);
+
+          if (quality!=null)
           {
-            alignment.addAnnotation(conservation);
+            cons.findQuality();
           }
 
-          quality = new AlignmentAnnotation("Quality",
-                                            "Alignment Quality based on Blosum62 scores",
-                                            qannotations,
-                                            cons.qualityRange[0].floatValue(),
-                                            cons.qualityRange[1].floatValue(),
-                                            AlignmentAnnotation.BAR_GRAPH);
+          String sequence = cons.getConsSequence().getSequence();
+          float minR;
+          float minG;
+          float minB;
+          float maxR;
+          float maxG;
+          float maxB;
+          minR = 0.3f;
+          minG = 0.0f;
+          minB = 0f;
+          maxR = 1.0f - minR;
+          maxG = 0.9f - minG;
+          maxB = 0f - minB; // scalable range for colouring both Conservation and Quality
+
+          float min = 0f;
+          float max = 11f;
+          float qmin = 0f;
+          float qmax = 0f;
+
+          char c;
+
+          conservation.annotations = new Annotation[alWidth];
+
+          if (quality!=null)
+          {
+            quality.graphMax = cons.qualityRange[1].floatValue();
+            quality.annotations = new Annotation[alWidth];
+            qmin = cons.qualityRange[0].floatValue();
+            qmax = cons.qualityRange[1].floatValue();
+          }
 
-          if (showQuality)
+          for (int i = 0; i < alWidth; i++)
           {
-            alignment.addAnnotation(quality);
+            float value = 0;
+
+            c = sequence.charAt(i);
+
+            if (Character.isDigit(c))
+              value = (int) (c - '0');
+            else if (c == '*')
+              value = 11;
+            else if (c == '+')
+              value = 10;
+
+            float vprop = value - min;
+            vprop /= max;
+            conservation.annotations[i] =
+                new Annotation(String.valueOf(c),
+                               String.valueOf(value), ' ', value,
+                               new Color(minR + (maxR * vprop),
+                                         minG + (maxG * vprop),
+                                         minB + (maxB * vprop)));
+
+            // Quality calc
+            if (quality!=null)
+            {
+              value = ( (Double) cons.quality.get(i)).floatValue();
+              vprop = value - qmin;
+              vprop /= qmax;
+              quality.annotations[i] = new Annotation(" ", String.valueOf(value), ' ',
+                                               value,
+                                               new Color(minR + (maxR * vprop),
+                  minG + (maxG * vprop),
+                  minB + (maxB * vprop)));
+            }
           }
         }
-        else
-        {
-          conservation.annotations = annotations;
-          quality.annotations = qannotations;
-          quality.graphMax = cons.qualityRange[1].floatValue();
-        }
-      }
-      catch (OutOfMemoryError error)
-      {
-        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        catch (OutOfMemoryError error)
         {
-          public void run()
+          javax.swing.SwingUtilities.invokeLater(new Runnable()
           {
-            javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                "Out of memory calculating conservation!!"
-                +
-                "\nSee help files for increasing Java Virtual Machine memory."
-                , "Out of memory",
-                javax.swing.JOptionPane.WARNING_MESSAGE);
-          }
-        });
 
-        System.out.println("Conservation calculation: " + error);
-        System.gc();
+
+            public void run()
+            {
+              javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                  "Out of memory calculating conservation!!"
+                  +
+                  "\nSee help files for increasing Java Virtual Machine memory."
+                  , "Out of memory",
+                  javax.swing.JOptionPane.WARNING_MESSAGE);
+            }
+          });
+
+          conservation = null;
+          quality = null;
+
+          System.out.println("Conservation calculation: " + error);
+          System.gc();
+
+        }
+
+        UPDATING_CONSERVATION = false;
+        updatingConservation = false;
+
+        if(ap!=null)
+        {
+          ap.repaint();
+        }
 
       }
     }
 
+
+    ConservationThread conservationThread;
+
+    ConsensusThread consensusThread;
+
+    boolean consUpdateNeeded = false;
+
+    static boolean UPDATING_CONSENSUS = false;
+
+    static boolean UPDATING_CONSERVATION = false;
+
+    boolean updatingConsensus = false;
+
+    boolean updatingConservation = false;
+
     /**
      * DOCUMENT ME!
      */
-    public void updateConsensus()
+    public void updateConservation(final AlignmentPanel ap)
     {
-      try{
-        Annotation[] annotations = new Annotation[alignment.getWidth()];
+      if (alignment.isNucleotide() || conservation==null)
+        return;
 
-        // this routine prevents vconsensus becoming a new object each time
-        // consenus is calculated. Important for speed of Blosum62
-        // and PID colouring of alignment
-        if (vconsensus == null)
-        {
-          vconsensus = alignment.getAAFrequency();
-        }
-        else
-        {
-          Vector temp = alignment.getAAFrequency();
-          vconsensus.clear();
+      conservationThread = new ConservationThread(ap);
+      conservationThread.start();
+    }
+
+    /**
+     * DOCUMENT ME!
+     */
+    public void updateConsensus(final AlignmentPanel ap)
+    {
+      consensusThread = new ConsensusThread(ap);
+      consensusThread.start();
+    }
 
-          Enumeration e = temp.elements();
 
-          while (e.hasMoreElements())
+    class ConsensusThread extends Thread
+    {
+      AlignmentPanel ap;
+      public ConsensusThread(AlignmentPanel ap)
+      {
+        this.ap = ap;
+      }
+      public void run()
+      {
+        updatingConsensus = true;
+        while (UPDATING_CONSENSUS)
+        {
+          try
+          {
+            if (ap != null)
+            {
+              ap.repaint();
+            }
+
+            Thread.sleep(200);
+          }
+          catch (Exception ex)
           {
-            vconsensus.add(e.nextElement());
+            ex.printStackTrace();
           }
         }
 
-        Hashtable hash = null;
 
-        for (int i = 0; i < alignment.getWidth(); i++)
+        UPDATING_CONSENSUS = true;
+
+        try
         {
-          hash = (Hashtable) vconsensus.elementAt(i);
+          int aWidth = alignment.getWidth();
+          if(aWidth<0)
+            return;
+
+          consensus.annotations = null;
+          consensus.annotations = new Annotation[aWidth];
 
-          float value = 0;
-          if (ignoreGapsInConsensusCalculation)
-            value = ( (Float) hash.get("pid_nogaps")).floatValue();
-          else
-            value = ( (Float) hash.get("pid_gaps")).floatValue();
 
-          String maxRes = hash.get("maxResidue").toString();
-          String mouseOver = hash.get("maxResidue") + " ";
+          hconsensus = new Hashtable[aWidth];
+          AAFrequency.calculate(alignment.getSequencesArray(),
+                                0,
+                                alignment.getWidth(),
+                                hconsensus);
 
-          if (maxRes.length() > 1)
+          for (int i = 0; i < aWidth; i++)
           {
-            mouseOver = "[" + maxRes + "] ";
-            maxRes = "+";
+            float value = 0;
+            if (ignoreGapsInConsensusCalculation)
+              value = ( (Float) hconsensus[i].get(AAFrequency.PID_NOGAPS)).
+                  floatValue();
+            else
+              value = ( (Float) hconsensus[i].get(AAFrequency.PID_GAPS)).
+                  floatValue();
+
+            String maxRes = hconsensus[i].get(AAFrequency.MAXRESIDUE).toString();
+            String mouseOver = hconsensus[i].get(AAFrequency.MAXRESIDUE) + " ";
+
+            if (maxRes.length() > 1)
+            {
+              mouseOver = "[" + maxRes + "] ";
+              maxRes = "+";
+            }
+
+            mouseOver += ( (int) value + "%");
+            consensus.annotations[i] = new Annotation(maxRes, mouseOver, ' ', value);
           }
 
-          mouseOver += ( (int) value + "%");
-          annotations[i] = new Annotation(maxRes, mouseOver, ' ', value);
-        }
 
-        if (consensus == null)
-        {
-          consensus = new AlignmentAnnotation("Consensus", "PID",
-                                              annotations, 0f, 100f,AlignmentAnnotation.BAR_GRAPH);
+          if (globalColourScheme != null)
+            globalColourScheme.setConsensus(hconsensus);
 
-          if (showIdentity)
-          {
-            alignment.addAnnotation(consensus);
-          }
         }
-        else
+        catch (OutOfMemoryError error)
         {
-          consensus.annotations = annotations;
-        }
-
-        if (globalColourScheme != null)
-          globalColourScheme.setConsensus(vconsensus);
+          alignment.deleteAnnotation(consensus);
 
-      }catch(OutOfMemoryError error)
-      {
-        javax.swing.SwingUtilities.invokeLater(new Runnable()
-        {
-          public void run()
+          consensus = null;
+          hconsensus = null;
+          javax.swing.SwingUtilities.invokeLater(new Runnable()
           {
-            javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                "Out of memory calculating consensus!!"
-                +
-                "\nSee help files for increasing Java Virtual Machine memory."
-                , "Out of memory",
-                javax.swing.JOptionPane.WARNING_MESSAGE);
-          }
-        });
+            public void run()
+            {
+              javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                  "Out of memory calculating consensus!!"
+                  +
+                  "\nSee help files for increasing Java Virtual Machine memory."
+                  , "Out of memory",
+                  javax.swing.JOptionPane.WARNING_MESSAGE);
+            }
+          });
 
+          System.out.println("Consensus calculation: " + error);
+          System.gc();
+        }
+        UPDATING_CONSENSUS = false;
+        updatingConsensus = false;
 
-        System.out.println("Consensus calculation: " + error);
-        System.gc();
+        if (ap != null)
+        {
+          ap.repaint();
+        }
       }
-
     }
     /**
      * get the consensus sequence as displayed under the PID consensus annotation row.
@@ -450,7 +557,7 @@ public class AlignViewport
      */
     public SequenceI getConsensusSeq() {
       if (consensus==null)
-        updateConsensus();
+        updateConsensus(null);
       if (consensus==null)
         return null;
       StringBuffer seqs=new StringBuffer();
@@ -462,6 +569,7 @@ public class AlignViewport
             seqs.append(consensus.annotations[i].displayCharacter);
         }
       }
+
       SequenceI sq = new Sequence("Consensus", seqs.toString());
       sq.setDescription("Percentage Identity Consensus "+((ignoreGapsInConsensusCalculation) ? " without gaps" : ""));
       return sq;
@@ -1095,10 +1203,10 @@ public class AlignViewport
         changeSupport.firePropertyChange(prop, oldvalue, newvalue);
     }
 
-    public void setIgnoreGapsConsensus(boolean b)
+    public void setIgnoreGapsConsensus(boolean b, AlignmentPanel ap)
     {
       ignoreGapsInConsensusCalculation = b;
-      updateConsensus();
+      updateConsensus(ap);
       if(globalColourScheme!=null)
       {
         globalColourScheme.setThreshold(globalColourScheme.getThreshold(), ignoreGapsInConsensusCalculation);
@@ -1352,8 +1460,10 @@ public class AlignViewport
       // object. Refactoring of Cigar and alignment view representation should
       // be done to remove redundancy.
       CigarArray aligview = getViewAsCigars(selectedOnly);
-      if (aligview!=null)
-        return new AlignmentView(aligview);
+      if (aligview!=null) {
+        return new AlignmentView(aligview,
+            (selectedOnly && selectionGroup!=null) ? selectionGroup.getStartRes() : 0);
+      }
       return null;
     }
     /**
@@ -1406,4 +1516,88 @@ public class AlignViewport
     {
       showHiddenMarkers = show;
     }
+
+    public String getSequenceSetId()
+    {
+      if(sequenceSetID==null)
+        sequenceSetID =  alignment.hashCode()+"";
+
+      return sequenceSetID;
+    }
+
+    public void alignmentChanged(AlignmentPanel ap)
+    {
+        if (padGaps)
+          alignment.padGaps();
+
+        if (hconsensus != null && autoCalculateConsensus)
+        {
+          updateConsensus(ap);
+          updateConservation(ap);
+        }
+
+        //Reset endRes of groups if beyond alignment width
+        int alWidth = alignment.getWidth();
+        Vector groups = alignment.getGroups();
+        if(groups!=null)
+        {
+          for(int i=0; i<groups.size(); i++)
+          {
+            SequenceGroup sg = (SequenceGroup)groups.elementAt(i);
+            if(sg.getEndRes()>alWidth)
+              sg.setEndRes(alWidth-1);
+          }
+        }
+
+        if(selectionGroup!=null && selectionGroup.getEndRes()>alWidth)
+          selectionGroup.setEndRes(alWidth-1);
+
+        resetAllColourSchemes();
+
+        alignment.adjustSequenceAnnotations();
+    }
+
+
+    void resetAllColourSchemes()
+    {
+      ColourSchemeI cs = globalColourScheme;
+      if(cs!=null)
+      {
+        if (cs instanceof ClustalxColourScheme)
+        {
+          ( (ClustalxColourScheme) cs).
+              resetClustalX(alignment.getSequences(),
+                            alignment.getWidth());
+        }
+
+        cs.setConsensus(hconsensus);
+        if (cs.conservationApplied())
+        {
+          Alignment al = (Alignment) alignment;
+          Conservation c = new Conservation("All",
+                                            ResidueProperties.propHash, 3,
+                                            al.getSequences(), 0,
+                                            al.getWidth() - 1);
+          c.calculate();
+          c.verdict(false, ConsPercGaps);
+
+          cs.setConservation(c);
+        }
+      }
+
+      int s, sSize = alignment.getGroups().size();
+      for(s=0; s<sSize; s++)
+      {
+        SequenceGroup sg = (SequenceGroup)alignment.getGroups().elementAt(s);
+        if(sg.cs!=null && sg.cs instanceof ClustalxColourScheme)
+        {
+          ((ClustalxColourScheme)sg.cs).resetClustalX(
+              sg.getSequences(true), sg.getWidth());
+        }
+        sg.recalcConservation();
+      }
+    }
+
+
+
 }