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
JAL-2438 FeatureColourFinder refactored from FeatureRenderer, fr not
[jalview.git]
/
src
/
MCview
/
PDBCanvas.java
diff --git
a/src/MCview/PDBCanvas.java
b/src/MCview/PDBCanvas.java
index
292de91
..
ae58758
100644
(file)
--- a/
src/MCview/PDBCanvas.java
+++ b/
src/MCview/PDBCanvas.java
@@
-28,6
+28,7
@@
import jalview.gui.FeatureRenderer;
import jalview.gui.SequenceRenderer;
import jalview.io.DataSourceType;
import jalview.io.StructureFile;
import jalview.gui.SequenceRenderer;
import jalview.io.DataSourceType;
import jalview.io.StructureFile;
+import jalview.renderer.seqfeatures.FeatureColourFinder;
import jalview.structure.AtomSpec;
import jalview.structure.StructureListener;
import jalview.structure.StructureMapping;
import jalview.structure.AtomSpec;
import jalview.structure.StructureListener;
import jalview.structure.StructureMapping;
@@
-546,6
+547,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
showFeatures = true;
}
showFeatures = true;
}
+ FeatureColourFinder finder = new FeatureColourFinder(fr);
PDBChain chain;
if (bysequence && pdb != null)
{
PDBChain chain;
if (bysequence && pdb != null)
{
@@
-576,7
+578,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
tmp.startCol = sr.getResidueBoxColour(sequence[s], pos);
if (showFeatures)
{
tmp.startCol = sr.getResidueBoxColour(sequence[s], pos);
if (showFeatures)
{
- tmp.startCol = fr.findFeatureColour(tmp.startCol,
+ tmp.startCol = finder.findFeatureColour(tmp.startCol,
sequence[s], pos);
}
}
sequence[s], pos);
}
}
@@
-587,7
+589,7
@@
public class PDBCanvas extends JPanel implements MouseListener,
tmp.endCol = sr.getResidueBoxColour(sequence[s], pos);
if (showFeatures)
{
tmp.endCol = sr.getResidueBoxColour(sequence[s], pos);
if (showFeatures)
{
- tmp.endCol = fr.findFeatureColour(tmp.endCol,
+ tmp.endCol = finder.findFeatureColour(tmp.endCol,
sequence[s], pos);
}
}
sequence[s], pos);
}
}