git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b101d3b
)
JAL-629 liberal defensive coding, comments about refactoring and DEBUG output for...
author
James Procter
<j.procter@dundee.ac.uk>
Thu, 6 Jul 2023 17:17:14 +0000
(18:17 +0100)
committer
James Procter
<j.procter@dundee.ac.uk>
Thu, 6 Jul 2023 17:17:14 +0000
(18:17 +0100)
src/jalview/bin/Commands.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Commands.java
b/src/jalview/bin/Commands.java
index
e77e45d
..
84effe0
100644
(file)
--- 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;
}
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)
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);
}
BitmapImageSizing userBis = ImageMaker
.parseScaleWidthHeightStrings(scale, width, height);
+ // TODO MAKE THIS VIEWER INDEPENDENT!!
switch (StructureViewer.getViewerType())
{
case JMOL:
try
{
switch (StructureViewer.getViewerType())
{
case JMOL:
try
{
- Thread.sleep(1000);
+ Thread.sleep(1000); // WHY ???
} catch (InterruptedException e)
{
// TODO Auto-generated catch block
} catch (InterruptedException e)
{
// TODO Auto-generated catch block
@@
-641,8
+647,11
@@
public class Commands
{
AppJmol jmol = (AppJmol) sview;
try {
{
AppJmol jmol = (AppJmol) sview;
try {
+ Console.debug("Rendering image to "+structureImageFile);
jmol.makePDBImage(structureImageFile, imageType, renderer,
userBis);
jmol.makePDBImage(structureImageFile, imageType, renderer,
userBis);
+ Console.debug("Finished Rendering image to "+structureImageFile);
+
}
catch (ImageOutputException ioexc)
{
}
catch (ImageOutputException ioexc)
{