X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCommands.java;h=17a1af23857becde1dd2db1095896f1b3e58ae6b;hb=91bb9b5c473c14f3381fbea3570b4dc1875b68f2;hp=64c1e7292a9f996ceeddccd9e341f7e9e02b4c8d;hpb=55be75760a07698418e5c5cf4d84119f19a5ba4d;p=jalview.git diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java index 64c1e72..17a1af2 100644 --- a/src/jalview/bin/Commands.java +++ b/src/jalview/bin/Commands.java @@ -44,6 +44,7 @@ import jalview.io.FileLoader; import jalview.io.HtmlSvgOutput; import jalview.io.IdentifyFile; import jalview.io.NewickFile; +import jalview.io.exceptions.ImageOutputException; import jalview.schemes.ColourSchemeI; import jalview.schemes.ColourSchemeProperty; import jalview.structure.StructureImportSettings.TFType; @@ -102,16 +103,20 @@ public class Commands theseArgsWereParsed &= processLinked(id); processGroovyScript(id); boolean processLinkedOkay = theseArgsWereParsed; - + // wait around until alignFrame isn't busy - AlignFrame af=afMap.get(id); - while (af!=null && af.getViewport().isCalcInProgress()) + AlignFrame af = afMap.get(id); + while (af != null && af.getViewport().isCalcInProgress()) { - try { + try + { Thread.sleep(25); - } catch (Exception q) {}; + } catch (Exception q) + { + } + ; } - + theseArgsWereParsed &= processImages(id); if (processLinkedOkay) theseArgsWereParsed &= processOutput(id); @@ -262,12 +267,16 @@ public class Commands if ("" != colour) { ColourSchemeI cs = ColourSchemeProperty.getColourScheme( - af.getViewport(), af.getViewport().getAlignment(), colour); - - if (cs==null && !"None".equals(colour)) + af.getViewport(), af.getViewport().getAlignment(), + colour); + + if (cs == null && !"None".equals(colour)) + { + Console.warn( + "Couldn't parse '" + colour + "' as a colourscheme."); + } + else { - Console.warn("Couldn't parse '"+colour+"' as a colourscheme."); - } else { af.changeColour(cs); } Jalview.testoutput(argParser, Arg.COLOUR, "zappo", colour); @@ -568,11 +577,36 @@ public class Commands structureFilepath, tft, paeFilepath, false, ssFromStructure, false, viewerType); - if (headless) + if (sv == null) + { + Console.error("Failed to import and open structure view."); + continue; + } + try { - sv.setAsync(false); + long tries = 1000; + while (sv.isBusy() && tries > 0) + { + Thread.sleep(25); + if (sv.isBusy()) + { + tries--; + Console.debug( + "Waiting for viewer for " + structureFilepath); + } + } + if (tries == 0 && sv.isBusy()) + { + Console.warn( + "Gave up waiting for structure viewer to load. Something may have gone wrong."); + } + } catch (Exception x) + { + Console.warn("Exception whilst waiting for structure viewer " + + structureFilepath, x); } - + Console.debug( + "Successfully opened viewer for " + structureFilepath); String structureImageFilename = ArgParser.getValueFromSubValOrArg( avm, av, Arg.STRUCTUREIMAGE, subVals); if (sv != null && structureImageFilename != null) @@ -612,12 +646,13 @@ public class Commands } BitmapImageSizing userBis = ImageMaker .parseScaleWidthHeightStrings(scale, width, height); + // TODO MAKE THIS VIEWER INDEPENDENT!! switch (StructureViewer.getViewerType()) { case JMOL: try { - Thread.sleep(1000); + Thread.sleep(1000); // WHY ??? } catch (InterruptedException e) { // TODO Auto-generated catch block @@ -628,8 +663,20 @@ public class Commands if (sview instanceof AppJmol) { AppJmol jmol = (AppJmol) sview; - jmol.makePDBImage(structureImageFile, imageType, renderer, - userBis); + try + { + Console.debug("Rendering image to " + structureImageFile); + jmol.makePDBImage(structureImageFile, imageType, renderer, + userBis); + Console.debug("Finished Rendering image to " + + structureImageFile); + + } catch (ImageOutputException ioexc) + { + Console.warn("Unexpected error whilst exporting image to " + + structureImageFile, ioexc); + } + } break; default: @@ -737,54 +784,60 @@ public class Commands Cache.setProperty("EXPORT_EMBBED_BIOJSON", "false"); Console.info("Writing " + file); - - switch (type) + try { - - case "svg": - Console.debug("Outputting type '" + type + "' to " + fileName); - af.createSVG(file, renderer); - break; - - case "png": - Console.debug("Outputting type '" + type + "' to " + fileName); - af.createPNG(file, null, userBis); - break; - - case "html": - Console.debug("Outputting type '" + type + "' to " + fileName); - HtmlSvgOutput htmlSVG = new HtmlSvgOutput(af.alignPanel); - htmlSVG.exportHTML(fileName, renderer); - break; - - case "biojs": - Console.debug("Creating BioJS MSA Viwer HTML file: " + fileName); - try + switch (type) { - BioJsHTMLOutput.refreshVersionInfo( - BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY); - } catch (URISyntaxException e) - { - e.printStackTrace(); + + case "svg": + Console.debug("Outputting type '" + type + "' to " + fileName); + af.createSVG(file, renderer); + break; + + case "png": + Console.debug("Outputting type '" + type + "' to " + fileName); + af.createPNG(file, null, userBis); + break; + + case "html": + Console.debug("Outputting type '" + type + "' to " + fileName); + HtmlSvgOutput htmlSVG = new HtmlSvgOutput(af.alignPanel); + htmlSVG.exportHTML(fileName, renderer); + break; + + case "biojs": + Console.debug( + "Creating BioJS MSA Viwer HTML file: " + fileName); + try + { + BioJsHTMLOutput.refreshVersionInfo( + BioJsHTMLOutput.BJS_TEMPLATES_LOCAL_DIRECTORY); + } catch (URISyntaxException e) + { + e.printStackTrace(); + } + BioJsHTMLOutput bjs = new BioJsHTMLOutput(af.alignPanel); + bjs.exportHTML(fileName); + break; + + case "eps": + Console.debug("Creating EPS file: " + fileName); + af.createEPS(file, name); + break; + + case "imagemap": + Console.debug("Creating ImageMap file: " + fileName); + af.createImageMap(file, name); + break; + + default: + Console.warn(Arg.IMAGE.argString() + " type '" + type + + "' not known. Ignoring"); + break; } - BioJsHTMLOutput bjs = new BioJsHTMLOutput(af.alignPanel); - bjs.exportHTML(fileName); - break; - - case "eps": - Console.debug("Creating EPS file: " + fileName); - af.createEPS(file, name); - break; - - case "imagemap": - Console.debug("Creating ImageMap file: " + fileName); - af.createImageMap(file, name); - break; - - default: - Console.warn(Arg.IMAGE.argString() + " type '" + type - + "' not known. Ignoring"); - break; + } catch (Exception ioex) + { + Console.warn("Unexpected error during export", ioex); } } } @@ -809,6 +862,7 @@ public class Commands String val = av.getValue(); SubVals subVals = av.getSubVals(); String fileName = subVals.getContent(); + boolean stdout = ArgParser.STDOUTFILENAME.equals(fileName); File file = new File(fileName); boolean overwrite = ArgParser.getFromSubValArgOrPref(avm, Arg.OVERWRITE, subVals, null, "OVERWRITE_OUTPUT", false); @@ -821,7 +875,7 @@ public class Commands !Platform.isHeadless()); // if backups is not true then --overwrite must be specified - if (file.exists() && !(overwrite || backups)) + if (file.exists() && !(overwrite || backups || stdout)) { Console.error("Won't overwrite file '" + fileName + "' without " + Arg.OVERWRITE.argString() + " or " @@ -859,23 +913,30 @@ public class Commands } if (ff == null) { - StringBuilder validSB = new StringBuilder(); - for (String f : validFormats) - { - if (validSB.length() > 0) - validSB.append(", "); - validSB.append(f); - FileFormatI tff = ffs.forName(f); - validSB.append(" ("); - validSB.append(tff.getExtensions()); - validSB.append(")"); + if (stdout) + { + ff = FileFormat.Fasta; } + else + { + StringBuilder validSB = new StringBuilder(); + for (String f : validFormats) + { + if (validSB.length() > 0) + validSB.append(", "); + validSB.append(f); + FileFormatI tff = ffs.forName(f); + validSB.append(" ("); + validSB.append(tff.getExtensions()); + validSB.append(")"); + } - Jalview.exit("No valid format specified for " - + Arg.OUTPUT.argString() + ". Valid formats are " - + validSB.toString() + ".", 1); - // this return really shouldn't happen - return false; + Jalview.exit("No valid format specified for " + + Arg.OUTPUT.argString() + ". Valid formats are " + + validSB.toString() + ".", 1); + // this return really shouldn't happen + return false; + } } String savedBackupsPreference = Cache @@ -886,7 +947,7 @@ public class Commands Console.info("Writing " + fileName); - af.saveAlignment(fileName, ff); + af.saveAlignment(fileName, ff, stdout); Console.debug("Returning backups to " + savedBackupsPreference); if (savedBackupsPreference != null) Cache.applicationProperties.put(BackupFiles.ENABLED,