X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPCAPanel.java;h=e9ba1e7ef6c6f2c5ace0f55232174698cb14b163;hb=e67e5f3a5b922e8a7729a0e9e9b174f46b11456c;hp=3b73c5a8b4fb2de8b390dfc4a2ce4d8785bfd6b5;hpb=cee29c9fa89ed1d1df7b3af9f97055d8cd6eb77e;p=jalview.git

diff --git a/src/jalview/gui/PCAPanel.java b/src/jalview/gui/PCAPanel.java
index 3b73c5a..e9ba1e7 100644
--- a/src/jalview/gui/PCAPanel.java
+++ b/src/jalview/gui/PCAPanel.java
@@ -24,13 +24,10 @@ import jalview.analysis.scoremodels.ScoreModels;
 import jalview.analysis.scoremodels.SimilarityParams;
 import jalview.api.analysis.ScoreModelI;
 import jalview.api.analysis.SimilarityParamsI;
-import jalview.api.analysis.ViewBasedAnalysisI;
-import jalview.bin.Cache;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.AlignmentView;
 import jalview.datamodel.ColumnSelection;
-import jalview.datamodel.SeqCigar;
 import jalview.datamodel.SequenceI;
 import jalview.jbgui.GPCAPanel;
 import jalview.util.MessageManager;
@@ -39,6 +36,7 @@ import jalview.viewmodel.PCAModel;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -75,6 +73,10 @@ public class PCAPanel extends GPCAPanel implements Runnable,
 
   PCAModel pcaModel;
 
+  private static final int MIN_WIDTH = 470;
+
+  private static final int MIN_HEIGHT = 250;
+
   int top = 0;
 
   /**
@@ -84,20 +86,20 @@ public class PCAPanel extends GPCAPanel implements Runnable,
    */
   public PCAPanel(AlignmentPanel alignPanel)
   {
-    this(alignPanel, ScoreModels.getInstance().getDefaultModel(
-            !alignPanel.av.getAlignment().isNucleotide()),
-            SimilarityParams.SeqSpace);
+    this(alignPanel, ScoreModels.getInstance()
+            .getDefaultModel(!alignPanel.av.getAlignment().isNucleotide())
+            .getName(), SimilarityParams.SeqSpace);
   }
 
   /**
-   * Constructor given sequence data, a similarity (or distance) score model,
-   * and score calculation parameters
+   * Constructor given sequence data, a similarity (or distance) score model
+   * name, and score calculation parameters
    * 
    * @param alignPanel
-   * @param scoreModel
+   * @param modelName
    * @param params
    */
-  public PCAPanel(AlignmentPanel alignPanel, ScoreModelI scoreModel,
+  public PCAPanel(AlignmentPanel alignPanel, String modelName,
           SimilarityParamsI params)
   {
     super();
@@ -129,18 +131,8 @@ public class PCAPanel extends GPCAPanel implements Runnable,
       seqs = av.getSelectionGroup().getSequencesInOrder(av.getAlignment());
     }
 
-    // TODO can we allow PCA on unaligned data given choice of
-    // similarity measure parameters?
-    if (!checkAligned(seqstrings))
-    {
-      JvOptionPane.showMessageDialog(Desktop.desktop,
-              MessageManager.getString("label.pca_sequences_not_aligned"),
-              MessageManager.getString("label.sequences_not_aligned"),
-              JvOptionPane.WARNING_MESSAGE);
-
-      return;
-    }
-
+    ScoreModelI scoreModel = ScoreModels.getInstance().getScoreModel(
+            modelName, ap);
     pcaModel = new PCAModel(seqstrings, seqs, nucleotide, scoreModel,
             params);
     PaintRefresher.Register(this, av.getSequenceSetId());
@@ -152,28 +144,6 @@ public class PCAPanel extends GPCAPanel implements Runnable,
   }
 
   /**
-   * Answers true if all sequences have the same aligned length, else false
-   * 
-   * @param seqstrings
-   * @return
-   */
-  protected boolean checkAligned(AlignmentView seqstrings)
-  {
-    SeqCigar sq[] = seqstrings.getSequences();
-    int length = sq[0].getWidth();
-    boolean sameLength = true;
-    for (int i = 0; i < sq.length; i++)
-    {
-      if (sq[i].getWidth() != length)
-      {
-        sameLength = false;
-        break;
-      }
-    }
-    return sameLength;
-  }
-
-  /**
    * Ensure references to potentially very large objects (the PCA matrices) are
    * nulled when the frame is closed
    */
@@ -195,10 +165,19 @@ public class PCAPanel extends GPCAPanel implements Runnable,
     for (final ScoreModelI sm : ScoreModels.getInstance().getModels())
     {
       final String name = sm.getName();
-      // create an entry for this score matrix for use in PCA
-      JCheckBoxMenuItem jm = new JCheckBoxMenuItem();
-      jm.setText(MessageManager.getStringOrReturn("label.score_model_",
-              name));
+      JCheckBoxMenuItem jm = new JCheckBoxMenuItem(name);
+
+      /*
+       * if the score model doesn't provide a description, try to look one
+       * up in the text bundle, falling back on its name
+       */
+      String tooltip = sm.getDescription();
+      if (tooltip == null)
+      {
+        tooltip = MessageManager.getStringOrReturn("label.score_model_",
+                name);
+      }
+      jm.setToolTipText(tooltip);
       jm.setSelected(pcaModel.getScoreModelName().equals(name));
       if ((pcaModel.isNucleotide() && sm.isDNA())
               || (!pcaModel.isNucleotide() && sm.isProtein()))
@@ -210,7 +189,8 @@ public class PCAPanel extends GPCAPanel implements Runnable,
           {
             if (!pcaModel.getScoreModelName().equals(name))
             {
-              ScoreModelI sm2 = configureScoreModel(sm);
+              ScoreModelI sm2 = ScoreModels.getInstance().getScoreModel(
+                      name, ap);
               pcaModel.setScoreModel(sm2);
               Thread worker = new Thread(PCAPanel.this);
               worker.start();
@@ -264,7 +244,6 @@ public class PCAPanel extends GPCAPanel implements Runnable,
       // rc.invalidate();
       nuclSetting.setSelected(pcaModel.isNucleotide());
       protSetting.setSelected(!pcaModel.isNucleotide());
-      jvVersionSetting.setSelected(pcaModel.isJvCalcMode());
       top = pcaModel.getTop();
 
     } catch (OutOfMemoryError er)
@@ -282,6 +261,7 @@ public class PCAPanel extends GPCAPanel implements Runnable,
       addKeyListener(rc);
       Desktop.addInternalFrame(this, MessageManager
               .getString("label.principal_component_analysis"), 475, 450);
+      this.setMinimumSize(new Dimension(MIN_WIDTH, MIN_HEIGHT));
     }
   }
 
@@ -313,14 +293,6 @@ public class PCAPanel extends GPCAPanel implements Runnable,
     }
   }
 
-  @Override
-  protected void jvVersionSetting_actionPerfomed(ActionEvent arg0)
-  {
-    pcaModel.setJvCalcMode(jvVersionSetting.isSelected());
-    Thread worker = new Thread(this);
-    worker.start();
-  }
-
   /**
    * DOCUMENT ME!
    */
@@ -811,28 +783,4 @@ public class PCAPanel extends GPCAPanel implements Runnable,
     top = t;
     zCombobox.setSelectedIndex(2);
   }
-
-  /**
-   * If the score model is one that requires to get state data from the current
-   * view, allow it to do so
-   * 
-   * @param sm
-   * @return
-   */
-  protected ScoreModelI configureScoreModel(ScoreModelI sm)
-  {
-    if (sm instanceof ViewBasedAnalysisI)
-    {
-      try
-      {
-        sm = sm.getClass().newInstance();
-        ((ViewBasedAnalysisI) sm).configureFromAlignmentView(ap);
-      } catch (Exception q)
-      {
-        Cache.log.error("Couldn't create a scoremodel instance for "
-                + sm.getName());
-      }
-    }
-    return sm;
-  }
 }