X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAppletPDBCanvas.java;h=107d98d39bc5e0164b8aae03c1f043ead8c0053d;hb=05cc1e453976137138e0d24ba0264b8e5f35b628;hp=dc4cf0b6fda07d02f1b6393c721c31ad79d0e07a;hpb=e141c1213b46aa8d98e525f0332a25515161892b;p=jalview.git diff --git a/src/MCview/AppletPDBCanvas.java b/src/MCview/AppletPDBCanvas.java index dc4cf0b..107d98d 100755 --- a/src/MCview/AppletPDBCanvas.java +++ b/src/MCview/AppletPDBCanvas.java @@ -77,6 +77,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion Bond highlightBond1, highlightBond2; boolean errorLoading = false; boolean seqColoursReady = false; + jalview.appletgui.FeatureRenderer fr; public AppletPDBCanvas(jalview.appletgui.SeqCanvas seqcanvas, Sequence seq) { @@ -479,6 +480,18 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion // Applet and Application specific sequence renderers to be used void colourBySequence(PDBChain chain) { + boolean showFeatures = false; + + if(seqcanvas.getViewport().getShowSequenceFeatures()) + { + if(fr==null) + { + fr = new jalview.appletgui.FeatureRenderer(seqcanvas.getViewport()); + } + fr.transferSettings( seqcanvas.getFeatureRenderer()); + showFeatures = true; + } + for (int i = 0; i < chain.bonds.size(); i++) { Bond tmp = (Bond) chain.bonds.elementAt(i); @@ -498,8 +511,8 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion tmp.startCol = seqcanvas.getSequenceRenderer(). getResidueBoxColour( sequence, index); - tmp.startCol = seqcanvas.getFeatureRenderer(). - findFeatureColour(tmp.startCol, sequence, index); + if(showFeatures) + tmp.startCol = fr.findFeatureColour(tmp.startCol, sequence, index); } } @@ -509,18 +522,23 @@ public class AppletPDBCanvas extends Panel implements MouseListener, MouseMotion { tmp.endCol = seqcanvas.getSequenceRenderer(). getResidueBoxColour( sequence, index); - tmp.endCol = seqcanvas.getFeatureRenderer(). - findFeatureColour(tmp.endCol, sequence, index); + + if(showFeatures) + tmp.endCol = fr.findFeatureColour(tmp.endCol, sequence, index); } } } + Zsort zsort; public void drawScene(Graphics g) { + if (zbuffer) + { + if(zsort ==null) + zsort = new Zsort(); - if (zbuffer) { - Zsort.Zsort(visiblebonds); + zsort.Zsort(visiblebonds); }