X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewChimeraBindingModel.java;h=9d63c6a616e3ed7ab91c7a2fc49d8c11cf5e18b0;hb=37cf4fec843890d780d400a50439cc16cbc1c98a;hp=a1f05bd9426cdff70ad6ecda5558ee8eba8c595c;hpb=4762b29420ed4df01b55a8afe5ab05467aaf41a9;p=jalview.git diff --git a/src/jalview/gui/JalviewChimeraBindingModel.java b/src/jalview/gui/JalviewChimeraBindingModel.java index a1f05bd..9d63c6a 100644 --- a/src/jalview/gui/JalviewChimeraBindingModel.java +++ b/src/jalview/gui/JalviewChimeraBindingModel.java @@ -27,6 +27,7 @@ import jalview.datamodel.SequenceI; import jalview.ext.rbvi.chimera.JalviewChimeraBinding; import jalview.io.DataSourceType; import jalview.structure.StructureSelectionManager; +import jalview.viewmodel.seqfeatures.FeatureRendererModel; import javax.swing.SwingUtilities; @@ -34,9 +35,6 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding { private ChimeraViewFrame cvf; - private FeatureRenderer fr = null; - - public JalviewChimeraBindingModel(ChimeraViewFrame chimeraViewFrame, StructureSelectionManager ssm, PDBEntry[] pdbentry, SequenceI[][] sequenceIs, DataSourceType protocol) @@ -46,23 +44,16 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding } @Override - public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment) + public FeatureRendererModel getFeatureRenderer(AlignmentViewPanel alignment) { AlignmentPanel ap = (alignment == null) ? cvf.getAlignmentPanel() : (AlignmentPanel) alignment; if (ap.av.isShowSequenceFeatures()) { - if (fr == null) - { - fr = (jalview.gui.FeatureRenderer) ap.cloneFeatureRenderer(); - } - else - { - ap.updateFeatureRenderer(fr); - } + return ap.getSeqPanel().seqCanvas.fr; } - return fr; + return null; } @Override @@ -124,8 +115,8 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding protected void sendAsynchronousCommand(final String command, final String progressMsg) { - final long handle = progressMsg == null ? 0 : cvf - .startProgressBar(progressMsg); + final long handle = progressMsg == null ? 0 + : cvf.startProgressBar(progressMsg); SwingUtilities.invokeLater(new Runnable() { @Override