X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=724cec1b8cbe0804661870885359c51151ae934d;hb=72404f561ccd190eab1990874f017bbe94bf9e10;hp=75e0c5e3d091cf5f12a824a59545429fc147424b;hpb=17fa35af8bae6956fdee231e10ef5928f34ca810;p=jalview.git diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java index 75e0c5e..724cec1 100644 --- a/src/jalview/gui/AppJmolBinding.java +++ b/src/jalview/gui/AppJmolBinding.java @@ -40,33 +40,18 @@ public class AppJmolBinding extends JalviewJmolBinding { private AppJmol appJmolWindow; - private FeatureRenderer fr = null; - public AppJmolBinding(AppJmol appJmol, StructureSelectionManager sSm, - PDBEntry[] pdbentry, SequenceI[][] sequenceIs, DataSourceType protocol) + PDBEntry[] pdbentry, SequenceI[][] sequenceIs, + DataSourceType protocol) { super(sSm, pdbentry, sequenceIs, protocol); appJmolWindow = appJmol; } @Override - public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment) + protected IProgressIndicator getIProgressIndicator() { - AlignmentPanel ap = (alignment == null) ? appJmolWindow - .getAlignmentPanel() : (AlignmentPanel) alignment; - if (ap.av.isShowSequenceFeatures()) - { - if (fr == null) - { - fr = (jalview.gui.FeatureRenderer) ap.cloneFeatureRenderer(); - } - else - { - ap.updateFeatureRenderer(fr); - } - } - - return fr; + return appJmolWindow.progressBar; } @Override @@ -215,4 +200,19 @@ public class AppJmolBinding extends JalviewJmolBinding { return appJmolWindow; } + + @Override + public jalview.api.FeatureRenderer getFeatureRenderer( + AlignmentViewPanel alignment) + { + AlignmentPanel ap = (alignment == null) + ? appJmolWindow.getAlignmentPanel() + : (AlignmentPanel) alignment; + if (ap.av.isShowSequenceFeatures()) + { + return ap.av.getAlignPanel().getSeqPanel().seqCanvas.fr; + } + + return null; + } }