X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewChimeraBindingModel.java;h=2f11c30d32ac16b928b84d794eaaaded51e3b20e;hb=b7b29fb6c0b015ac4798ec4718ab0cfbdd79b20a;hp=a797872f2129bad214193648d4ff8b4dcde67749;hpb=f831ddf7f52d6c4a1918e87d94877b22bd322648;p=jalview.git diff --git a/src/jalview/gui/JalviewChimeraBindingModel.java b/src/jalview/gui/JalviewChimeraBindingModel.java index a797872..2f11c30 100644 --- a/src/jalview/gui/JalviewChimeraBindingModel.java +++ b/src/jalview/gui/JalviewChimeraBindingModel.java @@ -28,13 +28,12 @@ import jalview.ext.rbvi.chimera.JalviewChimeraBinding; import jalview.io.DataSourceType; import jalview.structure.StructureSelectionManager; +import javax.swing.SwingUtilities; + public class JalviewChimeraBindingModel extends JalviewChimeraBinding { private ChimeraViewFrame cvf; - private FeatureRenderer fr = null; - - public JalviewChimeraBindingModel(ChimeraViewFrame chimeraViewFrame, StructureSelectionManager ssm, PDBEntry[] pdbentry, SequenceI[][] sequenceIs, DataSourceType protocol) @@ -50,17 +49,10 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding : (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 @@ -122,24 +114,25 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding protected void sendAsynchronousCommand(final String command, final String progressMsg) { - Thread thread = new Thread(new Runnable() + final long handle = progressMsg == null ? 0 + : cvf.startProgressBar(progressMsg); + SwingUtilities.invokeLater(new Runnable() { - @Override public void run() { - long stm = cvf.startProgressBar(progressMsg); try { sendChimeraCommand(command, false); } finally { - cvf.stopProgressBar(null, stm); + if (progressMsg != null) + { + cvf.stopProgressBar(null, handle); + } } } }); - thread.start(); - } @Override