X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=fb2047ebcd2b1c5b0e60aa5b7f08a91c1eff8db0;hb=d587f1aa61946dc14f6f089cf1dc2a3116cfb773;hp=c0e9dc90293a739612790a790228bc0a2cdc9b13;hpb=e3a5770d5844eb5cf183424643605611d3545726;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index c0e9dc9..fb2047e 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -109,13 +109,18 @@ public class AlignViewport
 
     boolean gatherViewsHere = false;
 
+    Stack historyList = new Stack();
+    Stack redoList = new Stack();
+
+    Hashtable sequenceColours;
+
+    int thresholdTextColour = 0;
+    Color textColour = Color.black;
+    Color textColour2 = Color.white;
+
+    boolean rightAlignIds = false;
+
 
-    public AlignViewport(AlignmentI al, boolean dataset)
-    {
-      isDataset = dataset;
-      setAlignment(al);
-      init();
-    }
     /**
      * Creates a new AlignViewport object.
      *
@@ -153,9 +158,11 @@ public class AlignViewport
       showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
       showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
 
+      rightAlignIds = Cache.getDefault("RIGHT_ALIGN_IDS", false);
+
       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 + "") ;
@@ -174,7 +181,6 @@ public class AlignViewport
 
        setFont(new Font(fontName, style, Integer.parseInt(fontSize)));
 
-
        alignment.setGapCharacter( Cache.getDefault("GAP_SYMBOL", "-").charAt(0) );
 
 
@@ -221,7 +227,6 @@ public class AlignViewport
            {
              alignment.addAnnotation(consensus);
            }
-
         }
 
         if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
@@ -240,6 +245,8 @@ public class AlignViewport
                 globalColourScheme.setConsensus(hconsensus);
             }
         }
+
+        wrapAlignment = jalview.bin.Cache.getDefault("WRAP_ALIGNMENT", false);
     }
 
 
@@ -273,6 +280,27 @@ public class AlignViewport
       {
         try
         {
+          updatingConservation = true;
+
+          while (UPDATING_CONSERVATION)
+          {
+            try
+            {
+              if (ap != null)
+              {
+                ap.repaint();
+              }
+              Thread.sleep(200);
+            }
+            catch (Exception ex)
+            {
+              ex.printStackTrace();
+            }
+          }
+
+          UPDATING_CONSERVATION = true;
+
+
           int alWidth = alignment.getWidth();
           if(alWidth<0)
             return;
@@ -289,7 +317,6 @@ public class AlignViewport
             cons.findQuality();
           }
 
-
           String sequence = cons.getConsSequence().getSequence();
           float minR;
           float minG;
@@ -382,11 +409,14 @@ public class AlignViewport
 
         }
 
+        UPDATING_CONSERVATION = false;
+        updatingConservation = false;
+
         if(ap!=null)
         {
           ap.repaint();
         }
-        updatingConservation = false;
+
       }
     }
 
@@ -397,6 +427,10 @@ public class AlignViewport
 
     boolean consUpdateNeeded = false;
 
+    static boolean UPDATING_CONSENSUS = false;
+
+    static boolean UPDATING_CONSERVATION = false;
+
     boolean updatingConsensus = false;
 
     boolean updatingConservation = false;
@@ -404,42 +438,22 @@ public class AlignViewport
     /**
      * DOCUMENT ME!
      */
-    public void updateConservation(AlignmentPanel ap)
+    public void updateConservation(final AlignmentPanel ap)
     {
-      if (alignment.isNucleotide())
+      if (alignment.isNucleotide() || conservation==null)
         return;
 
-      updatingConservation = true;
-
-      if (conservationThread == null || !conservationThread.isAlive())
-      {
-        conservationThread = new ConservationThread(ap);
-        conservationThread.start();
-      }
-      else
-      {
-        consUpdateNeeded = true;
-        System.out.println("come back later");
-      }
+      conservationThread = new ConservationThread(ap);
+      conservationThread.start();
     }
 
     /**
      * DOCUMENT ME!
      */
-    public void updateConsensus(AlignmentPanel ap)
+    public void updateConsensus(final AlignmentPanel ap)
     {
-      updatingConsensus = true;
-
-      if (consensusThread == null || !consensusThread.isAlive())
-      {
-        consensusThread = new ConsensusThread(ap);
-        consensusThread.start();
-      }
-      else
-      {
-        consUpdateNeeded = true;
-        System.out.println("come back later");
-      }
+      consensusThread = new ConsensusThread(ap);
+      consensusThread.start();
     }
 
 
@@ -452,6 +466,27 @@ public class AlignViewport
       }
       public void run()
       {
+        updatingConsensus = true;
+        while (UPDATING_CONSENSUS)
+        {
+          try
+          {
+            if (ap != null)
+            {
+              ap.repaint();
+            }
+
+            Thread.sleep(200);
+          }
+          catch (Exception ex)
+          {
+            ex.printStackTrace();
+          }
+        }
+
+
+        UPDATING_CONSENSUS = true;
+
         try
         {
           int aWidth = alignment.getWidth();
@@ -498,6 +533,8 @@ public class AlignViewport
         }
         catch (OutOfMemoryError error)
         {
+          alignment.deleteAnnotation(consensus);
+
           consensus = null;
           hconsensus = null;
           javax.swing.SwingUtilities.invokeLater(new Runnable()
@@ -516,14 +553,13 @@ public class AlignViewport
           System.out.println("Consensus calculation: " + error);
           System.gc();
         }
+        UPDATING_CONSENSUS = false;
+        updatingConsensus = false;
 
         if (ap != null)
         {
           ap.repaint();
         }
-
-
-        updatingConsensus = false;
       }
     }
     /**
@@ -544,6 +580,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;
@@ -1309,15 +1346,17 @@ public class AlignViewport
 
     public void invertColumnSelection()
     {
-      int column;
       for(int i=0; i<alignment.getWidth(); i++)
       {
-        column = i;
-
-        if(colSel.contains(column))
-          colSel.removeElement(column);
+        if(colSel.contains(i))
+          colSel.removeElement(i);
         else
-          colSel.addElement(column);
+        {
+          if (!hasHiddenColumns || colSel.isVisible(i))
+          {
+            colSel.addElement(i);
+          }
+        }
 
       }
 
@@ -1499,4 +1538,98 @@ public class AlignViewport
       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();
+      }
+    }
+
+
+    public Color getSequenceColour(SequenceI seq)
+    {
+      if(sequenceColours==null || !sequenceColours.containsKey(seq))
+        return Color.white;
+      else
+        return (Color)sequenceColours.get(seq);
+    }
+
+    public void setSequenceColour(SequenceI seq, Color col)
+    {
+      if(sequenceColours==null)
+        sequenceColours = new Hashtable();
+
+      if(col == null)
+        sequenceColours.remove(seq);
+      else
+        sequenceColours.put(seq, col);
+    }
+
+
 }