X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=edacce80d36dab239b5f6b4c8d1c2649ed9dc07b;hb=b5667f39acdf309cd92881b73edfda591e0acaf4;hp=9a15e109c841164e69830f47ad36e5c12f97f45d;hpb=648f0d7f48b5865bd43b5edbe71f5e483f0cc455;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index 9a15e10..edacce8 100644 --- a/src/jalview/appletgui/AlignViewport.java +++ b/src/jalview/appletgui/AlignViewport.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) * * This file is part of Jalview. * @@ -20,99 +20,57 @@ */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; - -import jalview.analysis.*; import jalview.api.AlignViewportI; -import jalview.bin.*; -import jalview.datamodel.*; -import jalview.schemes.*; +import jalview.api.FeatureSettingsModelI; +import jalview.bin.JalviewLite; +import jalview.commands.CommandI; +import jalview.datamodel.AlignmentI; +import jalview.datamodel.ColumnSelection; +import jalview.datamodel.HiddenColumns; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SearchResultsI; +import jalview.datamodel.SequenceGroup; +import jalview.renderer.ResidueShader; +import jalview.schemes.ColourSchemeProperty; +import jalview.schemes.UserColourScheme; import jalview.structure.SelectionSource; +import jalview.structure.StructureSelectionManager; import jalview.structure.VamsasSource; import jalview.viewmodel.AlignmentViewport; -public class AlignViewport extends AlignmentViewport implements - AlignViewportI, SelectionSource, VamsasSource -{ - int startRes; - - int endRes; - - int startSeq; - - int endSeq; +import java.awt.Font; +import java.awt.FontMetrics; +public class AlignViewport extends AlignmentViewport + implements SelectionSource +{ boolean cursorMode = false; - boolean showJVSuffix = true; - - boolean showText = true; - - boolean showColourText = false; - - boolean showBoxes = true; - - boolean wrapAlignment = false; - - boolean renderGaps = true; - - boolean showAnnotation = true; - - boolean upperCasebold = false; - - int charHeight; - - int charWidth; - - int wrappedWidth; - Font font = new Font("SansSerif", Font.PLAIN, 10); boolean validCharWidth = true; - int threshold; - - int increment; - - NJTree currentTree = null; - - boolean scaleAboveWrapped = true; - - boolean scaleLeftWrapped = true; - - boolean scaleRightWrapped = true; - - boolean showHiddenMarkers = true; - public jalview.bin.JalviewLite applet; boolean MAC = false; - Stack historyList = new Stack(); + private AnnotationColumnChooser annotationColumnSelectionState; - Stack redoList = new Stack(); + java.awt.Frame nullFrame; - public void finalize() - { - applet = null; - quality = null; - alignment = null; - colSel = null; - } + protected FeatureSettings featureSettings = null; + + private float heightScale = 1, widthScale = 1; public AlignViewport(AlignmentI al, JalviewLite applet) { + super(al); calculator = new jalview.workers.AlignCalcManager(); this.applet = applet; - setAlignment(al); + // we always pad gaps this.setPadGaps(true); - this.startRes = 0; - this.endRes = al.getWidth() - 1; - this.startSeq = 0; - this.endSeq = al.getHeight() - 1; + if (applet != null) { // get the width and height scaling factors if they were specified @@ -121,21 +79,21 @@ public class AlignViewport extends AlignmentViewport implements { try { - widthScale = new Float(param).floatValue(); + widthScale = Float.valueOf(param).floatValue(); } catch (Exception e) { } if (widthScale <= 1.0) { - System.err - .println("Invalid alignment character width scaling factor (" + System.err.println( + "Invalid alignment character width scaling factor (" + widthScale + "). Ignoring."); widthScale = 1; } - if (applet.debug) + if (JalviewLite.debug) { - System.err - .println("Alignment character width scaling factor is now " + System.err.println( + "Alignment character width scaling factor is now " + widthScale); } } @@ -144,35 +102,36 @@ public class AlignViewport extends AlignmentViewport implements { try { - heightScale = new Float(param).floatValue(); + heightScale = Float.valueOf(param).floatValue(); } catch (Exception e) { } if (heightScale <= 1.0) { - System.err - .println("Invalid alignment character height scaling factor (" + System.err.println( + "Invalid alignment character height scaling factor (" + heightScale + "). Ignoring."); heightScale = 1; } - if (applet.debug) + if (JalviewLite.debug) { - System.err - .println("Alignment character height scaling factor is now " + System.err.println( + "Alignment character height scaling factor is now " + heightScale); } } } - setFont(font); + setFont(font, true); MAC = new jalview.util.Platform().isAMac(); if (applet != null) { - showJVSuffix = applet.getDefaultParameter("showFullId", showJVSuffix); + setShowJVSuffix( + applet.getDefaultParameter("showFullId", getShowJVSuffix())); - showAnnotation = applet.getDefaultParameter("showAnnotation", - showAnnotation); + setShowAnnotation(applet.getDefaultParameter("showAnnotation", + isShowAnnotation())); showConservation = applet.getDefaultParameter("showConservation", showConservation); @@ -182,22 +141,28 @@ public class AlignViewport extends AlignmentViewport implements showConsensus = applet.getDefaultParameter("showConsensus", showConsensus); - showUnconserved = applet.getDefaultParameter("showUnconserved", - showUnconserved); + showOccupancy = applet.getDefaultParameter("showOccupancy", + showOccupancy); + + setShowUnconserved(applet.getDefaultParameter("showUnconserved", + getShowUnconserved())); + + setScaleProteinAsCdna(applet.getDefaultParameter("scaleProteinAsCdna", + isScaleProteinAsCdna())); String param = applet.getParameter("upperCase"); if (param != null) { if (param.equalsIgnoreCase("bold")) { - upperCasebold = true; + setUpperCasebold(true); } } sortByTree = applet.getDefaultParameter("sortByTree", sortByTree); - followHighlight = applet.getDefaultParameter("automaticScrolling", - followHighlight); - followSelection = followHighlight; + setFollowHighlight(applet.getDefaultParameter("automaticScrolling", + isFollowHighlight())); + followSelection = isFollowHighlight(); showSequenceLogo = applet.getDefaultParameter("showSequenceLogo", showSequenceLogo); @@ -219,8 +184,13 @@ public class AlignViewport extends AlignmentViewport implements if (applet != null) { - String colour = applet.getParameter("defaultColour"); - + String colour = al.isNucleotide() + ? applet.getParameter("defaultColourNuc") + : applet.getParameter("defaultColourProt"); + if (colour == null) + { + colour = applet.getParameter("defaultColour"); + } if (colour == null) { colour = applet.getParameter("userDefinedColour"); @@ -232,126 +202,29 @@ public class AlignViewport extends AlignmentViewport implements if (colour != null) { - globalColourScheme = ColourSchemeProperty.getColour(alignment, - colour); - if (globalColourScheme != null) + residueShading = new ResidueShader( + ColourSchemeProperty.getColourScheme(this, alignment, + colour)); + if (residueShading != null) { - globalColourScheme.setConsensus(hconsensus); + residueShading.setConsensus(consensusProfiles); } } if (applet.getParameter("userDefinedColour") != null) { - ((UserColourScheme) globalColourScheme).parseAppletParameter(applet - .getParameter("userDefinedColour")); + residueShading = new ResidueShader(new UserColourScheme( + applet.getParameter("userDefinedColour"))); } } initAutoAnnotation(); - } /** - * get the consensus sequence as displayed under the PID consensus annotation - * row. - * - * @return consensus sequence as a new sequence object + * {@inheritDoc} */ - public SequenceI getConsensusSeq() - { - if (consensus == null) - { - updateConsensus(null); - } - if (consensus == null) - { - return null; - } - StringBuffer seqs = new StringBuffer(); - for (int i = 0; i < consensus.annotations.length; i++) - { - if (consensus.annotations[i] != null) - { - if (consensus.annotations[i].description.charAt(0) == '[') - { - seqs.append(consensus.annotations[i].description.charAt(1)); - } - else - { - seqs.append(consensus.annotations[i].displayCharacter); - } - } - } - SequenceI sq = new Sequence("Consensus", seqs.toString()); - sq.setDescription("Percentage Identity Consensus " - + ((ignoreGapsInConsensusCalculation) ? " without gaps" : "")); - return sq; - } - - public int getStartRes() - { - return startRes; - } - - public int getEndRes() - { - return endRes; - } - - public int getStartSeq() - { - return startSeq; - } - - public void setStartRes(int res) - { - this.startRes = res; - } - - public void setStartSeq(int seq) - { - this.startSeq = seq; - } - - public void setEndRes(int res) - { - if (res > alignment.getWidth() - 1) - { - // log.System.out.println(" Corrected res from " + res + " to maximum " + - // (alignment.getWidth()-1)); - res = alignment.getWidth() - 1; - } - if (res < 0) - { - res = 0; - } - this.endRes = res; - } - - public void setEndSeq(int seq) - { - if (seq > alignment.getHeight()) - { - seq = alignment.getHeight(); - } - if (seq < 0) - { - seq = 0; - } - this.endSeq = seq; - } - - public int getEndSeq() - { - return endSeq; - } - - java.awt.Frame nullFrame; - - protected FeatureSettings featureSettings = null; - - private float heightScale = 1, widthScale = 1; - - public void setFont(Font f) + @Override + public void setFont(Font f, boolean setGrid) { font = f; if (nullFrame == null) @@ -360,15 +233,19 @@ public class AlignViewport extends AlignmentViewport implements nullFrame.addNotify(); } - java.awt.FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font); - setCharHeight((int) (heightScale * fm.getHeight())); - charWidth = (int) (widthScale * fm.charWidth('M')); + if (setGrid) + { + FontMetrics fm = nullFrame.getGraphics().getFontMetrics(font); + setCharHeight((int) (heightScale * fm.getHeight())); + setCharWidth((int) (widthScale * fm.charWidth('M'))); + } - if (upperCasebold) + if (isUpperCasebold()) { Font f2 = new Font(f.getName(), Font.BOLD, f.getSize()); - fm = nullFrame.getGraphics().getFontMetrics(f2); - charWidth = (int) (widthScale * (fm.stringWidth("MMMMMMMMMMM") / 10)); + FontMetrics fm = nullFrame.getGraphics().getFontMetrics(f2); + setCharWidth( + (int) (widthScale * (fm.stringWidth("MMMMMMMMMMM") / 10))); } } @@ -377,275 +254,147 @@ public class AlignViewport extends AlignmentViewport implements return font; } - public int getCharWidth() - { - return charWidth; - } - - public void setCharHeight(int h) - { - this.charHeight = h; - } - - public int getCharHeight() - { - return charHeight; - } - - public void setWrappedWidth(int w) - { - this.wrappedWidth = w; - } - - public int getwrappedWidth() - { - return wrappedWidth; - } - - public AlignmentI getAlignment() - { - return alignment; - } - - public void setAlignment(AlignmentI align) - { - this.alignment = align; - } - - public void setWrapAlignment(boolean state) + public void resetSeqLimits(int height) { - wrapAlignment = state; + ranges.setEndSeq(height / getCharHeight()); } - public void setShowText(boolean state) - { - showText = state; - } + boolean centreColumnLabels; - public void setRenderGaps(boolean state) + public boolean getCentreColumnLabels() { - renderGaps = state; + return centreColumnLabels; } - public boolean getColourText() - { - return showColourText; - } + public boolean followSelection = true; - public void setColourText(boolean state) + /** + * @return true if view selection should always follow the selections + * broadcast by other selection sources + */ + public boolean getFollowSelection() { - showColourText = state; + return followSelection; } - public void setShowBoxes(boolean state) + @Override + public void sendSelection() { - showBoxes = state; + getStructureSelectionManager().sendSelection( + new SequenceGroup(getSelectionGroup()), + new ColumnSelection(getColumnSelection()), + new HiddenColumns(getAlignment().getHiddenColumns()), this); } - public boolean getWrapAlignment() + /** + * Returns an instance of the StructureSelectionManager scoped to this applet + * instance. + * + * @return + */ + @Override + public StructureSelectionManager getStructureSelectionManager() { - return wrapAlignment; + return jalview.structure.StructureSelectionManager + .getStructureSelectionManager(applet); } - public boolean getShowText() + /** + * + * @return true if alignment characters should be displayed + */ + @Override + public boolean isValidCharWidth() { - return showText; + return validCharWidth; } - public boolean getShowBoxes() + public AnnotationColumnChooser getAnnotationColumnSelectionState() { - return showBoxes; + return annotationColumnSelectionState; } - public char getGapCharacter() + public void setAnnotationColumnSelectionState( + AnnotationColumnChooser annotationColumnSelectionState) { - return getAlignment().getGapCharacter(); + this.annotationColumnSelectionState = annotationColumnSelectionState; } - public void setGapCharacter(char gap) - { - if (getAlignment() != null) + @Override + public void mirrorCommand(CommandI command, boolean undo, + StructureSelectionManager ssm, VamsasSource source) + { + // TODO refactor so this can be pulled up to superclass or controller + /* + * Do nothing unless we are a 'complement' of the source. May replace this + * with direct calls not via SSM. + */ + if (source instanceof AlignViewportI + && ((AlignViewportI) source).getCodingComplement() == this) { - getAlignment().setGapCharacter(gap); + // ok to continue; } - } - - public void resetSeqLimits(int height) - { - setEndSeq(height / getCharHeight()); - } - - public void setCurrentTree(NJTree tree) - { - currentTree = tree; - } - - public NJTree getCurrentTree() - { - return currentTree; - } - - public boolean getShowJVSuffix() - { - return showJVSuffix; - } - - public void setShowJVSuffix(boolean b) - { - showJVSuffix = b; - } - - public boolean getShowAnnotation() - { - return showAnnotation; - } - - public void setShowAnnotation(boolean b) - { - showAnnotation = b; - } - - public boolean getScaleAboveWrapped() - { - return scaleAboveWrapped; - } - - public boolean getScaleLeftWrapped() - { - return scaleLeftWrapped; - } - - public boolean getScaleRightWrapped() - { - return scaleRightWrapped; - } - - public void setScaleAboveWrapped(boolean b) - { - scaleAboveWrapped = b; - } - - public void setScaleLeftWrapped(boolean b) - { - scaleLeftWrapped = b; - } - - public void setScaleRightWrapped(boolean b) - { - scaleRightWrapped = b; - } - - public void setIgnoreGapsConsensus(boolean b) - { - ignoreGapsInConsensusCalculation = b; - updateConsensus(null); - if (globalColourScheme != null) + else { - globalColourScheme.setThreshold(globalColourScheme.getThreshold(), - ignoreGapsInConsensusCalculation); - + return; } - } - - public boolean getShowHiddenMarkers() - { - return showHiddenMarkers; - } - - public void setShowHiddenMarkers(boolean show) - { - showHiddenMarkers = show; - } - boolean centreColumnLabels; - - public boolean getCentreColumnLabels() - { - return centreColumnLabels; - } - - public boolean followHighlight = true; - - public boolean getFollowHighlight() - { - return followHighlight; - } - - public boolean followSelection = true; + CommandI mappedCommand = ssm.mapCommand(command, undo, getAlignment(), + getGapCharacter()); + if (mappedCommand != null) + { + mappedCommand.doCommand(null); + firePropertyChange("alignment", null, getAlignment().getSequences()); - /** - * @return true if view selection should always follow the selections - * broadcast by other selection sources - */ - public boolean getFollowSelection() - { - return followSelection; + // ap.scalePanelHolder.repaint(); + // ap.repaint(); + } } - public void sendSelection() + @Override + public VamsasSource getVamsasSource() { - jalview.structure.StructureSelectionManager - .getStructureSelectionManager(applet).sendSelection( - new SequenceGroup(getSelectionGroup()), - new ColumnSelection(getColumnSelection()), this); + return this; } /** - * synthesize a column selection if none exists so it covers the given - * selection group. if wholewidth is false, no column selection is made if the - * selection group covers the whole alignment width. - * - * @param sg - * @param wholewidth + * If this viewport has a (Protein/cDNA) complement, then scroll the + * complementary alignment to match this one. */ - public void expandColSelection(SequenceGroup sg, boolean wholewidth) + public void scrollComplementaryAlignment(AlignmentPanel complementPanel) { - int sgs, sge; - if (sg != null - && (sgs = sg.getStartRes()) >= 0 - && sg.getStartRes() <= (sge = sg.getEndRes()) - && (colSel == null || colSel.getSelected() == null || colSel - .getSelected().size() == 0)) + if (complementPanel == null) { - if (!wholewidth && alignment.getWidth() == (1 + sge - sgs)) - { - // do nothing - return; - } - if (colSel == null) - { - colSel = new ColumnSelection(); - } - for (int cspos = sg.getStartRes(); cspos <= sg.getEndRes(); cspos++) - { - colSel.addElement(cspos); - } + return; } - } - - @Override - public boolean hasHiddenColumns() - { - return hasHiddenColumns; - } - - public boolean isNormaliseSequenceLogo() - { - return normaliseSequenceLogo; - } - public void setNormaliseSequenceLogo(boolean state) - { - normaliseSequenceLogo = state; + /* + * Populate a SearchResults object with the mapped location to scroll to. If + * there is no complement, or it is not following highlights, or no mapping + * is found, the result will be empty. + */ + SearchResultsI sr = new SearchResults(); + int seqOffset = findComplementScrollTarget(sr); + if (!sr.isEmpty()) + { + complementPanel.setToScrollComplementPanel(false); + complementPanel.scrollToCentre(sr, seqOffset); + complementPanel.setToScrollComplementPanel(true); + } } /** + * Applies the supplied feature settings descriptor to currently known + * features. This supports an 'initial configuration' of feature colouring + * based on a preset or user favourite. This may then be modified in the usual + * way using the Feature Settings dialogue. * - * @return true if alignment characters should be displayed + * @param featureSettings */ - public boolean isValidCharWidth() + @Override + public void applyFeaturesStyle(FeatureSettingsModelI featureSettings) { - return validCharWidth; + // TODO implement for applet } }