import jalview.api.analysis.ScoreModelI;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentView;
-import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
import jalview.datamodel.SeqCigar;
import jalview.datamodel.SequenceI;
import jalview.util.MessageManager;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
-public class PCAPanel extends EmbmenuFrame implements Runnable,
- ActionListener, ItemListener
+public class PCAPanel extends EmbmenuFrame
+ implements Runnable, ActionListener, ItemListener
{
RotatableCanvas rc;
}
else
{
- seqs = viewport.getSelectionGroup().getSequencesInOrder(viewport.getAlignment());
+ seqs = viewport.getSelectionGroup()
+ .getSequencesInOrder(viewport.getAlignment());
}
SeqCigar sq[] = seqstrings.getSequences();
int length = sq[0].getWidth();
}
}
- ScoreModelI scoreModel = ScoreModels.getInstance().getDefaultModel(
- !nucleotide);
- pcaModel = new PCAModel(seqstrings, seqs, nucleotide,
- scoreModel,
+ ScoreModelI scoreModel = ScoreModels.getInstance()
+ .getDefaultModel(!nucleotide);
+ pcaModel = new PCAModel(seqstrings, seqs, nucleotide, scoreModel,
SimilarityParams.SeqSpace);
rc = new RotatableCanvas(viewport);
{
nuclSetting.setState(pcaModel.isNucleotide());
protSetting.setState(!pcaModel.isNucleotide());
- pcaModel.run();
+ pcaModel.calculate();
// ////////////////
xCombobox.select(0);
yCombobox.select(1);
int dim2 = top - yCombobox.getSelectedIndex();
int dim3 = top - zCombobox.getSelectedIndex();
pcaModel.updateRcView(dim1, dim2, dim3);
- rc.img = null;
- rc.rotmat.setIdentity();
- rc.initAxes();
+ rc.resetView();
rc.paint(rc.getGraphics());
}
if (!pcaModel.isNucleotide())
{
pcaModel.setNucleotide(true);
+ ScoreModelI scoreModel = ScoreModels.getInstance()
+ .getDefaultModel(false);
+ pcaModel.setScoreModel(scoreModel);
new Thread(this).start();
}
}
if (pcaModel.isNucleotide())
{
pcaModel.setNucleotide(false);
+ ScoreModelI scoreModel = ScoreModels.getInstance()
+ .getDefaultModel(true);
+ pcaModel.setScoreModel(scoreModel);
new Thread(this).start();
}
}
{
}
;
- Object[] alAndColsel = pcaModel.getSeqtrings()
- .getAlignmentAndColumnSelection(gc);
+ Object[] alAndColsel = pcaModel.getInputData()
+ .getAlignmentAndHiddenColumns(gc);
if (alAndColsel != null && alAndColsel[0] != null)
{
Alignment al = new Alignment((SequenceI[]) alAndColsel[0]);
- AlignFrame af = new AlignFrame(al, av.applet,
- "Original Data for PCA", false);
+ AlignFrame af = new AlignFrame(al, av.applet, "Original Data for PCA",
+ false);
- af.viewport.setHiddenColumns((ColumnSelection) alAndColsel[1]);
+ af.viewport.getAlignment()
+ .setHiddenColumns((HiddenColumns) alAndColsel[1]);
}
}
values.setLabel(MessageManager.getString("label.output_values"));
values.addActionListener(this);
inputData.setLabel(MessageManager.getString("label.input_data"));
- nuclSetting.setLabel(MessageManager
- .getString("label.nucleotide_matrix"));
+ nuclSetting
+ .setLabel(MessageManager.getString("label.nucleotide_matrix"));
nuclSetting.addItemListener(this);
protSetting.setLabel(MessageManager.getString("label.protein_matrix"));
protSetting.addItemListener(this);