X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FMCview%2FAppletPDBCanvas.java;h=e11e5583402d86e07e4893d783fb85f680367e9f;hb=a14da63fa1dabed03c67eadc39c6b4a61c5102f0;hp=a61ecb2a63b25b9ed1ac2a8b61e43bb7ffa6be2e;hpb=269257481bdc261d6f99cb43dac33c10c3b4e9e1;p=jalview.git

diff --git a/src/MCview/AppletPDBCanvas.java b/src/MCview/AppletPDBCanvas.java
index a61ecb2..e11e558 100755
--- a/src/MCview/AppletPDBCanvas.java
+++ b/src/MCview/AppletPDBCanvas.java
@@ -83,6 +83,7 @@ public class AppletPDBCanvas
 
   public AppletPDBCanvas(PDBEntry pdbentry,
                          SequenceI[] seq,
+                         String [] chains,
                          AlignmentPanel ap,
                          String protocol)
 
@@ -94,12 +95,11 @@ public class AppletPDBCanvas
     ssm = StructureSelectionManager.getStructureSelectionManager();
 
     try{
-      pdb = ssm.setMapping(seq, pdbentry.getFile(), protocol);
+      pdb = ssm.setMapping(seq, chains, pdbentry.getFile(), protocol);
 
       if(protocol.equals(jalview.io.AppletFormatAdapter.PASTE))
        pdbentry.setFile("INLINE"+pdb.id);
-      //if (fr!=null)
-      //  fr.featuresAdded();
+
     }catch(Exception ex)
     {
       ex.printStackTrace();
@@ -110,9 +110,7 @@ public class AppletPDBCanvas
 
     ssm.addStructureViewerListener(this);
 
-    colourBySequence(ap.getSequenceRenderer(),
-                     ap.av.getShowSequenceFeatures() ?
-                     fr : null);
+    colourBySequence();
 
     int max = -10;
     int maxchain = -1;
@@ -120,7 +118,6 @@ public class AppletPDBCanvas
     int pdbend = 0;
     int seqstart = 0;
     int seqend = 0;
-    AlignSeq maxAlignseq = null;
 
     //JUST DEAL WITH ONE SEQUENCE FOR NOW
     SequenceI sequence = seq[0];
@@ -167,8 +164,7 @@ public class AppletPDBCanvas
         pdbend = as.seq2end;
         seqstart = as.seq1start + sequence.getStart() - 1;
         seqend = as.seq1end + sequence.getEnd() - 1;
-        maxAlignseq = as;
-      }
+       }
 
       mappingDetails.append("\nPDB start/end " + pdbstart + " " + pdbend);
       mappingDetails.append("\nSEQ start/end " + seqstart + " " + seqend);
@@ -243,9 +239,7 @@ public class AppletPDBCanvas
       }
     }
     seqColoursReady = true;
-    colourBySequence(ap.getSequenceRenderer(),
-                               ap.av.getShowSequenceFeatures() ?
-                               fr : null);
+    colourBySequence();
     redrawneeded = true;
     repaint();
   }
@@ -500,19 +494,21 @@ public class AppletPDBCanvas
 
   // This method has been taken out of PDBChain to allow
   // Applet and Application specific sequence renderers to be used
-  void colourBySequence(SequenceRenderer sr, FeatureRenderer seqcanvasfr)
+  void colourBySequence()
   {
+    SequenceRenderer sr = new SequenceRenderer(ap.av);
+
     StructureMapping[] mapping = ssm.getMapping(pdbentry.getFile());
 
     boolean showFeatures = false;
-    if (seqcanvasfr!=null)
+    if (ap.av.getShowSequenceFeatures())
     {
       if (fr == null)
       {
         fr = new jalview.appletgui.FeatureRenderer(ap.av);
       }
 
-      fr.transferSettings(seqcanvasfr);
+      fr.transferSettings(ap.getFeatureRenderer());
 
       showFeatures = true;
     }
@@ -1080,7 +1076,7 @@ public class AppletPDBCanvas
   ///StructureListener
   public String getPdbFile()
   {
-    return "???";
+    return pdbentry.getFile();
   }
 
 
@@ -1161,10 +1157,7 @@ public class AppletPDBCanvas
 
   public void updateColours(Object source)
   {
-    AlignmentPanel ap = (AlignmentPanel) source;
-    colourBySequence(ap.getSequenceRenderer(),
-                     ap.av.getShowSequenceFeatures() ?
-                     fr : null);
+    colourBySequence();
     redrawneeded = true;
     repaint();
   }