From fb1fb73bd1e6b08de09932c98d39b847dda1cf9a Mon Sep 17 00:00:00 2001 From: James Procter Date: Thu, 6 Jul 2023 18:17:14 +0100 Subject: [PATCH 1/1] JAL-629 liberal defensive coding, comments about refactoring and DEBUG output for --structureimage --- src/jalview/bin/Commands.java | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java index e77e45d..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; } - try { + try { - while (sv.isBusy()) - Thread.sleep(25); + { + while (sv.isBusy()) + Thread.sleep(25); + if (sv.isBusy()) + { + Console.debug( + "Waiting for viewer for " + structureFilepath); + } } - } - catch (Exception x) + } 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) { -- 1.7.10.2