X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FCommands.java;fp=src%2Fjalview%2Fbin%2FCommands.java;h=84effe016b529403f0be1db10d11e93fb669f20c;hb=0a648fa578eef83e9f17a1d581aba8fcf9a393da;hp=7f493e0ff15fe9e21b683c4cdbc6942da9b4e2c4;hpb=44911c7c05cf7a2386ce9929664be64699d5d438;p=jalview.git diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java index 7f493e0..84effe0 100644 --- a/src/jalview/bin/Commands.java +++ b/src/jalview/bin/Commands.java @@ -574,17 +574,22 @@ public class Commands Console.error("Failed to import and open structure view."); continue; } - while (sv.isBusy()) + try { - try { - Thread.sleep(25); - } - catch (Exception x) { - + while (sv.isBusy()) + Thread.sleep(25); + if (sv.isBusy()) + { + Console.debug( + "Waiting for viewer for " + structureFilepath); + } } - } + } catch (Exception x) + { + } + Console.debug("Successfully opened viewer for "+structureFilepath); String structureImageFilename = ArgParser.getValueFromSubValOrArg( avm, av, Arg.STRUCTUREIMAGE, subVals); if (sv != null && structureImageFilename != null) @@ -624,12 +629,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 @@ -641,8 +647,11 @@ public class Commands { AppJmol jmol = (AppJmol) sview; try { + Console.debug("Rendering image to "+structureImageFile); jmol.makePDBImage(structureImageFile, imageType, renderer, userBis); + Console.debug("Finished Rendering image to "+structureImageFile); + } catch (ImageOutputException ioexc) {