+\r
/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
}\r
\r
\r
+ public void transferSettings(FeatureRenderer fr)\r
+ {\r
+ renderOrder = fr.renderOrder;\r
+ featureGroups = fr.featureGroups;\r
+ featureColours = fr.featureColours;\r
+ }\r
+\r
+\r
public Color findFeatureColour(Color initialCol, SequenceI seq, int i)\r
{\r
+ overview = true;\r
if(!av.showSequenceFeatures)\r
return initialCol;\r
\r
if (!sequenceFeatures[sfindex].type.equals(type))\r
continue;\r
\r
- if(sequenceFeatures[sfindex]==null)\r
- {\r
- }\r
- else if (featureGroups != null\r
+ if (featureGroups != null\r
&& sequenceFeatures[sfindex].featureGroup != null\r
&&\r
featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)\r
\r
if (overview)\r
{\r
-\r
- if (sequenceFeatures[sfindex].begin - 1 <= start &&\r
- sequenceFeatures[sfindex].end + 1 >= start)\r
+ if (sequenceFeatures[sfindex].begin <= start &&\r
+ sequenceFeatures[sfindex].end >= start)\r
{\r
currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex].\r
type);\r
getColour(sequenceFeatures[sfindex].type),\r
start, end, y1, width, height);\r
\r
-\r
}\r
-\r
}\r
}\r
\r
\r
g.fillRect( (i - start) * width, y1, width, height);\r
\r
+ if(!av.validCharWidth)\r
+ continue;\r
+\r
g.setColor(Color.white);\r
charOffset = (width - fm.charWidth(s)) / 2;\r
g.drawString(String.valueOf(s),\r