X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewChimeraBindingModel.java;h=cdc0b919593604ae617e3f72d5ed511b79c1c1a9;hb=34a685e3f7f8eab7a6f5b2b93a9ff199172d38a4;hp=f7c4878669662059c6e00036916b9b049a0020f6;hpb=ae216fceddd8539d20fa5425cdaef3da73aba8f0;p=jalview.git

diff --git a/src/jalview/gui/JalviewChimeraBindingModel.java b/src/jalview/gui/JalviewChimeraBindingModel.java
index f7c4878..cdc0b91 100644
--- a/src/jalview/gui/JalviewChimeraBindingModel.java
+++ b/src/jalview/gui/JalviewChimeraBindingModel.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
+ * Copyright (C) 2015 The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import jalview.api.AlignmentViewPanel;
@@ -10,6 +30,8 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
 {
   private ChimeraViewFrame cvf;
 
+  private FeatureRenderer fr = null;
+
   public JalviewChimeraBindingModel(ChimeraViewFrame chimeraViewFrame,
           StructureSelectionManager ssm, PDBEntry[] pdbentry,
           SequenceI[][] sequenceIs, String[][] chains, String protocol)
@@ -18,19 +40,16 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
     cvf = chimeraViewFrame;
   }
 
-  FeatureRenderer fr = null;
-
   @Override
-  public jalview.api.FeatureRenderer getFeatureRenderer(
-          AlignmentViewPanel alignment)
+  public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
   {
-    AlignmentPanel ap = (alignment == null) ? cvf.ap
+    AlignmentPanel ap = (alignment == null) ? cvf.getAlignmentPanel()
             : (AlignmentPanel) alignment;
-    if (ap.av.showSequenceFeatures)
+    if (ap.av.isShowSequenceFeatures())
     {
       if (fr == null)
       {
-        fr = ap.cloneFeatureRenderer();
+        fr = (jalview.gui.FeatureRenderer) ap.cloneFeatureRenderer();
       }
       else
       {
@@ -47,10 +66,10 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
   {
     return new SequenceRenderer(((AlignmentPanel) alignment).av);
   }
+
   @Override
   public void refreshGUI()
   {
-    // appJmolWindow.repaint();
     javax.swing.SwingUtilities.invokeLater(new Runnable()
     {
       public void run()
@@ -63,40 +82,57 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
 
   public void updateColours(Object source)
   {
-    AlignmentPanel ap = (AlignmentPanel) source, topap;
+    AlignmentPanel ap = (AlignmentPanel) source;
     // ignore events from panels not used to colour this view
     if (!cvf.isUsedforcolourby(ap))
+    {
       return;
+    }
     if (!isLoadingFromArchive())
     {
-      colourBySequence(ap.av.getShowSequenceFeatures(), ap);
+      colourBySequence(ap.av.isShowSequenceFeatures(), ap);
     }
   }
+
   @Override
   public void releaseReferences(Object svl)
   {
-    // TODO Auto-generated method stub
-
   }
 
   @Override
   protected void releaseUIResources()
   {
-    // TODO Auto-generated method stub
-
   }
 
   @Override
   public void refreshPdbEntries()
   {
-    // TODO Auto-generated method stub
-
   }
 
-  @Override
-  public void showUrl(String url, String target)
+  /**
+   * Send an asynchronous command to Chimera, in a new thread, optionally with
+   * an 'in progress' message in a progress bar somewhere
+   */
+  protected void sendAsynchronousCommand(final String command,
+          final String progressMsg)
   {
-    // TODO Auto-generated method stub
+    Thread thread = new Thread(new Runnable()
+    {
+
+      @Override
+      public void run()
+      {
+        long stm = cvf.startProgressBar(progressMsg);
+        try
+        {
+          sendChimeraCommand(command, false);
+        } finally
+        {
+          cvf.stopProgressBar(null, stm);
+        }
+      }
+    });
+    thread.start();
 
   }
 }