X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fcontroller%2FAlignViewController.java;h=2fb9cdde4123dfdd87d0208c5263733991cad964;hb=599ce3ebcced809656e12ca0c0f69abd304f1577;hp=8b001b30c8306298dac113ce0c0e8d7b4583e791;hpb=d2fbfb17ae43c983123e18a0ef1074c2aba907ff;p=jalview.git diff --git a/src/jalview/controller/AlignViewController.java b/src/jalview/controller/AlignViewController.java index 8b001b3..2fb9cdd 100644 --- a/src/jalview/controller/AlignViewController.java +++ b/src/jalview/controller/AlignViewController.java @@ -35,8 +35,8 @@ import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.io.DataSourceType; import jalview.io.FeaturesFile; +import jalview.schemes.ColourSchemeI; import jalview.util.MessageManager; -import jalview.viewmodel.seqfeatures.FeatureRendererModel; import java.awt.Color; import java.util.BitSet; @@ -54,20 +54,19 @@ public class AlignViewController implements AlignViewControllerI private AlignViewControllerGuiI avcg; 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 @@ -99,19 +98,22 @@ public class AlignViewController implements AlignViewControllerI 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; } @@ -164,9 +166,11 @@ public class AlignViewController implements AlignViewControllerI // 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); @@ -202,8 +206,10 @@ public class AlignViewController implements AlignViewControllerI } else { - avcg.setStatus(MessageManager - .formatMessage("label.no_feature_of_type_found", new String[] + String key = searchSelection ? "label.no_feature_found_selection" + : "label.no_feature_of_type_found"; + avcg.setStatus( + MessageManager.formatMessage(key, new String[] { featureType })); if (!extendCurrent) { @@ -225,12 +231,11 @@ public class AlignViewController implements AlignViewControllerI * @param bs * @return */ - int findColumnsWithFeature(String featureType, - SequenceCollectionI sqcol, BitSet bs) + int findColumnsWithFeature(String featureType, SequenceCollectionI sqcol, + BitSet bs) { - FeatureRendererModel fr = alignPanel == null ? null - : (FeatureRendererModel) alignPanel.getFeatureRenderer(); - List visibleFeatures = fr.getDisplayedFeatureTypes(); + FeatureRenderer fr = alignPanel == null ? null + : alignPanel.getFeatureRenderer(); final int startColumn = sqcol.getStartRes() + 1; // converted to base 1 final int endColumn = sqcol.getEndRes() + 1; @@ -241,18 +246,15 @@ public class AlignViewController implements AlignViewControllerI if (sq != null) { // int ist = sq.findPosition(sqcol.getStartRes()); - List sfs = sq.findFeatures(startColumn, - endColumn, featureType); + List sfs = sq.findFeatures(startColumn, endColumn, + featureType); boolean found = false; for (SequenceFeature sf : sfs) { - { - if (!visibleFeatures.contains(sf.getType()) - || fr.getColour(sf) == null) // could pull up getColour to FeatureRenderer interface - { - continue; - } + if (fr.getColour(sf) == null) + { + continue; } if (!found) { @@ -310,16 +312,33 @@ public class AlignViewController implements AlignViewControllerI @Override public void sortAlignmentByFeatureDensity(List 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 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 types, String methodText, final String method) { FeatureRenderer fr = alignPanel.getFeatureRenderer(); - if (typ == null && fr != null) + if (types == null && fr != null) + { + types = fr.getDisplayedFeatureTypes(); + } + if (types.isEmpty()) { - typ = fr.getDisplayedFeatureTypes(); + return; // nothing to do } List gps = null; if (fr != null) @@ -341,7 +360,7 @@ public class AlignViewController implements AlignViewControllerI 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); @@ -351,32 +370,33 @@ public class AlignViewController implements AlignViewControllerI @Override public void sortAlignmentByFeatureScore(List 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, + public boolean parseFeaturesFile(Object 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) { @@ -385,7 +405,7 @@ public class AlignViewController implements AlignViewControllerI alignPanel.paintAlignment(true, true); } - return featuresFile; + return featuresAdded; } @@ -441,7 +461,7 @@ public class AlignViewController implements AlignViewControllerI else { avcg.setStatus(MessageManager - .formatMessage("No highlighted regions marked")); + .getString("label.no_highlighted_regions_marked")); if (!extendCurrent) { cs.clear();