git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-2934proportionalScrolling
[jalview.git]
/
src
/
jalview
/
gui
/
AppJmol.java
diff --git
a/src/jalview/gui/AppJmol.java
b/src/jalview/gui/AppJmol.java
index
cfbac04
..
0aa4878
100644
(file)
--- a/
src/jalview/gui/AppJmol.java
+++ b/
src/jalview/gui/AppJmol.java
@@
-264,6
+264,8
@@
public class AppJmol extends StructureViewerBase
}
jmb.executeCommand(new StructureCommand(command), false);
jmb.executeCommand(new StructureCommand("set hoverDelay=0.1"), false);
}
jmb.executeCommand(new StructureCommand(command), false);
jmb.executeCommand(new StructureCommand("set hoverDelay=0.1"), false);
+ jmb.executeCommand(new StructureCommand("set antialiasdisplay on"),
+ false);
jmb.setFinishedInit(true);
}
jmb.setFinishedInit(true);
}
@@
-470,7
+472,6
@@
public class AppJmol extends StructureViewerBase
}
}
}
}
- jmb.jmolViewer.antialiased = true;
jmb.jmolViewer.requestRepaintAndWait("image export");
jmb.jmolViewer.renderScreenImage(ig2, usewidth, useheight);
}
jmb.jmolViewer.requestRepaintAndWait("image export");
jmb.jmolViewer.renderScreenImage(ig2, usewidth, useheight);
}
@@
-502,10
+503,17
@@
public class AppJmol extends StructureViewerBase
}
});
runner.start();
}
});
runner.start();
+ long time = 0;
do
{
Thread.sleep(25);
do
{
Thread.sleep(25);
- } while (runner.isAlive());
+ } while (runner.isAlive() && time++ < 4000);
+ if (time >= 4000)
+ {
+ runner.interrupt();
+ throw new ImageOutputException(
+ "Jmol took too long to export. Waited for 100 seconds.");
+ }
} catch (Throwable e)
{
throw new ImageOutputException(
} catch (Throwable e)
{
throw new ImageOutputException(