git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/JAL-2447experimentalFlag' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
PCAPanel.java
diff --git
a/src/jalview/appletgui/PCAPanel.java
b/src/jalview/appletgui/PCAPanel.java
index
c5ec0c1
..
5dc57f9
100644
(file)
--- a/
src/jalview/appletgui/PCAPanel.java
+++ b/
src/jalview/appletgui/PCAPanel.java
@@
-20,9
+20,12
@@
*/
package jalview.appletgui;
*/
package jalview.appletgui;
+import jalview.analysis.scoremodels.ScoreModels;
+import jalview.analysis.scoremodels.SimilarityParams;
+import jalview.api.analysis.ScoreModelI;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentView;
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 jalview.datamodel.SeqCigar;
import jalview.datamodel.SequenceI;
import jalview.util.MessageManager;
@@
-56,7
+59,7
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
int top = 0;
int top = 0;
- public PCAPanel(AlignViewport av)
+ public PCAPanel(AlignViewport viewport)
{
try
{
{
try
{
@@
-73,19
+76,19
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
zCombobox.addItem("dim " + i);
}
zCombobox.addItem("dim " + i);
}
- this.av = av;
- boolean selected = av.getSelectionGroup() != null
- && av.getSelectionGroup().getSize() > 0;
- AlignmentView seqstrings = av.getAlignmentView(selected);
- boolean nucleotide = av.getAlignment().isNucleotide();
+ this.av = viewport;
+ boolean selected = viewport.getSelectionGroup() != null
+ && viewport.getSelectionGroup().getSize() > 0;
+ AlignmentView seqstrings = viewport.getAlignmentView(selected);
+ boolean nucleotide = viewport.getAlignment().isNucleotide();
SequenceI[] seqs;
if (!selected)
{
SequenceI[] seqs;
if (!selected)
{
- seqs = av.getAlignment().getSequencesArray();
+ seqs = viewport.getAlignment().getSequencesArray();
}
else
{
}
else
{
- seqs = av.getSelectionGroup().getSequencesInOrder(av.getAlignment());
+ seqs = viewport.getSelectionGroup().getSequencesInOrder(viewport.getAlignment());
}
SeqCigar sq[] = seqstrings.getSequences();
int length = sq[0].getWidth();
}
SeqCigar sq[] = seqstrings.getSequences();
int length = sq[0].getWidth();
@@
-99,9
+102,13
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
return;
}
}
return;
}
}
- pcaModel = new PCAModel(seqstrings, seqs, nucleotide);
- rc = new RotatableCanvas(av);
+ ScoreModelI scoreModel = ScoreModels.getInstance().getDefaultModel(
+ !nucleotide);
+ pcaModel = new PCAModel(seqstrings, seqs, nucleotide, scoreModel,
+ SimilarityParams.SeqSpace);
+
+ rc = new RotatableCanvas(viewport);
embedMenuIfNeeded(rc);
add(rc, BorderLayout.CENTER);
embedMenuIfNeeded(rc);
add(rc, BorderLayout.CENTER);
@@
-116,6
+123,7
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
/**
* DOCUMENT ME!
*/
/**
* DOCUMENT ME!
*/
+ @Override
public void run()
{
// TODO progress indicator
public void run()
{
// TODO progress indicator
@@
-164,6
+172,7
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
rc.paint(rc.getGraphics());
}
rc.paint(rc.getGraphics());
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == inputData)
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == inputData)
@@
-183,6
+192,7
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
}
}
}
}
+ @Override
public void itemStateChanged(ItemEvent evt)
{
if (evt.getSource() == xCombobox)
public void itemStateChanged(ItemEvent evt)
{
if (evt.getSource() == xCombobox)
@@
-206,6
+216,9
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
if (!pcaModel.isNucleotide())
{
pcaModel.setNucleotide(true);
if (!pcaModel.isNucleotide())
{
pcaModel.setNucleotide(true);
+ ScoreModelI scoreModel = ScoreModels.getInstance().getDefaultModel(
+ false);
+ pcaModel.setScoreModel(scoreModel);
new Thread(this).start();
}
}
new Thread(this).start();
}
}
@@
-214,6
+227,9
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
if (pcaModel.isNucleotide())
{
pcaModel.setNucleotide(false);
if (pcaModel.isNucleotide())
{
pcaModel.setNucleotide(false);
+ ScoreModelI scoreModel = ScoreModels.getInstance().getDefaultModel(
+ true);
+ pcaModel.setScoreModel(scoreModel);
new Thread(this).start();
}
}
new Thread(this).start();
}
}
@@
-265,7
+281,7
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
}
;
Object[] alAndColsel = pcaModel.getSeqtrings()
}
;
Object[] alAndColsel = pcaModel.getSeqtrings()
- .getAlignmentAndColumnSelection(gc);
+ .getAlignmentAndHiddenColumns(gc);
if (alAndColsel != null && alAndColsel[0] != null)
{
if (alAndColsel != null && alAndColsel[0] != null)
{
@@
-273,7
+289,8
@@
public class PCAPanel extends EmbmenuFrame implements Runnable,
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]);
}
}
}
}