JAL-629 Allow multiple structure images for multiple structure files for the one...

[jalview.git] / src / jalview / bin / Commands.java

diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java
index 9a85f1e..737c9eb 100644 (file)
--- a/src/jalview/bin/Commands.java
+++ b/src/jalview/bin/Commands.java
@@ -456,35 +456,31 @@ public class Commands
                     + Arg.STRUCTURE.argString() + "=" + val);
             continue;
           }
+          String structureFilename = null;
           File structureFile = null;
           if (subVals.getContent() != null
                   && subVals.getContent().length() != 0)
           {
-            structureFile = new File(subVals.getContent());
+            structureFilename = subVals.getContent();
             Console.debug("Using structure file (from argument) '"
-                    + structureFile.getAbsolutePath() + "'");
+                    + structureFilename + "'");
+            structureFile = new File(structureFilename);
           }
-          // TRY THIS
-          /*
-           * PDBEntry fileEntry = new AssociatePdbFileWithSeq()
-           * .associatePdbWithSeq(selectedPdbFileName, DataSourceType.FILE,
-           * selectedSequence, true, Desktop.instance);
-           * 
-           * sViewer = launchStructureViewer(ssm, new PDBEntry[] { fileEntry }, ap, new
-           * SequenceI[] { selectedSequence });
-           * 
-           */
           /* THIS DOESN'T WORK */
           else if (seq.getAllPDBEntries() != null
                   && seq.getAllPDBEntries().size() > 0)
           {
             structureFile = new File(
                     seq.getAllPDBEntries().elementAt(0).getFile());
-            Console.debug("Using structure file (from sequence) '"
-                    + structureFile.getAbsolutePath() + "'");
+            if (structureFile != null)
+            {
+              Console.debug("Using structure file (from sequence) '"
+                      + structureFile.getAbsolutePath() + "'");
+            }
+            structureFilename = structureFile.getAbsolutePath();
           }
 
-          if (structureFile == null)
+          if (structureFilename == null || structureFile == null)
           {
             addWarn("Not provided structure file with '" + val + "'");
             continue;
@@ -500,6 +496,8 @@ public class Commands
           Console.debug("Using structure file "
                   + structureFile.getAbsolutePath());
 
+          argParser.setStructureFilename(structureFilename);
+
           // open structure view
           AlignmentPanel ap = af.alignPanel;
           if (headless)
@@ -634,8 +632,8 @@ public class Commands
             for (ArgValue structureImageArgValue : avm
                     .getArgValueList(Arg.STRUCTUREIMAGE))
             {
-              String structureImageFilename = structureImageArgValue
-                      .getValue();
+              String structureImageFilename = argParser.makeSubstitutions(
+                      structureImageArgValue.getValue(), id, true);
               if (structureViewer != null && structureImageFilename != null)
               {
                 SubVals structureImageSubVals = null;
@@ -682,6 +680,10 @@ public class Commands
                 this.colourAlignFrame(af, imageColour);
 
                 List<String> extraCommands = new ArrayList<>();
+                // these don't actually do anything to the output image since we
+                // renderScreenImage
+                // extraCommands.add("set antialiasImages on");
+                // extraCommands.add("set antialiasTranslucent on");
 
                 String bgcolour = avm.getValueFromSubValOrArg(
                         structureImageArgValue, Arg.BGCOLOUR,