-\r
/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
*/\r
package jalview.appletgui;\r
\r
-import jalview.datamodel.*;\r
+import java.util.*;\r
\r
import java.awt.*;\r
\r
-import java.util.*;\r
+import java.awt.event.*;\r
+\r
+\r
+import jalview.datamodel.*;\r
\r
/**\r
* DOCUMENT ME!\r
*/\r
public class FeatureRenderer\r
{\r
- AlignViewport av;\r
+ AlignViewport av;\r
\r
- Hashtable featureColours = new Hashtable();\r
+ Hashtable featureColours = new Hashtable();\r
\r
- // A higher level for grouping features of a\r
- // particular type\r
- Hashtable featureGroups = null;\r
+ // A higher level for grouping features of a\r
+ // particular type\r
+ Hashtable featureGroups = null;\r
\r
- // Holds web links for feature groups and feature types\r
- // in the form label|link\r
- Hashtable featureLinks = null;\r
+ // Holds web links for feature groups and feature types\r
+ // in the form label|link\r
+ Hashtable featureLinks = null;\r
\r
+ // This is actually an Integer held in the hashtable,\r
+ // Retrieved using the key feature type\r
+ Object currentColour;\r
\r
- // This is actually an Integer held in the hashtable,\r
- // Retrieved using the key feature type\r
- Object currentColour;\r
+ String[] renderOrder;\r
\r
- String [] renderOrder;\r
+ FontMetrics fm;\r
+ int charOffset;\r
\r
- FontMetrics fm;\r
- int charOffset;\r
+ float transparency = 1f;\r
\r
- float transparency = 1f;\r
+ TransparencySetter transparencySetter = null;\r
\r
- TransparencySetter transparencySetter = null;\r
+ /**\r
+ * Creates a new FeatureRenderer object.\r
+ *\r
+ * @param av DOCUMENT ME!\r
+ */\r
+ public FeatureRenderer(AlignViewport av)\r
+ {\r
+ this.av = av;\r
\r
- /**\r
- * Creates a new FeatureRenderer object.\r
- *\r
- * @param av DOCUMENT ME!\r
- */\r
- public FeatureRenderer(AlignViewport av)\r
+ if (!System.getProperty("java.version").startsWith("1.1"))\r
{\r
- this.av = av;\r
-\r
- if(!System.getProperty("java.version").startsWith("1.1"))\r
- transparencySetter = new TransparencySetter();\r
+ transparencySetter = new TransparencySetter();\r
}\r
+ }\r
\r
+ public void transferSettings(FeatureRenderer fr)\r
+ {\r
+ renderOrder = fr.renderOrder;\r
+ featureGroups = fr.featureGroups;\r
+ featureColours = fr.featureColours;\r
+ transparency = fr.transparency;\r
+ }\r
\r
- public void transferSettings(FeatureRenderer fr)\r
- {\r
- renderOrder = fr.renderOrder;\r
- featureGroups = fr.featureGroups;\r
- featureColours = fr.featureColours;\r
- }\r
\r
+ static String lastFeatureAdded;\r
+ static String lastFeatureGroupAdded;\r
+ static String lastDescriptionAdded;\r
\r
- public Color findFeatureColour(Color initialCol, SequenceI seq, int i)\r
+ int featureIndex = 0;\r
+ boolean deleteFeature = false;\r
+ Panel colourPanel;\r
+ boolean amendFeatures(final SequenceI[] sequences,\r
+ final SequenceFeature[] features,\r
+ boolean newFeatures,\r
+ final AlignmentPanel ap)\r
+ {\r
+ Panel bigPanel = new Panel(new BorderLayout());\r
+ final TextField name = new TextField(16);\r
+ final TextField source = new TextField(16);\r
+ final TextArea description = new TextArea(3, 35);\r
+ final TextField start = new TextField(8);\r
+ final TextField end = new TextField(8);\r
+ final Choice overlaps;\r
+ Button deleteButton = new Button("Delete");\r
+ deleteFeature = false;\r
+\r
+ colourPanel = new Panel(null);\r
+ colourPanel.setSize(110,15);\r
+ final FeatureRenderer fr = this;\r
+\r
+ Panel panel = new Panel(new GridLayout(3, 1));\r
+\r
+ Panel tmp;\r
+\r
+ ///////////////////////////////////////\r
+ ///MULTIPLE FEATURES AT SELECTED RESIDUE\r
+ if(!newFeatures && features.length>1)\r
{\r
- overview = true;\r
- if(!av.showSequenceFeatures)\r
- return initialCol;\r
+ panel = new Panel(new GridLayout(4, 1));\r
+ tmp = new Panel();\r
+ tmp.add(new Label("Select Feature: "));\r
+ overlaps = new Choice();\r
+ for(int i=0; i<features.length; i++)\r
+ {\r
+ String item = features[i].getType()\r
+ +"/"+features[i].getBegin()+"-"+features[i].getEnd();\r
+\r
+ if(features[i].getFeatureGroup()!=null)\r
+ item += " ("+features[i].getFeatureGroup()+")";\r
+\r
+ overlaps.addItem(item);\r
+ }\r
+\r
+ tmp.add(overlaps);\r
+\r
+ overlaps.addItemListener(new java.awt.event.ItemListener()\r
+ {\r
+ public void itemStateChanged(java.awt.event.ItemEvent e)\r
+ {\r
+ int index = overlaps.getSelectedIndex();\r
+ if (index != -1)\r
+ {\r
+ featureIndex = index;\r
+ name.setText(features[index].getType());\r
+ description.setText(features[index].getDescription());\r
+ source.setText(features[index].getFeatureGroup());\r
+ start.setText(features[index].getBegin()+"");\r
+ end.setText(features[index].getEnd()+"");\r
+\r
+ SearchResults highlight = new SearchResults();\r
+ highlight.addResult(sequences[0],\r
+ features[index].getBegin(),\r
+ features[index].getEnd());\r
+\r
+ ap.seqPanel.seqCanvas.highlightSearchResults(highlight);\r
+\r
+ }\r
+ Color col = getColour(name.getText());\r
+ if (col == null)\r
+ {\r
+ col = new\r
+ jalview.schemes.UserColourScheme()\r
+ .createColourFromName(name.getText());\r
+ }\r
+\r
+ colourPanel.setBackground(col);\r
+ }\r
+ });\r
\r
- lastSequence = seq;\r
- sequenceFeatures = lastSequence.getSequenceFeatures();\r
- if(sequenceFeatures==null)\r
- return initialCol;\r
\r
- sfSize = sequenceFeatures.length;\r
+ panel.add(tmp);\r
+ }\r
+ //////////\r
+ //////////////////////////////////////\r
\r
- if(jalview.util.Comparison.isGap(lastSequence.getCharAt(i)))\r
- return Color.white;\r
\r
- currentColour = null;\r
+ tmp = new Panel();\r
+ panel.add(tmp);\r
+ tmp.add(new Label("Name: ", Label.RIGHT));\r
+ tmp.add(name);\r
\r
- drawSequence(null, lastSequence, lastSequence.findPosition(i), -1,-1, -1, -1);\r
+ tmp = new Panel();\r
+ panel.add(tmp);\r
+ tmp.add(new Label("Group: ",Label.RIGHT));\r
+ tmp.add(source);\r
\r
- if(currentColour==null)\r
- return initialCol;\r
+ tmp = new Panel();\r
+ panel.add(tmp);\r
+ tmp.add(new Label("Colour: ", Label.RIGHT));\r
+ tmp.add(colourPanel);\r
\r
- return new Color( ((Integer)currentColour).intValue() );\r
- }\r
+ bigPanel.add(panel, BorderLayout.NORTH);\r
\r
- /**\r
- * This is used by the Molecule Viewer to get the accurate colour\r
- * of the rendered sequence\r
- */\r
- boolean overview = false;\r
+ panel = new Panel();\r
+ panel.add(new Label("Description: ", Label.RIGHT));\r
+ panel.add(new ScrollPane().add(description));\r
\r
- int white = Color.white.getRGB();\r
- public int findFeatureColour(int initialCol, int seqIndex, int column)\r
+ if (!newFeatures)\r
+ {\r
+ bigPanel.add(panel, BorderLayout.SOUTH);\r
+\r
+ panel = new Panel();\r
+ panel.add(new Label(" Start:", Label.RIGHT));\r
+ panel.add(start);\r
+ panel.add(new Label(" End:", Label.RIGHT));\r
+ panel.add(end);\r
+ bigPanel.add(panel, BorderLayout.CENTER);\r
+ }\r
+ else\r
{\r
- if(!av.showSequenceFeatures)\r
- return initialCol;\r
+ bigPanel.add(panel, BorderLayout.CENTER);\r
+ }\r
\r
- if(seqIndex!=lastSequenceIndex)\r
+ if (lastFeatureAdded == null)\r
+ {\r
+ if (features[0].type != null)\r
+ {\r
+ lastFeatureAdded = features[0].type;\r
+ }\r
+ else\r
{\r
- lastSequence = av.alignment.getSequenceAt(seqIndex);\r
- lastSequenceIndex = seqIndex;\r
- sequenceFeatures = lastSequence.getSequenceFeatures();\r
- if(sequenceFeatures==null)\r
- return initialCol;\r
+ lastFeatureAdded = "feature_1";\r
+ }\r
+ }\r
\r
- sfSize = sequenceFeatures.length;\r
+ if (lastFeatureGroupAdded == null)\r
+ {\r
+ if (features[0].featureGroup != null)\r
+ {\r
+ lastFeatureGroupAdded = features[0].featureGroup;\r
+ }\r
+ else\r
+ {\r
+ lastFeatureAdded = "Jalview";\r
}\r
+ }\r
+\r
\r
+ String title = newFeatures ? "Create New Sequence Feature(s)" :\r
+ "Amend/Delete Features for "\r
+ + sequences[0].getName();\r
\r
- if(jalview.util.Comparison.isGap(lastSequence.getCharAt(column)))\r
- return Color.white.getRGB();\r
+ final JVDialog dialog = new JVDialog(ap.alignFrame,\r
+ title,\r
+ true,\r
+ 385,240);\r
\r
- currentColour = null;\r
+ dialog.setMainPanel(bigPanel);\r
\r
- drawSequence(null, lastSequence, lastSequence.findPosition(column), -1,-1, -1, -1);\r
+ if(newFeatures)\r
+ {\r
+ name.setText(lastFeatureAdded);\r
+ source.setText(lastFeatureGroupAdded);\r
+ }\r
+ else\r
+ {\r
+ dialog.ok.setLabel("Amend");\r
+ dialog.buttonPanel.add(deleteButton, 1);\r
+ deleteButton.addActionListener(new ActionListener()\r
+ {\r
+ public void actionPerformed(ActionEvent evt)\r
+ {\r
+ deleteFeature = true;\r
+ dialog.setVisible(false);\r
+ }\r
+ });\r
+ name.setText(features[0].getType());\r
+ source.setText(features[0].getFeatureGroup());\r
+ }\r
\r
- if(currentColour==null)\r
- return initialCol;\r
+ start.setText(features[0].getBegin()+"");\r
+ end.setText(features[0].getEnd()+"");\r
+ description.setText(features[0].getDescription());\r
\r
- return ((Integer)currentColour).intValue();\r
+ Color col = getColour(name.getText());\r
+ if (col == null)\r
+ {\r
+ col = new\r
+ jalview.schemes.UserColourScheme()\r
+ .createColourFromName(name.getText());\r
}\r
\r
+ colourPanel.setBackground(col);\r
\r
- /**\r
- * DOCUMENT ME!\r
- *\r
- * @param g DOCUMENT ME!\r
- * @param seq DOCUMENT ME!\r
- * @param sg DOCUMENT ME!\r
- * @param start DOCUMENT ME!\r
- * @param end DOCUMENT ME!\r
- * @param x1 DOCUMENT ME!\r
- * @param y1 DOCUMENT ME!\r
- * @param width DOCUMENT ME!\r
- * @param height DOCUMENT ME!\r
- */\r
- // String type;\r
- // SequenceFeature sf;\r
- int lastSequenceIndex=-1;\r
- SequenceI lastSequence;\r
- SequenceFeature [] sequenceFeatures;\r
- int sfSize, sfindex, spos, epos;\r
-\r
- public void drawSequence(Graphics g, SequenceI seq,\r
- int start, int end, int y1, int width, int height)\r
- {\r
- if ( seq.getSequenceFeatures() == null\r
- || seq.getSequenceFeatures().length==0)\r
- return;\r
+ dialog.setResizable(true);\r
\r
- if(transparencySetter!=null && g!=null)\r
+\r
+ colourPanel.addMouseListener(new java.awt.event.MouseAdapter()\r
+ {\r
+ public void mousePressed(java.awt.event.MouseEvent evt)\r
{\r
- transparencySetter.setTransparency(g, transparency);\r
+ new UserDefinedColours(fr, ap.alignFrame);\r
}\r
+ });\r
\r
- if (av.featuresDisplayed == null || renderOrder==null)\r
- {\r
- findAllFeatures();\r
- if(av.featuresDisplayed.size()<1)\r
- return;\r
+ dialog.setVisible(true);\r
\r
- sequenceFeatures = seq.getSequenceFeatures();\r
- sfSize = sequenceFeatures.length;\r
- }\r
- if(lastSequence==null || seq!=lastSequence)\r
+ jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();\r
+\r
+ if (dialog.accept)\r
+ {\r
+ //This ensures that the last sequence\r
+ //is refreshed and new features are rendered\r
+ lastSeq = null;\r
+ lastFeatureAdded = name.getText().trim();\r
+ lastFeatureGroupAdded = source.getText().trim();\r
+ lastDescriptionAdded = description.getText().replace('\n', ' ');\r
+ }\r
+\r
+ if(lastFeatureGroupAdded !=null && lastFeatureGroupAdded.length()<1)\r
+ lastFeatureGroupAdded = null;\r
+\r
+\r
+ if (!newFeatures)\r
+ {\r
+ SequenceFeature sf = features[featureIndex];\r
+\r
+ if (dialog.accept)\r
{\r
- lastSequence = seq;\r
- sequenceFeatures = seq.getSequenceFeatures();\r
- sfSize = sequenceFeatures.length;\r
+ sf.type = lastFeatureAdded;\r
+ sf.featureGroup = lastFeatureGroupAdded;\r
+ sf.description = lastDescriptionAdded;\r
+ setColour(sf.type, colourPanel.getBackground());\r
+ try\r
+ {\r
+ sf.begin = Integer.parseInt(start.getText());\r
+ sf.end = Integer.parseInt(end.getText());\r
+ }\r
+ catch (NumberFormatException ex)\r
+ {}\r
+\r
+ ffile.parseDescriptionHTML(sf, false);\r
}\r
- if(!overview)\r
+ if (deleteFeature)\r
{\r
- spos = lastSequence.findPosition(start);\r
- epos = lastSequence.findPosition(end);\r
- if(g!=null)\r
- fm = g.getFontMetrics();\r
+ sequences[0].deleteFeature(sf);\r
}\r
- String type;\r
- for(int renderIndex=0; renderIndex<renderOrder.length; renderIndex++)\r
- {\r
- type = renderOrder[renderIndex];\r
- if(!av.featuresDisplayed.containsKey(type))\r
- continue;\r
\r
- // loop through all features in sequence to find\r
- // current feature to render\r
- for (sfindex = 0; sfindex < sfSize; sfindex++)\r
+ }\r
+ else\r
+ {\r
+ if (dialog.accept && name.getText().length()>0)\r
+ {\r
+ for (int i = 0; i < sequences.length; i++)\r
{\r
- if (!sequenceFeatures[sfindex].type.equals(type))\r
- continue;\r
-\r
- if (featureGroups != null\r
- && sequenceFeatures[sfindex].featureGroup != null\r
- &&\r
- featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)\r
- &&\r
- ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].featureGroup)).\r
- booleanValue())\r
- {\r
- continue;\r
- }\r
+ features[i].type = lastFeatureAdded;\r
+ features[i].featureGroup = lastFeatureGroupAdded;\r
+ features[i].description = lastDescriptionAdded;\r
+ sequences[i].addSequenceFeature(features[i]);\r
+ ffile.parseDescriptionHTML(features[i], false);\r
+ }\r
\r
- if (!overview && (sequenceFeatures[sfindex].getBegin() > epos\r
- || sequenceFeatures[sfindex].getEnd() < spos))\r
- continue;\r
+ if (av.featuresDisplayed == null)\r
+ {\r
+ av.featuresDisplayed = new Hashtable();\r
+ }\r
\r
- if (overview)\r
- {\r
- if (sequenceFeatures[sfindex].begin <= start &&\r
- sequenceFeatures[sfindex].end >= start)\r
- {\r
- currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex].\r
- type);\r
- }\r
+ if (featureGroups == null)\r
+ {\r
+ featureGroups = new Hashtable();\r
+ }\r
\r
- }\r
- else if (sequenceFeatures[sfindex].type.equals("disulfide bond"))\r
- {\r
+ col = colourPanel.getBackground();\r
+ setColour(lastFeatureAdded, col);\r
\r
- renderFeature(g, seq,\r
- seq.findIndex(sequenceFeatures[sfindex].begin) - 1,\r
- seq.findIndex(sequenceFeatures[sfindex].begin) - 1,\r
- new Color( ( (Integer) av.featuresDisplayed.get(\r
- sequenceFeatures[sfindex].type)).intValue()),\r
- start, end, y1, width, height);\r
- renderFeature(g, seq,\r
- seq.findIndex(sequenceFeatures[sfindex].end) - 1,\r
- seq.findIndex(sequenceFeatures[sfindex].end) - 1,\r
- new Color( ( (Integer) av.featuresDisplayed.get(\r
- sequenceFeatures[sfindex].type)).intValue()),\r
- start, end, y1, width, height);\r
+ if(lastFeatureGroupAdded!=null)\r
+ {\r
+ featureGroups.put(lastFeatureGroupAdded, new Boolean(true));\r
+ av.featuresDisplayed.put(lastFeatureGroupAdded,\r
+ new Integer(col.getRGB()));\r
+ }\r
+ findAllFeatures();\r
\r
- }\r
- else\r
- renderFeature(g, seq,\r
- seq.findIndex(sequenceFeatures[sfindex].begin) - 1,\r
- seq.findIndex(sequenceFeatures[sfindex].end) - 1,\r
- getColour(sequenceFeatures[sfindex].type),\r
- start, end, y1, width, height);\r
+ String [] tro = new String[renderOrder.length];\r
+ tro[0] = renderOrder[renderOrder.length-1];\r
+ System.arraycopy(renderOrder,0,tro,1,renderOrder.length-1);\r
+ renderOrder = tro;\r
\r
- }\r
- }\r
+ ap.paintAlignment(true);\r
\r
- if(transparencySetter!=null && g!=null)\r
+ return true;\r
+ }\r
+ else\r
{\r
- transparencySetter.setTransparency(g, 1.0f);\r
+ return false;\r
}\r
}\r
\r
+ findAllFeatures();\r
\r
- char s;\r
- int i;\r
- void renderFeature(Graphics g, SequenceI seq,\r
- int fstart, int fend, Color featureColour, int start, int end, int y1, int width, int height)\r
+ ap.paintAlignment(true);\r
+\r
+ return true;\r
+ }\r
+\r
+\r
+ public Color findFeatureColour(Color initialCol, SequenceI seq, int i)\r
+ {\r
+ overview = true;\r
+ if (!av.showSequenceFeatures)\r
{\r
+ return initialCol;\r
+ }\r
\r
- if (((fstart <= end) && (fend >= start)))\r
- {\r
- if (fstart < start)\r
- { // fix for if the feature we have starts before the sequence start,\r
- fstart = start; // but the feature end is still valid!!\r
- }\r
+ lastSeq = seq;\r
+ sequenceFeatures = lastSeq.getSequenceFeatures();\r
+ if (sequenceFeatures == null)\r
+ {\r
+ return initialCol;\r
+ }\r
\r
- if (fend >= end)\r
- {\r
- fend = end;\r
- }\r
+ sfSize = sequenceFeatures.length;\r
\r
- for (i = fstart; i <= fend; i++)\r
- {\r
- s = seq.getSequence().charAt(i);\r
+ if (jalview.util.Comparison.isGap(lastSeq.getCharAt(i)))\r
+ {\r
+ return Color.white;\r
+ }\r
\r
- if (jalview.util.Comparison.isGap(s))\r
- {\r
- continue;\r
- }\r
+ currentColour = null;\r
\r
- g.setColor(featureColour);\r
+ drawSequence(null, lastSeq, lastSeq.findPosition(i), -1, -1);\r
\r
- g.fillRect( (i - start) * width, y1, width, height);\r
+ if (currentColour == null)\r
+ {\r
+ return initialCol;\r
+ }\r
\r
- if(!av.validCharWidth)\r
- continue;\r
+ return new Color( ( (Integer) currentColour).intValue());\r
+ }\r
\r
- g.setColor(Color.white);\r
- charOffset = (width - fm.charWidth(s)) / 2;\r
- g.drawString(String.valueOf(s),\r
- charOffset + (width * (i - start)),\r
- (y1 + height) - height / 5); //pady = height / 5;\r
+ /**\r
+ * This is used by the Molecule Viewer to get the accurate colour\r
+ * of the rendered sequence\r
+ */\r
+ boolean overview = false;\r
+\r
+\r
+ /**\r
+ * DOCUMENT ME!\r
+ *\r
+ * @param g DOCUMENT ME!\r
+ * @param seq DOCUMENT ME!\r
+ * @param sg DOCUMENT ME!\r
+ * @param start DOCUMENT ME!\r
+ * @param end DOCUMENT ME!\r
+ * @param x1 DOCUMENT ME!\r
+ * @param y1 DOCUMENT ME!\r
+ * @param width DOCUMENT ME!\r
+ * @param height DOCUMENT ME!\r
+ */\r
+ // String type;\r
+ // SequenceFeature sf;\r
+\r
+ SequenceI lastSeq;\r
+ SequenceFeature[] sequenceFeatures;\r
+ int sfSize, sfindex, spos, epos;\r
+\r
+ synchronized public void drawSequence(Graphics g, SequenceI seq,\r
+ int start, int end, int y1)\r
+ {\r
+ if (seq.getSequenceFeatures() == null\r
+ || seq.getSequenceFeatures().length == 0)\r
+ {\r
+ return;\r
+ }\r
\r
- }\r
- }\r
+ if (transparencySetter != null && g != null)\r
+ {\r
+ transparencySetter.setTransparency(g, transparency);\r
}\r
\r
- void findAllFeatures()\r
+ if (lastSeq == null || seq != lastSeq || sequenceFeatures!=seq.getSequenceFeatures())\r
{\r
- av.featuresDisplayed = new Hashtable();\r
- Vector allfeatures = new Vector();\r
- for (int i = 0; i < av.alignment.getHeight(); i++)\r
+ lastSeq = seq;\r
+ sequenceFeatures = seq.getSequenceFeatures();\r
+ sfSize = sequenceFeatures.length;\r
+ }\r
+\r
+ if (av.featuresDisplayed == null || renderOrder == null)\r
+ {\r
+ findAllFeatures();\r
+ if (av.featuresDisplayed.size() < 1)\r
+ {\r
+ return;\r
+ }\r
+\r
+ sequenceFeatures = seq.getSequenceFeatures();\r
+ sfSize = sequenceFeatures.length;\r
+ }\r
+ if (!overview)\r
+ {\r
+ spos = lastSeq.findPosition(start);\r
+ epos = lastSeq.findPosition(end);\r
+ if (g != null)\r
{\r
- SequenceFeature [] features = av.alignment.getSequenceAt(i).getSequenceFeatures();\r
+ fm = g.getFontMetrics();\r
+ }\r
+ }\r
+ String type;\r
+ for (int renderIndex = 0; renderIndex < renderOrder.length; renderIndex++)\r
+ {\r
+ type = renderOrder[renderIndex];\r
+ if (!av.featuresDisplayed.containsKey(type))\r
+ {\r
+ continue;\r
+ }\r
\r
- if (features == null)\r
+ // loop through all features in sequence to find\r
+ // current feature to render\r
+ for (sfindex = 0; sfindex < sfSize; sfindex++)\r
+ {\r
+ if (!sequenceFeatures[sfindex].type.equals(type))\r
+ {\r
continue;\r
+ }\r
+\r
+ if (featureGroups != null\r
+ && sequenceFeatures[sfindex].featureGroup != null\r
+ &&\r
+ featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)\r
+ &&\r
+ ! ( (Boolean) featureGroups.get(sequenceFeatures[sfindex].\r
+ featureGroup)).\r
+ booleanValue())\r
+ {\r
+ continue;\r
+ }\r
\r
- int index = 0;\r
- while (index < features.length)\r
+ if (!overview && (sequenceFeatures[sfindex].getBegin() > epos\r
+ || sequenceFeatures[sfindex].getEnd() < spos))\r
{\r
- if (!av.featuresDisplayed.containsKey(features[index].getType()))\r
+ continue;\r
+ }\r
+\r
+ if (overview)\r
+ {\r
+ if (sequenceFeatures[sfindex].begin <= start &&\r
+ sequenceFeatures[sfindex].end >= start)\r
{\r
- av.featuresDisplayed.put(features[index].getType(),\r
- new Integer( getColour(features[index].getType()).getRGB()) );\r
- allfeatures.addElement(features[index].getType());\r
+ currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex].\r
+ type);\r
}\r
- index++;\r
+\r
+ }\r
+ else if (sequenceFeatures[sfindex].type.equals("disulfide bond"))\r
+ {\r
+\r
+ renderFeature(g, seq,\r
+ seq.findIndex(sequenceFeatures[sfindex].begin) - 1,\r
+ seq.findIndex(sequenceFeatures[sfindex].begin) - 1,\r
+ new Color( ( (Integer) av.featuresDisplayed.get(\r
+ sequenceFeatures[sfindex].type)).intValue()),\r
+ start, end, y1);\r
+ renderFeature(g, seq,\r
+ seq.findIndex(sequenceFeatures[sfindex].end) - 1,\r
+ seq.findIndex(sequenceFeatures[sfindex].end) - 1,\r
+ new Color( ( (Integer) av.featuresDisplayed.get(\r
+ sequenceFeatures[sfindex].type)).intValue()),\r
+ start, end, y1);\r
+\r
+ }\r
+ else\r
+ {\r
+ renderFeature(g, seq,\r
+ seq.findIndex(sequenceFeatures[sfindex].begin) - 1,\r
+ seq.findIndex(sequenceFeatures[sfindex].end) - 1,\r
+ getColour(sequenceFeatures[sfindex].type),\r
+ start, end, y1);\r
}\r
- }\r
\r
- renderOrder = new String[allfeatures.size()];\r
- Enumeration en = allfeatures.elements();\r
- int i = allfeatures.size()-1;\r
- while(en.hasMoreElements())\r
- {\r
- renderOrder[i] = en.nextElement().toString();\r
- i--;\r
}\r
}\r
\r
- public Color getColour(String featureType)\r
+ if (transparencySetter != null && g != null)\r
{\r
- return (Color)featureColours.get(featureType);\r
+ transparencySetter.setTransparency(g, 1.0f);\r
}\r
+ }\r
+\r
+ char s;\r
+ int i;\r
+ void renderFeature(Graphics g, SequenceI seq,\r
+ int fstart, int fend, Color featureColour, int start,\r
+ int end, int y1)\r
+ {\r
\r
- public void addNewFeature(String name, Color col)\r
+ if ( ( (fstart <= end) && (fend >= start)))\r
{\r
+ if (fstart < start)\r
+ { // fix for if the feature we have starts before the sequence start,\r
+ fstart = start; // but the feature end is still valid!!\r
+ }\r
\r
- setColour(name, col);\r
- if(av.featuresDisplayed==null)\r
- av.featuresDisplayed = new Hashtable();\r
+ if (fend >= end)\r
+ {\r
+ fend = end;\r
+ }\r
\r
+ for (i = fstart; i <= fend; i++)\r
+ {\r
+ s = seq.getCharAt(i);\r
\r
- av.featuresDisplayed.put(name, "NOGROUP");\r
- }\r
+ if (jalview.util.Comparison.isGap(s))\r
+ {\r
+ continue;\r
+ }\r
\r
- public void setColour(String featureType, Color col)\r
- {\r
- featureColours.put(featureType, col);\r
+ g.setColor(featureColour);\r
+\r
+ g.fillRect( (i - start) * av.charWidth, y1, av.charWidth, av.charHeight);\r
+\r
+ if (!av.validCharWidth)\r
+ {\r
+ continue;\r
+ }\r
+\r
+ g.setColor(Color.white);\r
+ charOffset = (av.charWidth - fm.charWidth(s)) / 2;\r
+ g.drawString(String.valueOf(s),\r
+ charOffset + (av.charWidth * (i - start)),\r
+ (y1 + av.charHeight) - av.charHeight / 5); //pady = height / 5;\r
+\r
+ }\r
}\r
+ }\r
\r
- public void setFeaturePriority(Object [][] data)\r
+ void findAllFeatures()\r
+ {\r
+ jalview.schemes.UserColourScheme ucs = new\r
+ jalview.schemes.UserColourScheme();\r
+\r
+ av.featuresDisplayed = new Hashtable();\r
+ Vector allfeatures = new Vector();\r
+ for (int i = 0; i < av.alignment.getHeight(); i++)\r
{\r
- // The feature table will display high priority\r
- // features at the top, but theses are the ones\r
- // we need to render last, so invert the data\r
- if(av.featuresDisplayed!=null)\r
- av.featuresDisplayed.clear();\r
+ SequenceFeature[] features = av.alignment.getSequenceAt(i).\r
+ getSequenceFeatures();\r
\r
- renderOrder = new String[data.length];\r
+ if (features == null)\r
+ {\r
+ continue;\r
+ }\r
\r
- if (data.length > 0)\r
- for (int i = 0; i < data.length; i++)\r
+ int index = 0;\r
+ while (index < features.length)\r
+ {\r
+ if (!av.featuresDisplayed.containsKey(features[index].getType()))\r
+ {\r
+ if (getColour(features[index].getType()) == null)\r
{\r
- String type = data[i][0].toString();\r
- setColour(type, (Color) data[i][1]);\r
- if ( ( (Boolean) data[i][2]).booleanValue())\r
- {\r
- av.featuresDisplayed.put(type, new Integer(getColour(type).getRGB()));\r
- }\r
-\r
- renderOrder[data.length - i - 1] = type;\r
+ featureColours.put(features[index].getType(),\r
+ ucs.createColourFromName(features[index].\r
+ getType()));\r
}\r
+\r
+ av.featuresDisplayed.put(features[index].getType(),\r
+ new Integer(getColour(features[index].\r
+ getType()).getRGB()));\r
+ allfeatures.addElement(features[index].getType());\r
+ }\r
+ index++;\r
+ }\r
}\r
-}\r
\r
- class TransparencySetter\r
+ renderOrder = new String[allfeatures.size()];\r
+ Enumeration en = allfeatures.elements();\r
+ int i = allfeatures.size() - 1;\r
+ while (en.hasMoreElements())\r
+ {\r
+ renderOrder[i] = en.nextElement().toString();\r
+ i--;\r
+ }\r
+ }\r
+\r
+ public Color getColour(String featureType)\r
{\r
- void setTransparency(Graphics g, float value)\r
+ if (!featureColours.containsKey(featureType))\r
{\r
- Graphics2D g2 = (Graphics2D) g;\r
- g2.setComposite(\r
- AlphaComposite.getInstance(\r
- AlphaComposite.SRC_OVER, value));\r
+ jalview.schemes.UserColourScheme ucs = new\r
+ jalview.schemes.UserColourScheme();\r
+ Color col = ucs.createColourFromName(featureType);\r
+ featureColours.put(featureType, col);\r
+ return col;\r
}\r
+ else\r
+ return (Color) featureColours.get(featureType);\r
+ }\r
+\r
+\r
+ public void setColour(String featureType, Color col)\r
+ {\r
+ featureColours.put(featureType, col);\r
}\r
\r
+ public void setFeaturePriority(Object[][] data)\r
+ {\r
+ // The feature table will display high priority\r
+ // features at the top, but theses are the ones\r
+ // we need to render last, so invert the data\r
+ if (av.featuresDisplayed != null)\r
+ {\r
+ av.featuresDisplayed.clear();\r
+ }\r
+\r
+ /* if (visibleNew)\r
+ {\r
+ if (av.featuresDisplayed != null)\r
+ {\r
+ av.featuresDisplayed.clear();\r
+ }\r
+ else\r
+ {\r
+ av.featuresDisplayed = new Hashtable();\r
+ }\r
+ }\r
+ if (data == null)\r
+ {\r
+ return;\r
+ }*/\r
+\r
\r
+ renderOrder = new String[data.length];\r
\r
+ if (data.length > 0)\r
+ {\r
+ for (int i = 0; i < data.length; i++)\r
+ {\r
+ String type = data[i][0].toString();\r
+ setColour(type, (Color) data[i][1]);\r
+ if ( ( (Boolean) data[i][2]).booleanValue())\r
+ {\r
+ av.featuresDisplayed.put(type, new Integer(getColour(type).getRGB()));\r
+ }\r
\r
+ renderOrder[data.length - i - 1] = type;\r
+ }\r
+ }\r
+ }\r
+}\r
+\r
+class TransparencySetter\r
+{\r
+ void setTransparency(Graphics g, float value)\r
+ {\r
+ Graphics2D g2 = (Graphics2D) g;\r
+ g2.setComposite(\r
+ AlphaComposite.getInstance(\r
+ AlphaComposite.SRC_OVER, value));\r
+ }\r
+}\r