X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FFeatureRenderer.java;h=83a8340256bdcac6172ef3ba31b6136e30589305;hb=b0c3862ae342f88419e5e685de2b56f060358c05;hp=0b504be57b500af56ebac59cb8f562b70a763d2a;hpb=be9cbda993c0cb66255c0eb8274ee2bfa9199220;p=jalview.git diff --git a/src/jalview/appletgui/FeatureRenderer.java b/src/jalview/appletgui/FeatureRenderer.java index 0b504be..83a8340 100755 --- a/src/jalview/appletgui/FeatureRenderer.java +++ b/src/jalview/appletgui/FeatureRenderer.java @@ -60,8 +60,17 @@ public class FeatureRenderer } + public void transferSettings(FeatureRenderer fr) + { + renderOrder = fr.renderOrder; + featureGroups = fr.featureGroups; + featureColours = fr.featureColours; + } + + public Color findFeatureColour(Color initialCol, SequenceI seq, int i) { + overview = true; if(!av.showSequenceFeatures) return initialCol; @@ -187,10 +196,7 @@ public class FeatureRenderer if (!sequenceFeatures[sfindex].type.equals(type)) continue; - if(sequenceFeatures[sfindex]==null) - { - } - else if (featureGroups != null + if (featureGroups != null && sequenceFeatures[sfindex].featureGroup != null && featureGroups.containsKey(sequenceFeatures[sfindex].featureGroup) @@ -207,9 +213,8 @@ public class FeatureRenderer if (overview) { - - if (sequenceFeatures[sfindex].begin - 1 <= start && - sequenceFeatures[sfindex].end + 1 >= start) + if (sequenceFeatures[sfindex].begin <= start && + sequenceFeatures[sfindex].end >= start) { currentColour = av.featuresDisplayed.get(sequenceFeatures[sfindex]. type); @@ -240,9 +245,7 @@ public class FeatureRenderer getColour(sequenceFeatures[sfindex].type), start, end, y1, width, height); - } - } }