X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=2e1a4e0251b169ff68777dbcd96b75fcc2984d90;hb=21b2c08c209b0c4eb1111dab1d81e8408c245ddd;hp=7f8675375da91f3acaba5922e27fde0170325f5e;hpb=9c5d69ef1e102b1eac18ec13c362522f40c9000d;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 7f86753..2e1a4e0 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -61,8 +61,9 @@ public class AlignViewport
     SequenceGroup selectionGroup;
     int charHeight;
     int charWidth;
+    boolean validCharWidth;
     int wrappedWidth;
-    Font font = new Font("SansSerif", Font.PLAIN, 10);
+    Font font;
     AlignmentI alignment;
     ColumnSelection colSel = new ColumnSelection();
     int threshold;
@@ -71,12 +72,22 @@ public class AlignViewport
     boolean scaleAboveWrapped = false;
     boolean scaleLeftWrapped = true;
     boolean scaleRightWrapped = true;
+    boolean hasHiddenColumns = false;
+    boolean hasHiddenRows = false;
+
+    boolean cursorMode = false;
+
+    // The following vector holds the features which are
+    // currently visible, in the correct order or rendering
+    Hashtable featuresDisplayed = null;
+
 
     /** DOCUMENT ME!! */
     public Vector vconsensus;
     AlignmentAnnotation consensus;
     AlignmentAnnotation conservation;
     AlignmentAnnotation quality;
+    boolean autoCalculateConsensus = true;
 
     /** DOCUMENT ME!! */
     public int ConsPercGaps = 25; // JBPNote : This should be a scalable property!
@@ -88,6 +99,10 @@ public class AlignViewport
 
     boolean isDataset = false;
 
+    boolean antiAlias = false;
+
+    boolean padGaps = false;
+
 
     public AlignViewport(AlignmentI al, boolean dataset)
     {
@@ -113,6 +128,8 @@ public class AlignViewport
         this.startSeq = 0;
         this.endSeq = alignment.getHeight() - 1;
 
+      antiAlias = Cache.getDefault("ANTI_ALIAS", false);
+
       showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
       showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
       showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
@@ -120,6 +137,10 @@ public class AlignViewport
       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);
+
        String fontName = Cache.getDefault("FONT_NAME", "SansSerif");
        String fontStyle = Cache.getDefault("FONT_STYLE", Font.PLAIN + "") ;
        String fontSize = Cache.getDefault("FONT_SIZE", "10");
@@ -174,11 +195,16 @@ public class AlignViewport
      *
      * @param b DOCUMENT ME!
      */
-    public void showSequenceFeatures(boolean b)
+    public void setShowSequenceFeatures(boolean b)
     {
         showSequenceFeatures = b;
     }
 
+    public boolean getShowSequenceFeatures()
+    {
+      return showSequenceFeatures;
+    }
+
     /**
      * DOCUMENT ME!
      */
@@ -264,7 +290,7 @@ public class AlignViewport
                                                  ConsPercGaps + "% gaps",
                                                  annotations, 0f, // cons.qualityRange[0].floatValue(),
                                                  11f, // cons.qualityRange[1].floatValue()
-                                                 1);
+                                                 AlignmentAnnotation.BAR_GRAPH);
 
           if (showConservation)
           {
@@ -276,7 +302,7 @@ public class AlignViewport
                                             qannotations,
                                             cons.qualityRange[0].floatValue(),
                                             cons.qualityRange[1].floatValue(),
-                                            1);
+                                            AlignmentAnnotation.BAR_GRAPH);
 
           if (showQuality)
           {
@@ -292,12 +318,19 @@ public class AlignViewport
       }
       catch (OutOfMemoryError error)
       {
-        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);
+        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        {
+          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);
+          }
+        });
+
         System.out.println("Conservation calculation: " + error);
         System.gc();
 
@@ -360,7 +393,7 @@ public class AlignViewport
         if (consensus == null)
         {
           consensus = new AlignmentAnnotation("Consensus", "PID",
-                                              annotations, 0f, 100f, 1);
+                                              annotations, 0f, 100f,AlignmentAnnotation.BAR_GRAPH);
 
           if (showIdentity)
           {
@@ -377,12 +410,20 @@ public class AlignViewport
 
       }catch(OutOfMemoryError error)
       {
-        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);
+        javax.swing.SwingUtilities.invokeLater(new Runnable()
+        {
+          public void run()
+          {
+            javax.swing.JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                "Out of memory calc45ulating 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();
       }
@@ -584,6 +625,7 @@ public class AlignViewport
         java.awt.FontMetrics fm = c.getFontMetrics(font);
         setCharHeight(fm.getHeight());
         setCharWidth(fm.charWidth('M'));
+        validCharWidth = true;
     }
 
     /**
@@ -1060,7 +1102,6 @@ public class AlignViewport
       {
         globalColourScheme.setThreshold(globalColourScheme.getThreshold(), ignoreGapsInConsensusCalculation);
       }
-
     }
 
     public boolean getIgnoreGapsConsensus()
@@ -1077,4 +1118,131 @@ public class AlignViewport
     {
       return isDataset;
     }
+
+    public void hideSequence(SequenceI seq)
+    {
+      alignment.getHiddenSequences().hideSequence(seq);
+      hasHiddenRows = true;
+    }
+
+    public void showSequence(int index)
+    {
+      alignment.getHiddenSequences().showSequence(index);
+
+      if(alignment.getHiddenSequences().getSize()<1)
+        hasHiddenRows = false;
+    }
+
+    public void showAllHiddenSeqs()
+    {
+      alignment.getHiddenSequences().showAll();
+      hasHiddenRows = false;
+    }
+
+    public int adjustForHiddenSeqs(int alignmentIndex)
+    {
+      return alignment.getHiddenSequences().adjustForHiddenSeqs(alignmentIndex);
+    }
+
+    /**
+     * This method returns the a new SequenceI [] with
+     * the selection sequence and start and end points adjusted
+     * @return String[]
+     */
+    public SequenceI[] getSelectionAsNewSequence()
+    {
+      SequenceI[] sequences;
+
+      if (selectionGroup == null)
+        sequences = alignment.getSequencesArray();
+      else
+        sequences = selectionGroup.getSelectionAsNewSequences(alignment);
+
+      return sequences;
+    }
+
+
+    /**
+     * This method returns the visible selected area as text, as
+     * seen on the GUI, ie if columns are hidden they will not
+     * be returned in the result.
+     * Use this for calculating trees, PCA, redundancy etc on views
+     * which contain hidden columns.
+     * @return String[]
+     */
+    public String [] getSelectionAsString()
+    {
+      String [] selection = null;
+      SequenceI [] seqs= null;
+      int i, iSize;
+      int start = 0, end = 0;
+      if(selectionGroup!=null)
+      {
+        iSize = selectionGroup.getSize(false);
+        seqs = selectionGroup.getSequencesInOrder(alignment);
+        start = selectionGroup.getStartRes();
+        end = selectionGroup.getEndRes()+1;
+      }
+      else
+      {
+        iSize = alignment.getHeight();
+        seqs = alignment.getSequencesArray();
+        end = alignment.getWidth();
+      }
+
+      selection = new String[iSize];
+
+
+      for(i=0; i<iSize; i++)
+      {
+        if (hasHiddenColumns)
+        {
+             StringBuffer visibleSeq = new StringBuffer();
+             Vector regions = colSel.getHiddenColumns();
+
+             int blockStart = start, blockEnd=end;
+             int [] region;
+             int hideStart, hideEnd;
+
+             for (int j = 0; j < regions.size(); j++)
+             {
+               region = (int[]) regions.elementAt(j);
+               hideStart = region[0];
+               hideEnd = region[1];
+
+               if(hideStart < start)
+               {
+                 continue;
+               }
+
+               blockStart = Math.min(blockStart, hideEnd+1);
+               blockEnd = Math.min(blockEnd, hideStart);
+
+               if(blockStart>blockEnd)
+               {
+                  break;
+               }
+
+
+               visibleSeq.append(seqs[i].getSequence(blockStart, blockEnd));
+
+               blockStart = hideEnd+1;
+               blockEnd = end;
+             }
+
+             if(end>blockStart)
+               visibleSeq.append(seqs[i].getSequence(blockStart, end));
+
+             selection[i] = visibleSeq.toString();
+        }
+        else
+        {
+          selection[i] = seqs[i].getSequence(start, end);
+        }
+
+    //    System.out.println(seqs[i].getName()+"\t"+ selection[i]);
+      }
+
+      return selection;
+    }
 }