X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAlignViewport.java;h=7f8675375da91f3acaba5922e27fde0170325f5e;hb=58f946af1280918a6f2893534e66104bc20a52c7;hp=1efb272234cb4194bfcab4bc116713d85dbcca3d;hpb=42959f09b255337ab66e0abebb02896745400a29;p=jalview.git

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 1efb272..7f86753 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -43,7 +43,7 @@ public class AlignViewport
     int endRes;
     int startSeq;
     int endSeq;
-    boolean showFullId = false;
+    boolean showJVSuffix = true;
     boolean showText = true;
     boolean showColourText = false;
     boolean showBoxes = true;
@@ -61,8 +61,7 @@ public class AlignViewport
     SequenceGroup selectionGroup;
     int charHeight;
     int charWidth;
-    int chunkWidth;
-    int chunkHeight;
+    int wrappedWidth;
     Font font = new Font("SansSerif", Font.PLAIN, 10);
     AlignmentI alignment;
     ColumnSelection colSel = new ColumnSelection();
@@ -87,6 +86,15 @@ public class AlignViewport
 
     boolean ignoreGapsInConsensusCalculation = false;
 
+    boolean isDataset = false;
+
+
+    public AlignViewport(AlignmentI al, boolean dataset)
+    {
+      isDataset = dataset;
+      setAlignment(al);
+      init();
+    }
     /**
      * Creates a new AlignViewport object.
      *
@@ -95,20 +103,17 @@ public class AlignViewport
     public AlignViewport(AlignmentI al)
     {
         setAlignment(al);
-        this.startRes = 0;
-        this.endRes = al.getWidth() - 1;
-        this.startSeq = 0;
-        this.endSeq = al.getHeight() - 1;
-
-        updateFromPreferences();
+        init();
     }
 
-    /**
-     * DOCUMENT ME!
-     */
-    public void updateFromPreferences()
+    void init()
     {
-      showFullId = Cache.getDefault("SHOW_FULL_ID", true);
+        this.startRes = 0;
+        this.endRes = alignment.getWidth() - 1;
+        this.startSeq = 0;
+        this.endSeq = alignment.getHeight() - 1;
+
+      showJVSuffix = Cache.getDefault("SHOW_JVSUFFIX", true);
       showAnnotation = Cache.getDefault("SHOW_ANNOTATIONS", true);
       showConservation = Cache.getDefault("SHOW_CONSERVATION", true);
 
@@ -138,8 +143,11 @@ public class AlignViewport
 
         // We must set conservation and consensus before setting colour,
         // as Blosum and Clustal require this to be done
-        updateConservation();
-        updateConsensus();
+        if(vconsensus==null && !isDataset)
+        {
+          updateConservation();
+          updateConsensus();
+        }
 
         if (jalview.bin.Cache.getProperty("DEFAULT_COLOUR") != null)
         {
@@ -176,6 +184,9 @@ public class AlignViewport
      */
     public void updateConservation()
     {
+      if(alignment.isNucleotide())
+          return;
+
       try{
         Conservation cons = new jalview.analysis.Conservation("All",
             jalview.schemes.ResidueProperties.propHash, 3,
@@ -278,9 +289,18 @@ public class AlignViewport
           quality.annotations = qannotations;
           quality.graphMax = cons.qualityRange[1].floatValue();
         }
-      }catch(OutOfMemoryError error)
+      }
+      catch (OutOfMemoryError error)
       {
-        System.out.println("Out of memory calculating conservation.");
+        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();
+
       }
     }
 
@@ -357,7 +377,14 @@ public class AlignViewport
 
       }catch(OutOfMemoryError error)
       {
-        System.out.println("Out of memory calculating consensus.");
+        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();
       }
 
     }
@@ -614,9 +641,9 @@ public class AlignViewport
      *
      * @param w DOCUMENT ME!
      */
-    public void setChunkWidth(int w)
+    public void setWrappedWidth(int w)
     {
-        this.chunkWidth = w;
+        this.wrappedWidth = w;
     }
 
     /**
@@ -624,30 +651,11 @@ public class AlignViewport
      *
      * @return DOCUMENT ME!
      */
-    public int getChunkWidth()
+    public int getWrappedWidth()
     {
-        return chunkWidth;
+        return wrappedWidth;
     }
 
-    /**
-     * DOCUMENT ME!
-     *
-     * @param h DOCUMENT ME!
-     */
-    public void setChunkHeight(int h)
-    {
-        this.chunkHeight = h;
-    }
-
-    /**
-     * DOCUMENT ME!
-     *
-     * @return DOCUMENT ME!
-     */
-    public int getChunkHeight()
-    {
-        return chunkHeight;
-    }
 
     /**
      * DOCUMENT ME!
@@ -914,9 +922,9 @@ public class AlignViewport
      *
      * @return DOCUMENT ME!
      */
-    public boolean getShowFullId()
+    public boolean getShowJVSuffix()
     {
-        return showFullId;
+        return showJVSuffix;
     }
 
     /**
@@ -924,11 +932,12 @@ public class AlignViewport
      *
      * @param b DOCUMENT ME!
      */
-    public void setShowFullId(boolean b)
+    public void setShowJVSuffix(boolean b)
     {
-        showFullId = b;
+        showJVSuffix = b;
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -1058,4 +1067,14 @@ public class AlignViewport
     {
      return ignoreGapsInConsensusCalculation;
     }
+
+    public void setDataset(boolean b)
+    {
+      isDataset = b;
+    }
+
+    public boolean isDataset()
+    {
+      return isDataset;
+    }
 }