git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Monospaced font not allowed if charWidth stretched
[jalview.git]
/
src
/
jalview
/
appletgui
/
FeatureRenderer.java
diff --git
a/src/jalview/appletgui/FeatureRenderer.java
b/src/jalview/appletgui/FeatureRenderer.java
index
0b504be
..
900de83
100755
(executable)
--- a/
src/jalview/appletgui/FeatureRenderer.java
+++ b/
src/jalview/appletgui/FeatureRenderer.java
@@
-1,3
+1,4
@@
+
\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
* Jalview - A Sequence Alignment Editor and Viewer
\r
* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
@@
-60,8
+61,17
@@
public class FeatureRenderer
}
\r
\r
\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
public Color findFeatureColour(Color initialCol, SequenceI seq, int i)
\r
{
\r
+ overview = true;
\r
if(!av.showSequenceFeatures)
\r
return initialCol;
\r
\r
if(!av.showSequenceFeatures)
\r
return initialCol;
\r
\r
@@
-187,10
+197,7
@@
public class FeatureRenderer
if (!sequenceFeatures[sfindex].type.equals(type))
\r
continue;
\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
&& sequenceFeatures[sfindex].featureGroup != null
\r
&&
\r
featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup)
\r
@@
-207,9
+214,8
@@
public class FeatureRenderer
\r
if (overview)
\r
{
\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
{
\r
currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex].
\r
type);
\r
@@
-240,9
+246,7
@@
public class FeatureRenderer
getColour(sequenceFeatures[sfindex].type),
\r
start, end, y1, width, height);
\r
\r
getColour(sequenceFeatures[sfindex].type),
\r
start, end, y1, width, height);
\r
\r
-
\r
}
\r
}
\r
-
\r
}
\r
}
\r
\r
}
\r
}
\r
\r
@@
-278,6
+282,9
@@
public class FeatureRenderer
\r
g.fillRect( (i - start) * width, y1, width, height);
\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
g.setColor(Color.white);
\r
charOffset = (width - fm.charWidth(s)) / 2;
\r
g.drawString(String.valueOf(s),
\r