Merge branch 'JAL-1013_pca_rna_dna' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 15 Jun 2012 08:58:07 +0000 (09:58 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 15 Jun 2012 08:58:07 +0000 (09:58 +0100)
1  2 
src/jalview/analysis/PCA.java
src/jalview/appletgui/PCAPanel.java
src/jalview/datamodel/BinarySequence.java
src/jalview/gui/PCAPanel.java
src/jalview/gui/RotatableCanvas.java
src/jalview/jbgui/GPCAPanel.java
src/jalview/schemes/ResidueProperties.java

Simple merge
@@@ -59,9 -66,10 +66,10 @@@ public class PCAPanel extends EmbmenuFr
  
      this.av = av;
      seqstrings = av.getAlignmentView(av.getSelectionGroup() != null);
+     useidentity=av.getAlignment().isNucleotide();
      if (av.getSelectionGroup() == null)
      {
 -      seqs = av.alignment.getSequencesArray();
 +      seqs = av.getAlignment().getSequencesArray();
      }
      else
      {
@@@ -67,9 -72,10 +72,10 @@@ public class PCAPanel extends GPCAPane
      boolean sameLength = true;
  
      seqstrings = av.getAlignmentView(av.getSelectionGroup() != null);
+     nucleotide=av.getAlignment().isNucleotide();
      if (av.getSelectionGroup() == null)
      {
 -      seqs = av.alignment.getSequencesArray();
 +      seqs = av.getAlignment().getSequencesArray();
      }
      else
      {
Simple merge
Simple merge