import jalview.datamodel.SequenceI;
import jalview.io.DataSourceType;
import jalview.io.FeaturesFile;
+import jalview.schemes.ColourSchemeI;
import jalview.util.MessageManager;
import java.awt.Color;
*/
private AlignViewControllerGuiI avcg;
- @Override
- protected void finalize() throws Throwable
- {
- viewport = null;
- alignPanel = null;
- avcg = null;
- };
-
public AlignViewController(AlignViewControllerGuiI alignFrame,
- AlignViewportI viewport, AlignmentViewPanel alignPanel)
+ AlignViewportI vp, AlignmentViewPanel ap)
{
this.avcg = alignFrame;
- this.viewport = viewport;
- this.alignPanel = alignPanel;
+ this.viewport = vp;
+ this.alignPanel = ap;
}
@Override
- public void setViewportAndAlignmentPanel(AlignViewportI viewport,
- AlignmentViewPanel alignPanel)
+ public void setViewportAndAlignmentPanel(AlignViewportI vp,
+ AlignmentViewPanel ap)
{
- this.alignPanel = alignPanel;
- this.viewport = viewport;
-
+ this.alignPanel = ap;
+ this.viewport = vp;
}
@Override
gps = jalview.analysis.Grouping.makeGroupsFromCols(
(sg == null) ? viewport.getAlignment().getSequencesArray()
: sg.getSequences().toArray(new SequenceI[0]),
- cs, viewport.getAlignment().getGroups());
+ cs, viewport.getAlignment().getGroups(),
+ viewport.getAlignment().getHiddenColumns());
}
}
if (gps != null)
viewport.getAlignment().deleteAllGroups();
viewport.clearSequenceColours();
viewport.setSelectionGroup(null);
+ ColourSchemeI colours = viewport.getGlobalColourScheme();
// set view properties for each group
for (int g = 0; g < gps.length; g++)
{
// gps[g].setShowunconserved(viewport.getShowUnconserved());
gps[g].setshowSequenceLogo(viewport.isShowSequenceLogo());
viewport.getAlignment().addGroup(gps[g]);
- Color col = new Color((int) (Math.random() * 255),
- (int) (Math.random() * 255), (int) (Math.random() * 255));
- col = col.brighter();
- for (SequenceI sq : gps[g].getSequences(null))
+ if (colours != null)
{
- viewport.setSequenceColour(sq, col);
+ gps[g].setColourScheme(colours.getInstance(viewport, gps[g]));
}
+ Color col = new Color((int) (Math.random() * 255),
+ (int) (Math.random() * 255), (int) (Math.random() * 255));
+ gps[g].idColour = col;
+ viewport.setUpdateStructures(true);
+ viewport.addSequenceGroup(gps[g]);
}
return true;
}
// JBPNote this routine could also mark rows, not just columns.
// need a decent query structure to allow all types of feature searches
BitSet bs = new BitSet();
- SequenceCollectionI sqcol = (viewport.getSelectionGroup() == null
- || extendCurrent) ? viewport.getAlignment()
- : viewport.getSelectionGroup();
+ boolean searchSelection = viewport.getSelectionGroup() != null
+ && !extendCurrent;
+ SequenceCollectionI sqcol = searchSelection ? viewport
+ .getSelectionGroup() : viewport.getAlignment();
int nseq = findColumnsWithFeature(featureType, sqcol, bs);
}
else
{
- avcg.setStatus(MessageManager
- .formatMessage("label.no_feature_of_type_found", new String[]
- { featureType }));
+ String key = searchSelection ? "label.no_feature_found_selection"
+ : "label.no_feature_of_type_found";
+ avcg.setStatus(MessageManager.formatMessage(key,
+ new String[] { featureType }));
if (!extendCurrent)
{
cs.clear();
/**
* Sets a bit in the BitSet for each column (base 0) in the sequence
- * collection which includes the specified feature type. Returns the number of
- * sequences which have the feature in the selected range.
+ * collection which includes a visible feature of the specified feature type.
+ * Returns the number of sequences which have the feature visible in the
+ * selected range.
*
* @param featureType
* @param sqcol
* @param bs
* @return
*/
- static int findColumnsWithFeature(String featureType,
+ int findColumnsWithFeature(String featureType,
SequenceCollectionI sqcol, BitSet bs)
{
+ FeatureRenderer fr = alignPanel == null ? null : alignPanel
+ .getFeatureRenderer();
+
final int startColumn = sqcol.getStartRes() + 1; // converted to base 1
final int endColumn = sqcol.getEndRes() + 1;
List<SequenceI> seqs = sqcol.getSequences();
List<SequenceFeature> sfs = sq.findFeatures(startColumn,
endColumn, featureType);
- if (!sfs.isEmpty())
- {
- nseq++;
- }
-
+ boolean found = false;
for (SequenceFeature sf : sfs)
{
+ if (fr.getColour(sf) == null)
+ {
+ continue;
+ }
+ if (!found)
+ {
+ nseq++;
+ }
+ found = true;
+
int sfStartCol = sq.findIndex(sf.getBegin());
int sfEndCol = sq.findIndex(sf.getEnd());
@Override
public void sortAlignmentByFeatureDensity(List<String> typ)
{
- sortBy(typ, "Sort by Density", AlignmentSorter.FEATURE_DENSITY);
+ String methodText = MessageManager.getString("label.sort_by_density");
+ sortByFeatures(typ, methodText, AlignmentSorter.FEATURE_DENSITY);
}
- protected void sortBy(List<String> typ, String methodText,
+ /**
+ * Sorts the alignment (or current selection) by either average score or density
+ * of the specified feature types, and adds to the command history. If
+ * {@code types} is null, all visible feature types are used for the sort. If no
+ * feature types apply, does nothing.
+ *
+ * @param types
+ * @param methodText
+ * - text shown in Undo/Redo command
+ * @param method
+ * - passed to
+ * jalview.analysis.AlignmentSorter.sortByFeatures()
+ */
+ protected void sortByFeatures(List<String> types, String methodText,
final String method)
{
FeatureRenderer fr = alignPanel.getFeatureRenderer();
- if (typ == null && fr != null)
+ if (types == null && fr != null)
{
- typ = fr.getDisplayedFeatureTypes();
+ types = fr.getDisplayedFeatureTypes();
+ }
+ if (types.isEmpty())
+ {
+ return; // nothing to do
}
List<String> gps = null;
if (fr != null)
stop = al.getWidth();
}
SequenceI[] oldOrder = al.getSequencesArray();
- AlignmentSorter.sortByFeature(typ, gps, start, stop, al, method);
+ AlignmentSorter.sortByFeature(types, gps, start, stop, al, method);
avcg.addHistoryItem(new OrderCommand(methodText, oldOrder,
viewport.getAlignment()));
alignPanel.paintAlignment(true, false);
@Override
public void sortAlignmentByFeatureScore(List<String> typ)
{
- sortBy(typ, "Sort by Feature Score", AlignmentSorter.FEATURE_SCORE);
+ String methodText = MessageManager.getString("label.sort_by_score");
+ sortByFeatures(typ, methodText, AlignmentSorter.FEATURE_SCORE);
}
@Override
public boolean parseFeaturesFile(String file, DataSourceType protocol,
boolean relaxedIdMatching)
{
- boolean featuresFile = false;
+ boolean featuresAdded = false;
+ FeatureRenderer fr = alignPanel.getFeatureRenderer();
try
{
- featuresFile = new FeaturesFile(false, file, protocol).parse(
- viewport.getAlignment().getDataset(),
- alignPanel.getFeatureRenderer().getFeatureColours(), false,
- relaxedIdMatching);
+ featuresAdded = new FeaturesFile(false, file, protocol).parse(
+ viewport.getAlignment().getDataset(), fr.getFeatureColours(),
+ fr.getFeatureFilters(), false, relaxedIdMatching);
} catch (Exception ex)
{
ex.printStackTrace();
}
- if (featuresFile)
+ if (featuresAdded)
{
avcg.refreshFeatureUI(true);
- if (alignPanel.getFeatureRenderer() != null)
+ if (fr != null)
{
// update the min/max ranges where necessary
- alignPanel.getFeatureRenderer().findAllFeatures(true);
+ fr.findAllFeatures(true);
}
if (avcg.getFeatureSettingsUI() != null)
{
alignPanel.paintAlignment(true, true);
}
- return featuresFile;
+ return featuresAdded;
}
git://source.jalview.org / jalview.git / blobdiff